From b044e0b5821e65c0ec435df6fa49ec0d2e2b419d Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Tue, 13 Jan 2015 12:50:55 +0800 Subject: [PATCH 001/207] Translating by ZTinoZ --- ...1223 20 Linux Commands Interview Questions & Answers.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index 88e9b83ce2..e6e3fa1c2e 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -1,11 +1,10 @@ -Translating by ZTinoZ -20 Linux Commands Interview Questions & Answers +20条Linux命令面试问答 ================================================================================ **Q:1 How to check current run level of a linux server ?** Ans: ‘who -r’ & ‘runlevel’ commands are used to check the current runlevel of a linux box. -**Q:2 How to check the default gatway in linux ?** +**Q:2 怎么检查Linux的默认网关？** Ans: Using the commands “route -n” and “netstat -nr” , we can check default gateway. Apart from the default gateway info , these commands also display the current routing tables . @@ -116,7 +115,7 @@ Ans: The lspci command displays information about PCI buses and the devices atta via: http://www.linuxtechi.com/20-linux-commands-interview-questions-answers/ 作者：[Pradeep Kumar][a] -译者：[译者ID](https://github.com/译者ID) +译者：[ZTinoZ](https://github.com/ZTinoZ) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From d1e967b1abce035eae3ea421ea8bed98292b02f1 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Tue, 13 Jan 2015 15:01:19 +0800 Subject: [PATCH 002/207] Translating by ZTinoZ --- ...nux Commands Interview Questions & Answers.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index e6e3fa1c2e..50da521e4e 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -1,16 +1,16 @@ 20条Linux命令面试问答 ================================================================================ -**Q:1 How to check current run level of a linux server ?** +**问:1 如何查看当前的Linux服务器的运行级别？** -Ans: ‘who -r’ & ‘runlevel’ commands are used to check the current runlevel of a linux box. +答: ‘who -r’ 和 ‘runlevel’ 命令可以用来查看当前的Linux服务器的运行级别。 -**Q:2 怎么检查Linux的默认网关？** +**问:2 如何检查Linux的默认网关？** -Ans: Using the commands “route -n” and “netstat -nr” , we can check default gateway. Apart from the default gateway info , these commands also display the current routing tables . +答: Using the commands “route -n” and “netstat -nr” , we can check default gateway. Apart from the default gateway info , these commands also display the current routing tables . -**Q:3 How to rebuild initrd image file on Linux ?** +**问:3 How to rebuild initrd image file on Linux ?** -Ans: In case of CentOS 5.X / RHEL 5.X , mkinitrd command is used to create initrd file , example is shown below : +答: In case of CentOS 5.X / RHEL 5.X , mkinitrd command is used to create initrd file , example is shown below : # mkinitrd -f -v /boot/initrd-$(uname -r).img $(uname -r) @@ -24,9 +24,9 @@ Above command will create the initrd file for the current version. To rebuild th # dracut -f initramfs-2.x.xx-xx.el6.x86_64.img 2.x.xx-xx.el6.x86_64 -**Q:4 What is cpio command ?** +**问:4 What is cpio command ?** -Ans: cpio stands for Copy in and copy out. Cpio copies files, lists and extract files to and from a archive ( or a single file). +答: cpio stands for Copy in and copy out. Cpio copies files, lists and extract files to and from a archive ( or a single file). **Q:5 What is patch command and where to use it ?** From 222bfbbd4450cd04d34f9ebaa1fdf76fb851d81b Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Wed, 14 Jan 2015 11:19:47 +0800 Subject: [PATCH 003/207] Translating by ZTinoZ --- ... Commands Interview Questions & Answers.md | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index 50da521e4e..a57eadab5c 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -4,33 +4,33 @@ 答: ‘who -r’ 和 ‘runlevel’ 命令可以用来查看当前的Linux服务器的运行级别。 -**问:2 如何检查Linux的默认网关？** +**问:2 如何查看Linux的默认网关？** -答: Using the commands “route -n” and “netstat -nr” , we can check default gateway. Apart from the default gateway info , these commands also display the current routing tables . +答: 用 “route -n” 和 “netstat -nr” 命令，我们可以查看默认网关。除了默认的网关信息，这两个命令还可以显示当前的路由表。 -**问:3 How to rebuild initrd image file on Linux ?** +**问:3 如何在Linux上重建初始化内存盘影响文件？** -答: In case of CentOS 5.X / RHEL 5.X , mkinitrd command is used to create initrd file , example is shown below : +答: 在CentOS 5.X / RHEL 5.X中，可以用mkinitrd命令来创建初始化内存盘文件，举例如下： # mkinitrd -f -v /boot/initrd-$(uname -r).img $(uname -r) -If you want to create initrd for a specific kernel version , then replace ‘uname -r’ with desired kernel +如果你想要给特定的内核版本创建初始化内存盘，你就用所需的内核名替换掉 ‘uname -r’ 。 -In Case of CentOS 6.X / RHEL 6.X , dracut command is used to create initrd file example is shown below : +在CentOS 6.X / RHEL 6.X中，则用dracut命令来创建初始化内存盘文件，举例如下： # dracut -f -Above command will create the initrd file for the current version. To rebuild the initrd file for a specific kernel , use below command : +以上命令能给当前的系统版本创建初始化内存盘，给特定的内核版本重建初始化内存盘文件则使用以下命令： # dracut -f initramfs-2.x.xx-xx.el6.x86_64.img 2.x.xx-xx.el6.x86_64 -**问:4 What is cpio command ?** +**问:4 cpio命令是什么？** -答: cpio stands for Copy in and copy out. Cpio copies files, lists and extract files to and from a archive ( or a single file). +答: cpio就是复制入和复制出的意思。cpio可以向一个归档文件（或单个文件）复制文件、列表，还可以从中提取文件。 -**Q:5 What is patch command and where to use it ?** +**问:5 patch命令是什么？如何使用？** -Ans: As the name suggest patch command is used to apply changes ( or patches) to the text file. Patch command generally accept output from the diff and convert older version of files into newer versions. For example Linux kernel source code consists of number of files with millions of lines , so whenever any contributor contribute the changes , then he/she will be send the only changes instead of sending the whole source code. Then the receiver will apply the changes with patch command to its original source code. +答: As the name suggest patch command is used to apply changes ( or patches) to the text file. Patch command generally accept output from the diff and convert older version of files into newer versions. For example Linux kernel source code consists of number of files with millions of lines , so whenever any contributor contribute the changes , then he/she will be send the only changes instead of sending the whole source code. Then the receiver will apply the changes with patch command to its original source code. Create a diff file for use with patch, @@ -42,73 +42,73 @@ Once the diff file has been created, we can apply it to patch the old file into # patch < diff_file -**Q:6 What is use of aspell ?** +**问:6 What is use of aspell ?** -Ans: As the name suggest aspell is an interactive spelling checker in linux operating system. The aspell command is the successor to an earlier program named ispell, and can be used, for the most part, as a drop-in replacement. While the aspell program is mostly used by other programs that require spell-checking capability, it can also be used very effectively as a stand-alone tool from the command line. +答: As the name suggest aspell is an interactive spelling checker in linux operating system. The aspell command is the successor to an earlier program named ispell, and can be used, for the most part, as a drop-in replacement. While the aspell program is mostly used by other programs that require spell-checking capability, it can also be used very effectively as a stand-alone tool from the command line. -**Q:7 How to check the SPF record of domain from command line ?** +**问:7 How to check the SPF record of domain from command line ?** -Ans: We can check SPF record of a domain using dig command. Example is shown below : +答: We can check SPF record of a domain using dig command. Example is shown below : linuxtechi@localhost:~$ dig -t TXT google.com -**Q:8 How to identify which package the specified file (/etc/fstab) is associated with in linux ?** +**问:8 How to identify which package the specified file (/etc/fstab) is associated with in linux ?** -Ans: # rpm -qf /etc/fstab +答: # rpm -qf /etc/fstab Above command will list the package which provides file “/etc/fstab” -**Q:9 Which command is used to check the status of bond0 ?** +**问:9 Which command is used to check the status of bond0 ?** -Ans: cat /proc/net/bonding/bond0 +答: cat /proc/net/bonding/bond0 -**Q:10 What is the use of /proc file system in linux ?** +**问:10 What is the use of /proc file system in linux ?** -Ans: The /proc file system is a RAM based file system which maintains information about the current state of the running kernel including details on CPU, memory, partitioning, interrupts, I/O addresses, DMA channels, and running processes. This file system is represented by various files which do not actually store the information, they point to the information in the memory. The /proc file system is maintained automatically by the system. +答: The /proc file system is a RAM based file system which maintains information about the current state of the running kernel including details on CPU, memory, partitioning, interrupts, I/O addresses, DMA channels, and running processes. This file system is represented by various files which do not actually store the information, they point to the information in the memory. The /proc file system is maintained automatically by the system. -**Q:11 How to find files larger than 10MB in size in /usr directory ?** +**问:11 How to find files larger than 10MB in size in /usr directory ?** -Ans: # find /usr -size +10M +答: # find /usr -size +10M -**Q:12 How to find files in the /home directory that were modified more than 120 days ago ?** +**问:12 How to find files in the /home directory that were modified more than 120 days ago ?** -Ans: # find /home -mtime +l20 +答: # find /home -mtime +l20 -**Q:13 How to find files in the /var directory that have not been accessed in the last 90 days ?** +**问:13 How to find files in the /var directory that have not been accessed in the last 90 days ?** -Ans: # find /var -atime -90 +答: # find /var -atime -90 -**Q:14 Search for core files in the entire directory tree and delete them as found without prompting for confirmation** +**问:14 Search for core files in the entire directory tree and delete them as found without prompting for confirmation** -Ans: # find / -name core -exec rm {} \; +答: # find / -name core -exec rm {} \; -**Q:15 What is the purpose of strings command ?** +**问:15 What is the purpose of strings command ?** -Ans: The strings command is used to extract and display the legible contents of a non-text file. +答: The strings command is used to extract and display the legible contents of a non-text file. -**Q:16 What is the use tee filter ?** +**问:16 What is the use tee filter ?** -Ans: The tee filter is used to send an output to more than one destination. It can send one copy of the output to a file and another to the screen (or some other program) if used with pipe. +答: The tee filter is used to send an output to more than one destination. It can send one copy of the output to a file and another to the screen (or some other program) if used with pipe. linuxtechi@localhost:~$ ll /etc | nl | tee /tmp/ll.out In the above example, the output from ll is numbered and captured in /tmp/ll.out file. The output is also displayed on the screen. -**Q:17 What would the command export PS1 = ”$LOGNAME@`hostname`:\$PWD: do ?** +**问:17 What would the command export PS1 = ”$LOGNAME@`hostname`:\$PWD: do ?** -Ans: The export command provided will change the login prompt to display username, hostname, and the current working directory. +答: The export command provided will change the login prompt to display username, hostname, and the current working directory. -**Q:18 What would the command ll | awk ‘{print $3,”owns”,$9}’ do ?** +**问:18 What would the command ll | awk ‘{print $3,”owns”,$9}’ do ?** -Ans: The ll command provided will display file names and their owners. +答: The ll command provided will display file names and their owners. -**Q:19 What is the use of at command in linux ?** +**问:19 What is the use of at command in linux ?** -Ans: The at command is used to schedule a one-time execution of a program in the future. All submitted jobs are spooled in the /var/spool/at directory and executed by the atd daemon when the scheduled time arrives. +答: The at command is used to schedule a one-time execution of a program in the future. All submitted jobs are spooled in the /var/spool/at directory and executed by the atd daemon when the scheduled time arrives. -**Q:20 What is the role of lspci command in linux ?** +**问:20 What is the role of lspci command in linux ?** -Ans: The lspci command displays information about PCI buses and the devices attached to your system. Specify -v, -vv, or -vvv for detailed output. With the -m option, the command produces more legible output. +答: The lspci command displays information about PCI buses and the devices attached to your system. Specify -v, -vv, or -vvv for detailed output. With the -m option, the command produces more legible output. -------------------------------------------------------------------------------- From 10f7554731367f6982f4716f0e293b702e2b659e Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Fri, 16 Jan 2015 16:58:03 +0800 Subject: [PATCH 004/207] Translating by ZTinoZ --- ... 20 Linux Commands Interview Questions & Answers.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index a57eadab5c..3f032a3ac9 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -30,19 +30,19 @@ **问:5 patch命令是什么？如何使用？** -答: As the name suggest patch command is used to apply changes ( or patches) to the text file. Patch command generally accept output from the diff and convert older version of files into newer versions. For example Linux kernel source code consists of number of files with millions of lines , so whenever any contributor contribute the changes , then he/she will be send the only changes instead of sending the whole source code. Then the receiver will apply the changes with patch command to its original source code. +答: 顾名思义，patch命令就是用来将修改（或补丁）写进文本文件里。Patch命令通常是接收diff的输出并把文件的旧版本转换为新版本。举个例子，Linux内核源代码由百万行代码文件构成，所以无论何时，任何代码贡献者贡献出代码，只需发送改动的部分而不是整个源代码，然后接收者用patch命令将改动写进原始的源代码里。 -Create a diff file for use with patch, +创建一个diff文件给patch使用， # diff -Naur old_file new_file > diff_file -Where old_file and new_file are either single files or directories containing files. The r option supports recursion of a directory tree. +旧文件和新文件要么都是单个的文件要么都是包含文件的目录，r选项支持目录树递归。 -Once the diff file has been created, we can apply it to patch the old file into the new file: +一旦diff文件创建好，我们就能在旧的文件上打上补丁，把它变成新文件： # patch < diff_file -**问:6 What is use of aspell ?** +**问:6 aspell有什么用 ?** 答: As the name suggest aspell is an interactive spelling checker in linux operating system. The aspell command is the successor to an earlier program named ispell, and can be used, for the most part, as a drop-in replacement. While the aspell program is mostly used by other programs that require spell-checking capability, it can also be used very effectively as a stand-alone tool from the command line. From 3b7420b19a16beaf9cd7c32b490b945de0533bc6 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Sun, 18 Jan 2015 16:25:33 +0800 Subject: [PATCH 005/207] Translating by ZTinoZ --- .../20141223 20 Linux Commands Interview Questions & Answers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index 3f032a3ac9..16347b7cc5 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -44,7 +44,7 @@ **问:6 aspell有什么用 ?** -答: As the name suggest aspell is an interactive spelling checker in linux operating system. The aspell command is the successor to an earlier program named ispell, and can be used, for the most part, as a drop-in replacement. While the aspell program is mostly used by other programs that require spell-checking capability, it can also be used very effectively as a stand-alone tool from the command line. +答: 顾名思义，aspell就是Linux操作系统上的一款交互式拼写检查器。aspell命令继任了更早的一个名为ispell的程序，并且作为一款嵌入式替代品，最重要的是它非常好用。While the aspell program is mostly used by other programs that require spell-checking capability, it can also be used very effectively as a stand-alone tool from the command line. **问:7 How to check the SPF record of domain from command line ?** From e17efcba03810347c8e9f4d1271f9f735d1f18ed Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Mon, 19 Jan 2015 17:50:59 +0800 Subject: [PATCH 006/207] Translating by ZTinoZ --- ...223 20 Linux Commands Interview Questions & Answers.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index 16347b7cc5..d2374752ea 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -44,11 +44,11 @@ **问:6 aspell有什么用 ?** -答: 顾名思义，aspell就是Linux操作系统上的一款交互式拼写检查器。aspell命令继任了更早的一个名为ispell的程序，并且作为一款嵌入式替代品，最重要的是它非常好用。While the aspell program is mostly used by other programs that require spell-checking capability, it can also be used very effectively as a stand-alone tool from the command line. +答: 顾名思义，aspell就是Linux操作系统上的一款交互式拼写检查器。aspell命令继任了更早的一个名为ispell的程序，并且作为一款嵌入式替代品 ，最重要的是它非常好用。当aspell程序主要被其它一些需要拼写检查能力的程序所使用的时候，在命令行中作为一个独立运行的工具的它也能十分有效。 -**问:7 How to check the SPF record of domain from command line ?** +**问:7 如何从命令行查看域SPF记录？** -答: We can check SPF record of a domain using dig command. Example is shown below : +答: 我们可以用dig命令来查看域SPF记录。举例如下： linuxtechi@localhost:~$ dig -t TXT google.com @@ -56,7 +56,7 @@ 答: # rpm -qf /etc/fstab -Above command will list the package which provides file “/etc/fstab” +以上命令能列出Above command will list the package which provides file “/etc/fstab” **问:9 Which command is used to check the status of bond0 ?** From 785f7b7adeb375545dbbdc1232d02cc5ab9820af Mon Sep 17 00:00:00 2001 From: mtunique Date: Wed, 21 Jan 2015 22:26:43 +0800 Subject: [PATCH 007/207] merge origin/master --- ...Answers--How to check disk space on Linux with df command.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md b/sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md index ef10342238..b6595f555c 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md @@ -1,7 +1,7 @@ translating by mtunique Linux FAQs with Answers--How to check disk space on Linux with df command ================================================================================ -> **Question**: I know I can use df command to check a file system's disk space usage on Linux. Can you show me practical examples of the df command so that I can make the most out of it? +> **问题**: 我知道在Linux上我可以用df命令来查看I know I can use df command to check a file system's disk space usage on Linux. Can you show me practical examples of the df command so that I can make the most out of it? As far as disk storage is concerned, there are many command-line or GUI-based tools that can tell you about current disk space usage. These tools report on detailed disk utilization in various human-readable formats, such as easy-to-understand summary, detailed statistics, or [intuitive visualization][1]. If you simply want to know how much free disk space is available for different file systems, then df command is probably all you need. From 848826d036585df3bb04d49fe4923cd3d0cf795a Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Thu, 22 Jan 2015 16:33:45 +0800 Subject: [PATCH 008/207] Translating by ZTinoZ --- ...41223 20 Linux Commands Interview Questions & Answers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index d2374752ea..256a6cd5df 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -52,13 +52,13 @@ linuxtechi@localhost:~$ dig -t TXT google.com -**问:8 How to identify which package the specified file (/etc/fstab) is associated with in linux ?** +**问:8 如何识别Linux系统中指定文件(/etc/fstab)的关联包？** 答: # rpm -qf /etc/fstab -以上命令能列出Above command will list the package which provides file “/etc/fstab” +以上命令能列出供应给“/etc/fstab”文件的包。 -**问:9 Which command is used to check the status of bond0 ?** +**问:9 哪条命令用来查看bond0的状态？** 答: cat /proc/net/bonding/bond0 From 8b4a97ada2a95ffae796ab25ee3a6b0cba010c58 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Fri, 23 Jan 2015 17:59:27 +0800 Subject: [PATCH 009/207] Translating by ZTinoZ --- ...nux Commands Interview Questions & Answers.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index 256a6cd5df..17a1179b8e 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -62,23 +62,23 @@ 答: cat /proc/net/bonding/bond0 -**问:10 What is the use of /proc file system in linux ?** +**问:10 Linux系统中的/proc文件系统有什么用？** -答: The /proc file system is a RAM based file system which maintains information about the current state of the running kernel including details on CPU, memory, partitioning, interrupts, I/O addresses, DMA channels, and running processes. This file system is represented by various files which do not actually store the information, they point to the information in the memory. The /proc file system is maintained automatically by the system. +答: /proc文件系统是一个基于维护关于当前正在运行的内核状态信息的文件系统的随机存取存储器（RAM），其中包括CPU、内存、分区划分、I/O地址、直接内存访问通道和正在运行的进程。这个文件系统所代表的是各种不实际存储信息的文件，它们指向的是内存里的信息。/proc文件系统是由系统自动维护的。 -**问:11 How to find files larger than 10MB in size in /usr directory ?** +**问:11 如何在/usr目录下找出大小超过10MB的文件？** 答: # find /usr -size +10M -**问:12 How to find files in the /home directory that were modified more than 120 days ago ?** +**问:12 如何在/home目录下找出120天之前被修改过的文件？** -答: # find /home -mtime +l20 +答: # find /home -mtime +120 -**问:13 How to find files in the /var directory that have not been accessed in the last 90 days ?** +**问:13 如何在/var目录下找出90天之内未被访问过的文件？** -答: # find /var -atime -90 +答: # find /var \! -atime -90 -**问:14 Search for core files in the entire directory tree and delete them as found without prompting for confirmation** +**问:14 在整个目录树下查找核心文件并Search for core files in the entire directory tree and delete them as found without prompting for confirmation** 答: # find / -name core -exec rm {} \; From b90b0e6f2ffeeb15b474ef6852be052e0d0e9500 Mon Sep 17 00:00:00 2001 From: wxy Date: Sat, 24 Jan 2015 12:05:53 +0800 Subject: [PATCH 010/207] PUB:20150106 2015--Open Source Has Won, But It Isn't Finished @runningwater --- ...n Source Has Won, But It Isn't Finished.md | 47 +++++++++++++++++++ ...n Source Has Won, But It Isn't Finished.md | 47 ------------------- 2 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 published/20150106 2015--Open Source Has Won, But It Isn't Finished.md delete mode 100644 translated/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md diff --git a/published/20150106 2015--Open Source Has Won, But It Isn't Finished.md b/published/20150106 2015--Open Source Has Won, But It Isn't Finished.md new file mode 100644 index 0000000000..fd8be296cf --- /dev/null +++ b/published/20150106 2015--Open Source Has Won, But It Isn't Finished.md @@ -0,0 +1,47 @@ +2015:开源已经完胜，但这并不是结束 +================================================================================ +> 在 2014 年的完胜后，接下来会如何？ + +新年伊始，习惯上都是回顾已经走过的一年。但只要一直关注我们，就会很容易获得过去一年的总结：开源已经全胜。让我们从头开始说起吧： + +**超级计算机**: Linux 在超级计算机系统 500 强的名单上占据绝对的主导地位这本身就令其它操作系统很尴尬。[2014年11月的数据][1]显示前500系统中的485个系统都在运行着 Linux 的发布系统，而仅仅只有一台运行着 Windows 系统。如果您看看所用的处理器数量，这数据更是让人惊叹。截止到目前，运行 Linux 系统的处理器有 22,851,693 个之多，而 windows 系统仅仅只有 30,720。这意味着什么？Linux 不仅仅是占据主导地位，在大型系统中已经是绝对的霸主了。 + +**云计算**: 去年， Linux 基金会撰写了一个有趣的[报告][2]，是关于大公司在云端使用 Linux 的情况的。它发现 75% 的大公司在使用 Linux 系统作为他们的主要平台，相对的使用 Windows 系统的只占 23%。因为需要考虑云端和非云端的因素，它们已经混淆在一起了，所以很难把这比例对应到真实的市场份额里。但是，鉴于当前云计算的流行度，可以很确定的说明 Linux 使用的高速增长。事实上，同样的调查发现，在云端的 Linux 部署率已经从 45% 增长到 79%，而对于 Windows 来说已经从 45% 下降到 36%。当然了，某些人可能认为 Linux 基金会在这块上并不是完全公正无私的，但即使是有私心或是因统计的不确定性而有失公允，事情也正朝着预料的正确方向迈进。 + +**Web 服务器**: 开源已经统治这个行业近20年 - 取得了一份很惊人的成绩。然而，最近在市场份额上出现了一些有趣的变动：一点就是，在 Web 服务器的总计数上，微软的 IIS 服务已经超越了 Apache 服务。但正如 Netcraft 公司其最近的[分析][3]解释所说的那样，这儿还有很多令人大饱眼福的地方呢： + +> 这是网站总数持续大幅回落以来的第二个月，从一月份以来，本月达到了最低点。与十一月份情况一样，损失的仅仅只是集中在一小部分的主机提供商中，只占了5200万主机名数的十大点。这点损失相比于激活的站点和网站来说不是一个数据级的，所以造不成什么影响，但激活的这些站点大部分都是广告类的链接页面池，基本上没有原创的内容。大多数这些站点都是运行在微软的 IIS 服务器上的，所以在2014年7月份的调查中 IIS 的使用数就超过了 Apache。然而，近期跌势已导致其市场份额下降到 29.8％，现在已经低于Apache 10个百分点了。 + +这表明，微软的所谓“激增”更多的是表象，而事实并非如此，它的大多数增加都是基于没什么有用内容的链接页面池。事实上，Netcraft公司的关于活动网站的数据给我们描绘了一幅完全不同的图表：Apache 拥有 50.57％ 的市场份额，nginx 的是 14.73％ 位居第二;微软的 IIS 很无力，占到了相当微弱的 11.72％。这意味着在活跃 Web 服务器市场上开源大约有65％的份额 - 虽然没有超级计算机那么高的水平，但也还不错。 + +**移动设备系统**. 目前，开源的大军主要是 Andriod 为基础在不断高歌猛进。最新数据表明，在2014年第三季度的智能手机出货量中，Andriod 设备的市场份额从去年同期的 81.4% 上升到了 [83.6%][4]。苹果的从去年同期的 13.4% 下降到 12.3%。对于平板电脑来说，Android 平板遵循同样的轨迹：在2014年第二季度，Android 平板的占有率达到[全球平板电脑的销量的75％][5]左右，而苹果的只有25％。 + +**嵌入式系统**: 虽然很难量化 Linux 在的重要的嵌入式系统市场的市场份额，但来一个自 2013 年的研究数字表明，[按规划，大约一半的嵌入式系统][6]将会采用 Linux。 + +**物联网**: 在很多方面上可以把它们简单的认为是嵌入式系统的另外一个化身，不同之处在于它们被设计为一直在线的。虽然现在谈论它的市场份额还有点为时过早，但如我在[讨论栏目][7]里说的，AllSeen 的物联网开源框架正进行的如火如荼。他们所缺少的也最引入注目的事情只是还没有任何可信任的闭源项目对手。因此，很有可能物联网将会通过开源的方式来达到 Linux 在超级计算机中的占有率这样的水平。 + +当然了，这个阶段的成功也带来了一些问题：我们将何去何从？鉴于开源将会使很多成功的行业达到饱和点，想必唯一的办法就是下跌吗？要回答这个问题，我建议浏览下 Christopher Kelty 于2013年写的一篇供同行参阅、发人深省的文章，有个耐人寻味的标题“[天下没有免费的软件][8]”。下面是他的开头段： + +> 自由软件并不存在。在我写了一整本书后，我莫名的忧伤。但这也是我写进文章的一个观点。自由软件和与它一体两面的开源正在不断的变化着。它并不是一直持续不变的，不稳定、不固定、不持久，这正是它的特色的一部分。 + +换句话说，无论2014年带给我们多少惊人的免费软件，我们也确信2015年会更多更丰富，因为进化是永无止境的。 + +-------------------------------------------------------------------------------- + +via: http://www.computerworlduk.com/blogs/open-enterprise/open-source-has-won-3592314/ + +作者：[lyn Moody][a] +译者：[runningwater](https://github.com/runningwater) +校对：[wxy](https://github.com/wxy) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.computerworlduk.com/author/glyn-moody/ +[1]:http://www.top500.org/statistics/list/ +[2]:http://www.linuxfoundation.org/publications/linux-foundation/linux-end-user-trends-report-2014 +[3]:http://news.netcraft.com/archives/2014/12/18/december-2014-web-server-survey.html +[4]:http://www.cnet.com/news/android-stays-unbeatable-in-smartphone-market-for-now/ +[5]:http://timesofindia.indiatimes.com/tech/tech-news/Android-tablet-market-share-hits-70-in-Q2-iPads-slip-to-25-Survey/articleshow/38966512.cms +[6]:http://linuxgizmos.com/embedded-developers-prefer-linux-love-android/ +[7]:http://www.computerworlduk.com/blogs/open-enterprise/allseen-3591023/ +[8]:http://peerproduction.net/issues/issue-3-free-software-epistemics/debate/there-is-no-free-software/ diff --git a/translated/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md b/translated/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md deleted file mode 100644 index 1646773bb5..0000000000 --- a/translated/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md +++ /dev/null @@ -1,47 +0,0 @@ -2015:开源已经完胜，但还在继续 -================================================================================ -> 在 2014 年的完胜后，接下来会如何？ - -新年伊始，习惯上都是回顾已经走过的一年。但只要观注我们的这个栏目，就会很容易获得过去一年的总结：开源已经全胜。让我们从头开始说起吧： - -**超级计算机**: Linux 在超级计算机系统 500 强的名单上占据绝对的主导地位这本身就令人很尴尬。[2014年11月的数据][1]显示前500系统中的485个系统都在运行着 Linux 的发布系统，而仅仅只有一台运行着 Windows 系统。如果您查询相关的核心数据，这问题更是让人触目惊心。截止到目前，Linux 系统有 22,851,693 之多而 windows 系统仅仅只有 30,720。这意味着什么？Linux 不仅仅是占据主导地位，在大型系统中已经是绝对的霸主了。 - -**云计算**: 去年， Linux 基金会撰写了一个有趣的[报告][2],是关于大公司在云端使用 Linux 的情况的。它发现 75% 的大公司在使用 Linux 系统作为他们的主要平台，相对的使用 Windows 系统的只占 23%。因为需要考虑云端和非云端的因素，它们已经混淆在一起了，所以很难把这比例对应到真实的市场份额里。但是，鉴于当前云计算的流行度，可以很确定的说明 Linux 使用的高速增长。事实上，同样的调查发现，在云端的 Linux 部署率已经从 45% 增长到 79%，而对于 Windows 来说已经从 45% 下降到 36%。当然了，某些人可能认为 Linux 基金会在这块上并不是完全公正无私的，但即使是有私心或是统计的不确定性而有失公允，事情也正朝着预料的正确方向迈进。 - -**Web 服务器**: 开源已经统治这个行业近20年 - 取得了一份很惊人的成绩。然而，最近在市场份额上出现了一些有趣的变动：一点就是，在 Web 服务器的总计数上，微软的 IIS 服务已经超越了 Apache 服务。但正如 Netcraft 公司其最近的[分析][3]解释所说的那样，这儿还有很多令人大饱眼福的地方呢： - -> 这是网站总数持续大幅回落以来的第二个月，从一月份以来，创造了一个月的最低点。由于在十一月份的时候，损失的仅仅只是集中在主机提供商中的一小部分，只占了5200万主机名数的十大点。这点损失相比于激活的站点和网站来说不是一个数据级的，所以造不成什么影响，但激活的这些站点大部分都是广告类的链接页面，基本上没有原创的内容。大多数这些站点都是运行在微软的 IIS 服务器上的，所以在2014年7月份的调查中 IIS 的使用数就超过的 Apache 的。然而，近期跌势已导致其市场份额下降到 29.8％，现在已经低于Apache 10个百分点了。 - -这表明，微软的所谓“激增”更多的是表象，而事实并非如此，它的大多数增加都是基于链接页面站点，其内容很少有用。事实上，Netcraft公司的关于活动网站的数据给我们描绘了一幅完全不同的图表：Apache 拥有 50.57％ 的市场份额，nginx 的是 14.73％ 位居第二;微软的 IIS 很无力，占到了相当微弱的 11.72％。这意味着在活跃 Web 服务器市场上开源大约有65％的份额 - 虽然没有超级计算机那么高的水平，但也还不错。 - -**移动设备系统**. 目前，开源的大军主要是 Andriod 为基础在继续着。最新数据表明，在2014年第三季度的智能手机出货量中，Andriod 设备的市场份额从去年同期的 81.4% 上升到了 [83.6%][4]。苹果的从去年同期的 13.4% 下降到 12.3%。对于平板电脑来说，Android 平板遵循同样的轨迹：在2014年第二季度，Android 平板的占有率达到[全球平板电脑的销量的75％][5]左右，而苹果的只有25％。 - -**嵌入式系统**: 虽然很难量化 Linux 在的重要的嵌入式系统市场的市场份额，但来一个自 2013 年的研究数字表明，[计划大约一半的嵌入式系统][6]将会采用 Linux。 - -**物联网**: 在很多方面上可以把它们简单的认为是嵌入式系统的另外一个化身，不同之处在于它们被设计为一直在线的。虽然现在谈论它的市场份额还有点为时过早，但如我在[讨论栏目][7]里的，AllSeen 的物联网开源框架正进行的如火如荼。他们所缺少的也最引入注目的事情是要让任何可信任的闭源项目把其当做对手。因此，很有可能物联网将会通过开源的方式来达到 Linux 在超级计算机中的占有率这样的水平。 - -当然了，这个阶段的成功也带来了一些问题：我们将何去何从？鉴于开源将会使很多成功的行业达到饱和点，想必唯一的办法就是下跌吗？要回答这个问题，我建议浏览下 Christopher Kelty 于2013年写的一篇供同行参阅、发人深省的文章，有个耐人寻味的标题“[天下没有免费的软件][8]”。下面是他的开头段： - -> 免费软件并不存在。在我写了一整本书后，我莫名的忧伤。但这也是我写进文章的一个观点。免费软件和它的分身开源正在不断的变化着。它并不是一直持续不变的，不稳定、不固定、不持久，这正是它的特色的一部分。 - -换句话说，无论2014年带给我们多少惊人的免费软件，我们也确信2015年会更多更丰富，因为进化是永无止境的。 - --------------------------------------------------------------------------------- - -via: http://www.computerworlduk.com/blogs/open-enterprise/open-source-has-won-3592314/ - -作者：[lyn Moody][a] -译者：[runningwater](https://github.com/runningwater) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.computerworlduk.com/author/glyn-moody/ -[1]:http://www.top500.org/statistics/list/ -[2]:http://www.linuxfoundation.org/publications/linux-foundation/linux-end-user-trends-report-2014 -[3]:http://news.netcraft.com/archives/2014/12/18/december-2014-web-server-survey.html -[4]:http://www.cnet.com/news/android-stays-unbeatable-in-smartphone-market-for-now/ -[5]:http://timesofindia.indiatimes.com/tech/tech-news/Android-tablet-market-share-hits-70-in-Q2-iPads-slip-to-25-Survey/articleshow/38966512.cms -[6]:http://linuxgizmos.com/embedded-developers-prefer-linux-love-android/ -[7]:http://www.computerworlduk.com/blogs/open-enterprise/allseen-3591023/ -[8]:http://peerproduction.net/issues/issue-3-free-software-epistemics/debate/there-is-no-free-software/ From 6adcffbd5ad13040dd698cc09ff970df9f768656 Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Sat, 24 Jan 2015 12:28:43 +0800 Subject: [PATCH 011/207] =?UTF-8?q?20150124=20=E9=80=89=E9=A2=98=20Why=20d?= =?UTF-8?q?oes=20C++=20promote=20an=20int=20to=20a=20float=20when=20a=20fl?= =?UTF-8?q?oat=20cannot=20represent=20all=20int=20values=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...a float cannot represent all int values.md | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 sources/talk/20150124 Why does C++ promote an int to a float when a float cannot represent all int values.md diff --git a/sources/talk/20150124 Why does C++ promote an int to a float when a float cannot represent all int values.md b/sources/talk/20150124 Why does C++ promote an int to a float when a float cannot represent all int values.md new file mode 100644 index 0000000000..25a2dc6daf --- /dev/null +++ b/sources/talk/20150124 Why does C++ promote an int to a float when a float cannot represent all int values.md @@ -0,0 +1,43 @@ +Why does C++ promote an int to a float when a float cannot represent all int values? +--------- + +#Q: + +Say I have the following: + +```C +int i = 23; +float f = 3.14; +if (i == f) // do something +``` + +The i will be promoted to a float and the two float numbers will be compared, but can a float represent all int values? Why not promote both the int and the float to a double? + +#A: + +When `int` is promoted to `unsigned` in the integral promotions, negative values are also lost (which leads to such fun as `0u < -1` being true). + +Like most mechanisms in C (that are inherited in C++), the usual arithmetic conversions should be understood in terms of hardware operations. The makers of C were very familiar with the assembly language of the machines with which they worked, and they wrote C to make immediate sense to themselves and people like themselves when writing things that would until then have been written in assembly (such as the UNIX kernel). + +Now, processors, as a rule, do not have mixed-type instructions (add float to double, compare int to float, etc.) because it would be a huge waste of real estate on the wafer -- you'd have to implement as many times more opcodes as you want to support different types. That you only have instructions for "add int to int," "compare float to float", "multiply unsigned with unsigned" etc. makes the usual arithmetic conversions necessary in the first place -- they are a mapping of two types to the instruction family that makes most sense to use with them. + +From the point of view of someone who's used to writing low-level machine code, if you have mixed types, the assembler instructions you're most likely to consider in the general case are those that require the least conversions. This is particularly the case with floating points, where conversions are runtime-expensive, and particularly back in the early 1970s, when C was developed, computers were slow, and when floating point calculations were done in software. This shows in the usual arithmetic conversions -- only one operand is ever converted (with the single exception of `long/unsigned int`, where the `long` may be converted to `unsigned long`, which does not require anything to be done on most machines. Perhaps not on any where the exception applies). + +So, the usual arithmetic conversions are written to do what an assembly coder would do most of the time: you have two types that don't fit, convert one to the other so that it does. This is what you'd do in assembler code unless you had a specific reason to do otherwise, and to people who are used to writing assembler code and do have a specific reason to force a different conversion, explicitly requesting that conversion is natural. After all, you can simply write + +```C +if((double) i < (double) f) +``` + +It is interesting to note in this context, by the way, that `unsigned` is higher in the hierarchy than `int`, so that comparing `int` with `unsigned` will end in an unsigned comparison (hence the `0u < -1` bit from the beginning). I suspect this to be an indicator that people in olden times considered `unsigned` less as a restriction on `int` than as an extension of its value range: We don't need the sign right now, so let's use the extra bit for a larger value range. You'd use it if you had reason to expect that an `int` would overflow -- a much bigger worry in a world of 16-bit ints. + +---- +via:[stackoverflow](http://stackoverflow.com/questions/28010565/why-does-c-promote-an-int-to-a-float-when-a-float-cannot-represent-all-int-val/28011249#28011249) + +作者：[wintermute][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://stackoverflow.com/users/4301306/wintermute \ No newline at end of file From cadf2b8e6082cb045322d6e5be11a90507971255 Mon Sep 17 00:00:00 2001 From: alim0x Date: Sat, 24 Jan 2015 12:34:03 +0800 Subject: [PATCH 012/207] [translated]12 - The history of Android.md --- .../12 - The history of Android.md | 100 ------------------ .../12 - The history of Android.md | 98 +++++++++++++++++ 2 files changed, 98 insertions(+), 100 deletions(-) delete mode 100644 sources/talk/The history of Android/12 - The history of Android.md create mode 100644 translated/talk/The history of Android/12 - The history of Android.md diff --git a/sources/talk/The history of Android/12 - The history of Android.md b/sources/talk/The history of Android/12 - The history of Android.md deleted file mode 100644 index 67538389d0..0000000000 --- a/sources/talk/The history of Android/12 - The history of Android.md +++ /dev/null @@ -1,100 +0,0 @@ -translating by alim0x - -The history of Android -================================================================================ -### Android 2.1—the discovery (and abuse) of animations ### - -Android 2.1 came out with the launch of the Nexus One, which was only three months after the release of 2.0. The new OS wasn't a huge release, so it still kept the codename "Éclair." Android development was chugging along at an unheard-of pace, with Google averaging a new OS release every two-and-a-half months over the last 15 months. - -Thanks mostly to the marketing efforts of Verizon and the "Droid" line of phones, Android was gaining in popularity. The OS was still considered ugly, though, and while the Android engineers at the time seemed to have almost no formal design training, in Android 2.1 they tried to spruce things up a bit by slathering on heavy-handed animation effects wherever they could. The result was an OS that seemed to be desperately trying to prove that it could do animation effects. Many of the new additions felt more like tech demos than user-experience improvements. - -![The lock and home screens from Android 2.1 and 2.0.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/21.png) -The lock and home screens from Android 2.1 and 2.0. -Photo by Ron Amadeo - -Android 2.0's rotary dial lock screen was kicked to the curb after only one version and replaced with the same pull tabs the incoming call screen used. The lock screen clock was an attempt at a uniquely Android font, but as typefaces go, it was pretty hideous looking. - -One of the biggest features in Android 2.1 was "Live Wallpapers"—interactive or moving images that could be set as the wallpaper. The default Live Wallpaper was a grid of squares with blue, red, yellow, and green lights continually streaking across it. Tapping on the screen would send lights firing out in all four directions from the center of your tap. While Live Wallpapers looked neat (and was a unique feature over the iPhone), the animated backgrounds sucked up battery power and CPU cycles. It seemed to make the whole phone run a little slower. - -On the home screen, the default Google Search widget was given a lot more padding and now sits centered in its row. Page indicators now lived in the bottom left and right corners of the screen, and the number of home screen pages jumped from three to five. The app drawer tab at the bottom was replaced with an icon showing a grid of squares, a metaphor that Google still uses today. - -![A picture showing the app drawer design and a composite image showing the app selection for Android 2.1 and 2.0.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/21icons.png) -A picture showing the app drawer design and a composite image showing the app selection for Android 2.1 and 2.0. -Photo by Ron Amadeo - -With the new app drawer icon came a totally new app drawer. Instead of a tabbed container that lifted up from the bottom of the screen, the app drawer displayed as a full-screen interface. The carbon fiber weave was removed, and the background switched to a plain black background—a decision that would stick around all the way up to KitKat. - -Google decided to add a floating, semi-transparent home icon to the bottom of the app drawer to give people an easy way out of the full-screen tab interface. This could be seen as a precursor to the on-screen home button that was introduced in Android 4.0. - -The app drawer was given a tacky graphics effect, too. While scrolling, the icons at the top and bottom of the list would bend inward and appear to move deeper into the phone, sort of like the opening scroll in Star Wars. - -There were a few changes to the icons. "Amazon MP3" and "Alarm Clock" both lost their first names, along with their premium alphabetical real-estate at the top of the app drawer. Two new apps showed up: News and Weather, and Google Voice, which was Google's telecommunication service. Since the Nexus One was not a Verizon phone, Verizon's Visual Voicemail app was dumped. - -![The revamped clock app.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/clo2ck.png) -The revamped clock app. -Photo by Ron Amadeo - -Along with the name change, the clock app got a total revamp. Tapping on the clock shortcut no longer opened the alarms page; instead it went to a "desk clock" interface (left picture, above) with a background that matched the wallpaper. The clock used the same font from the lock screen, pulling in weather from the new News And Weather app. - -The new alarm page cleaned up a lot of the weirder design decisions made in the old version. The analog clock and selectable clock designs were dead. The checkboxes were replaced with a green on/off light, which was much easier to parse than "gray check/green check." While it might be hard to see from the thumbnail (click for a bigger version), the old alarm design displayed AM and PM next to the time. The 2.1 design did away with that, only showing the relevant meridian. A digital clock was placed at the bottom, and the clock icon took you back to the desk clock interface. - -![The Gallery and individual image screens from 2.1 and 2.0.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/gallery1.png) -The Gallery and individual image screens from 2.1 and 2.0. -Photo by Ron Amadeo - -Google's desire to improve the look of Android was most evident in the 2.1 Gallery, which was all about heavy-handed animation effects and transparencies. When the app opened, individual pictures flew in from the top of the screen and shuffled into little piles that made up an album. When opening an album, the picture stack separated, and the photos slid into a grid formation. Everything you touched would pop open, squish, and stretch like a spring-loaded piece of Jell-o. - -There was no "normal" background for the Gallery. It would randomly pick a picture on the screen and heavily distort it for use as a background image. When that picture scrolled off-screen, it would pick a new background image, so the tone of the background always matched your pictures. - -The top left of the screen housed a breadcrumbs bar. It displayed your current location and any folders between you and the main screen—it could be thought of as an early precursor to the "Up" button that would debut in Android 3.0. In the top right was a link to the camera app, which still sported the same faux-leather design that debuted in Android 1.6—the two designs could not be more different. - -While the camera was another weird, one-off design, never was the wild UI disparity between Android apps more apparent than in the new Gallery. It didn't use Android buttons, menus, or any of the existing UI paradigms. It even hid the status bar in every screen—you could barely tell you were looking at Android. - -In the individual photo view, you could finally swipe between images, which removed the need for chunky left and right arrows. For some reason, the color-matched background wasn't on this screen. It was the only part of the app where the background is black. Zoom controls were in the top-right (still no pinch zoom), and commands were held in a single strip along the bottom of the screen. Hitting the "menu" button (software or hardware) didn't bring up a 2×3 grid of options like every other app—the items in the bottom strip just changed from two options to three other options. - -![The animation-filled Gallery app.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/gallery2.png) -The animation-filled Gallery app. -Photo by Ron Amadeo - -The first picture, above, shows an album view. You could scroll horizontally through a large album or use the fast scroll bar at the bottom of the screen. Long pressing on a picture (or, bizarrely, pressing the hardware menu button) would bring up a "checkbox" interface, where you could tap on several pictures to select them. After you've selected pictures, you could then batch share, delete, or rotate them. - -The menus on this screen and the next individual picture screen were semi-transparent speech bubbles that would spring out of their respective buttons when tapped on. Again, this was about as far away from the normal Android conventions as you could get. The Gallery was also one of the first apps to have an overscroll effect. When you hit the end of the photo wall, the entire surface would skew in the direction of the scrolling. - -The 2.1 Gallery was the first photo client to show your cloud-stored Picasa photos along with local pictures. These were marked with a white camera shutter icon in the bottom left corner of a thumbnail. This would later become Google+ Photos. - -No Android app before or since had looked like the gallery. There was good reason for that—it wasn’t made by Google! The app was farmed out to Cooliris, who didn't bother following a single existing Android UI paradigm. While the app was usable, all the animations and effects made it seem like a case of style over substance. - -![The "News and Weather" app showing... the news and weather.](http://cdn.arstechnica.net/wp-content/uploads/2014/01/newsandweather.png) -The "News and Weather" app showing... the news and weather. -Photo by Ron Amadeo - -Compare the Gallery to the other new Android 2.1 app: News And Weather. While the Gallery was a transparency-filled animation fest, News And Weather was all about dark gradients and contrasting colors. This app powered the weather display on the desk clock app, and it even came with a home screen widget. The first screen just showed the weather and a six-day forecast for your current location. Along the top of the screens were tabs, next to the city name was a small "i" button that would bring up a temperature and precipitation graph. You could slide your finger along the graph to get exact temperatures and precipitation for any given minute. - -The big innovation in this app was swipeable tabs, an idea that would eventually become a standard Android UI convention. After the weather were a bunch of user configurable news tabs, and besides tapping on the tabs to switch to them, you could just swipe horizontally across the screen and the tab would change. The news tabs all showed a list of news headlines that were almost always truncated to the point that you had no idea what the story was about. When opening a webpage from this app, it didn't load the browser. Instead, it opened the story within the app complete with a weird white border. - -![Google Maps showing off some Labs features, the new widget designs, the only screen we can access in Google Voice, and the new tabbed music design.](http://cdn.arstechnica.net/wp-content/uploads/2014/04/ccccombo.jpg) -Google Maps showing off some Labs features, the new widget designs, the only screen we can access in Google Voice, and the new tabbed music design. -Photo by Ron Amadeo - -Widgets in 2.1 were all redesigned, with almost everything receiving a black gradient, and made better use of the available space. The clock changed back to a circle, and the calendar got a blue top, which matched the app a little more closely. Google Voice will start up, but the sign-in is broken—this is as far as you can get. - -The oft-neglected Music app got a minor update. The four-button home screen was removed completely, and tabs for each music display mode were added to the top of the screen. This meant when opening the app, you were immediately presented with a list of music, instead of a navigational page. Unlike the News and Weather app, these newly installed tabs here could not be swiped between. - ----------- - -![Ron Amadeo](http://cdn.arstechnica.net/wp-content//uploads/authors/ron-amadeo-sq.jpg) - -[Ron Amadeo][a] / Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS and Google products. He is always on the hunt for a new gadget and loves to rip things apart to see how they work. - -[@RonAmadeo][t] - --------------------------------------------------------------------------------- - -via: - -译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://arstechnica.com/author/ronamadeo -[t]:https://twitter.com/RonAmadeo diff --git a/translated/talk/The history of Android/12 - The history of Android.md b/translated/talk/The history of Android/12 - The history of Android.md new file mode 100644 index 0000000000..9d28e9861d --- /dev/null +++ b/translated/talk/The history of Android/12 - The history of Android.md @@ -0,0 +1,98 @@ +安卓编年史 +================================================================================ +### Android 2.1——动画的大发现（以及滥用）时代 ### + +安卓2.1随着Nexus One的发布一同到来，这时距安卓2.0的发布仅仅过了三个月。新系统并不是一个大的更新升级，所以它仍然使用Éclair（泡芙）这个名称。安卓的开发以一种闻所未闻的步伐不稳定地进行，在过去的15个月中，谷歌平均每两个半月就发布一个新版本。 + +绝大部分得益于威瑞森在市场营销上的努力以及“Droid”产品线，安卓日益流行起来。即便如此，这个系统还是被认为丑，这时的安卓工程师看起来几乎没有接受过正式的设计培训，在安卓2.1中，他们尝试着通过在所有能用上的地方大量使用动画效果，想让东西看起来更整齐一点。这么做的结果就是系统看起来拼命想要证明它可以实现动画效果。许多新增的部分感觉更像是技术的演示（demo）而不是用户体验的改善。 + +![安卓2.1和2.0中的锁屏和主屏幕。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/21.png) +安卓2.1和2.0中的锁屏和主屏幕。 +Ron Amadeo供图 + +安卓2.0的旋转拨号式锁屏在仅仅一个版本之后就被踢到路边去了，取而代之的是和来电界面使用的相同的左/右拉标签式解锁。锁屏时钟尝试使用了一种独特的安卓字体，但是相比其它字体来说，它真是丑得可以。 + +安卓2.1最大的特色之一是“动态壁纸”——可互动的或是动态图片可以被设置为壁纸。默认的动态壁纸是个灰色正方形组成的大方阵，不断有蓝色，红色，黄色以及绿色的光点拖着尾巴穿越屏幕。点击屏幕会使光点以你点击的位置为中心向四个方向射出。尽管动态壁纸看起来很棒（并且相对iPhone而言是个独特的特性），动画背景对电池和处理器而言可不是什么好事。它似乎让整个系统的运行都变得有点慢了。 + +在主屏幕上，默认的谷歌搜索小部件周围有了更多空间，并且现在它位于所在行的正中央。页面指示器现在在屏幕底部的左右角落，主屏幕的页数也从3变成了5。底部的应用抽屉标签被替换为一个正方形方阵组成的图标，这个（对应用列表的）暗喻直到今天谷歌也还在使用。 + +![图片展示了安卓2.1和2.0中的应用抽屉设计以及应用的选择。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/21icons.png) +图片展示了安卓2.1和2.0中的应用抽屉设计以及应用的选择。 +Ron Amadeo供图 + +和新应用抽屉图标一同到来的还有全新的应用抽屉。应用抽屉不再是以前从屏幕底部上拉的带标签容器的样子，新界面显示为一个全屏界面。原先的碳纤维编织纹理被去掉了，变成了一个纯黑背景——这个决定会一直持续到KitKat。 + +谷歌决定添加一个浮动的，半透明的home图标到应用抽屉的底部，好让人们方便地退出全屏的应用列表界面。这个可以看作是安卓4.0中引入的虚拟home键的前身。 + +应用抽屉同样有个俗气的图形效果。在滚动的时候，在应用列表顶部和底部的图标会向内弯曲并且看起来像是向手机深处移动一样，有点像星球大战开场的滚动字幕。 + +应用的图标也有不多的改变。“Amazon MP3”和“Alarm Clock”（闹钟）都去掉了前面那个单词，然后他们就从按字母排序的列表的前两个位置退了下来。出现了两个新的应用：新闻和天气，以及Google Voice，这是谷歌的通信服务。由于Nexus One不是威瑞森的定制机，威瑞森的可视语音邮件被去掉了。 + +![修改后的时钟应用。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/clo2ck.png) +修改后的时钟应用。 +Ron Amadeo供图 + +不止是名称的更改，时钟应用还迎来了整体上的重制。点击时钟快捷方式不再会打开闹钟页面；取而代之的是去到“桌面时钟”界面（上方左图），它带有一个和壁纸一致的背景。时钟使用和锁屏一样的字体，并从新的新闻和天气应用中获取天气。 + +新的闹钟页面清除了许多旧版本中奇怪的设计。模拟时钟和可选择的时钟样式已经不见了。复选框已经被一个带绿色亮光的开关所取代，它比“灰色勾选/绿色勾选”更容易理解。尽管可能从快照很难看出来，旧的闹钟设计在时间旁同时显示AM和PM。2.1的设计里取消了这一项，只显示相关的AM/PM标记。底部放置了一个数字时钟，点击时钟图标会将你带回桌面时钟界面。 + +![安卓2.1和2.0中的相册和单独图片查看界面。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/gallery1.png) +安卓2.1和2.0中的相册和单独图片查看界面。 +Ron Amadeo供图 + +谷歌想要改进安卓外观的欲望在2.1的相册中最为明显，这里几乎都是大量使用的动画效果和半透明。当应用打开的时候，单独的图片从屏幕顶部飞下并且打乱成小堆组成相册。当打开相册的时候，图片堆各自分离，照片滑开形成方阵的形式。所有你触摸的东西会弹开，压缩，以及拉伸，就像是果冻的弹簧片一样。 + +相册这里没有一个“标准”的背景。他会从屏幕上随机选择一张图片并深度模糊，然后作为背景图片使用。当这张图片滑出屏幕显示范围后，它会重新选择一张背景图片，所以背景色调总是会和你的图片相匹配。 + +屏幕的左上角放置了面包屑导航栏。它显示你当前的位置，以及你所在位置和主界面之间的任何文件夹——它可以被看作是在安卓3.0中即将推出的“向上”按钮的前身。在右上角是一个相机的链接，这还留着相同的在安卓1.6中登场的人造皮革设计——两个设计截然不同。 + +而相机是另一个奇怪的，一次性的设计，从来没有哪个安卓应用间随意的UI设计差距能有和新的相册应用间这么明显。它并没有采用安卓的按钮，菜单，或任何现有的UI规范。它甚至在每个界面隐藏了状态栏——你几乎不能分辨出你正在盯着的是安卓。 + +在单张照片查看视图，你终于可以图片之间滑动切换，从而去掉了短粗的左右箭头。出于某种原因，这个界面并没有颜色匹配的背景。它是应用中唯一一个背景为黑色的部分。缩放控制在右上方（仍然没有捏合缩放），可用命令沿着屏幕的底部排成一行。点击“菜单”按钮（虚拟或实体键）并不会像所有其他的应用一样出现一个2×3格的方阵——仅仅是底部的一行选项从两个变成了另外三个选项。 + +![充满动画效果的相册应用。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/gallery2.png) +充满动画效果的相册应用。 +Ron Amadeo供图 + +上面第一张图片，显示了一个相册视图。大型相册的话你可以水平滚动，或使用在屏幕底部的快速滚动条。长按上的图片（虽然有点奇怪，或者按实体菜单按钮）会弹出一个“复选框”界面，在这里你可以点击几张照片同时选中它们。你选中照片之后，你可以批量分享，删除或旋转照片。 + +这个界面和接下来的单张照片查看界面的菜单是半透明语音气泡式的，点击各个按钮时它们会跳出来。再重复一遍，这和你所得到的正常的安卓体验规范远远不同。相册还是第一个拥有越界效果（overscroll）的应用之一。当你到达照片墙的底部时，整个界面会向滚动的方向扭曲。 + +2.1的相册是第一个能同时显示您云存储的Picasa照片以及本地照片的客户端。这些照片缩略图的左下角有白色相机快门图标。这后来成为了Google+ Photos。 + +之前或之后任何安卓应用程序看起来都不像这个相册。有很好的理由解释这是为什么——它不是谷歌做的！这个应用外包给了Cooliris，他们看样子并没有打算花费精力遵循任何一条现有的安卓UI规范。尽管应用是可用的，所有的动画和效果使它看起来像是只注重风格而不注重实质的产物。 + +![“新闻和天气”应用展示了……新闻和天气。](http://cdn.arstechnica.net/wp-content/uploads/2014/01/newsandweather.png) +“新闻和天气”应用展示了……新闻和天气。 +Ron Amadeo供图 + +来比较下相册应用和另一个全新的安卓2.1应用：新闻和天气。相册是个充满透明动画效果的汇聚，而新闻和天气则全是深色渐变和对比色。这个应用提供了桌面时钟的天气显示，它甚至还带着一个主屏幕小部件。第一张图显示的是当前位置的天气和六天预报。沿着屏幕顶部排列着一些标签，城市名称旁有个小小的“i”按钮，点击它会打开温度和降水图。你可以在图上滑动以得到指定时间的精确温度和降水信息。 + +这个应用里最大的创新在于可滑动标签，这个想法最终将成为一个标准的安卓UI规范。在天气之后是一些可由用户定制的新闻标签，除了点击标签切换之外，你还可以在屏幕上水平滑动，标签也会跟着切换。新闻标签都显示着一个新闻标题列表，它们几乎总是正好截断到你弄不明白这条新闻讲了什么的程度。当你从这个应用打开一个网页时，它并不会启动浏览器。相反，它会在应用内打开新闻，带着个奇怪的白色边框。 + +![谷歌地图的一些实验性功能，新的小部件设计，Google Voice里我们能接触到的唯一一个界面，以及新的带标签的音乐界面设计。](http://cdn.arstechnica.net/wp-content/uploads/2014/04/ccccombo.jpg) +谷歌地图的一些实验性功能，新的小部件设计，Google Voice里我们能接触到的唯一一个界面，以及新的带标签的音乐界面设计。 +Ron Amadeo供图 + +安卓2.1里的小部件全部经过了重新设计，几乎所有东西都带有黑色渐变，空间利用上也更加合理。时钟变回了一个圆，日历的顶部加上了蓝色，着让它和应用变得更加相似。Google Voice可以启动，但是登录已经失效了——这是你现在能看到的所有东西了。 + +人们经常忽视的音乐应用有个小更新。四个按钮的主界面被完全去除，并且在屏幕顶部添加了每个音乐显示模式的标签。这意味着在打开应用的时候，你就能直接看到音乐列表，而不是一个导航页。不同于新闻和天气应用里的标签，这些新增的标签不能滑动切换。 + +---------- + +![Ron Amadeo](http://cdn.arstechnica.net/wp-content//uploads/authors/ron-amadeo-sq.jpg) + +[Ron Amadeo][a] / Ron是Ars Technica的评论编缉，专注于安卓系统和谷歌产品。他总是在追寻新鲜事物，还喜欢拆解事物看看它们到底是怎么运作的。 + +[@RonAmadeo][t] + +-------------------------------------------------------------------------------- + +via: + +译者：[alim0x](https://github.com/alim0x) 校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://arstechnica.com/author/ronamadeo +[t]:https://twitter.com/RonAmadeo From 126d103bec40f9338a28caf048d87980e7ff81e6 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Sat, 24 Jan 2015 13:12:58 +0800 Subject: [PATCH 013/207] translating --- ...y Of Notifications With Recent Notifications AppIndicator.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md b/sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md index 28bdb2443d..7dfde4e12a 100644 --- a/sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md +++ b/sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md @@ -1,3 +1,5 @@ +Translating----geekpi + Keep History Of Notifications With Recent Notifications AppIndicator ================================================================================ ![How to see recent notifications in Ubuntu 14.04](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/recent_notifications_Ubuntu_14.jpeg) From 68e5ad658a4c3497449c31a7eadbb0516baa76ff Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Sat, 24 Jan 2015 13:58:59 +0800 Subject: [PATCH 014/207] translated --- ... With Recent Notifications AppIndicator.md | 42 ------------------- ... With Recent Notifications AppIndicator.md | 40 ++++++++++++++++++ 2 files changed, 40 insertions(+), 42 deletions(-) delete mode 100644 sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md create mode 100644 translated/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md diff --git a/sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md b/sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md deleted file mode 100644 index 7dfde4e12a..0000000000 --- a/sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md +++ /dev/null @@ -1,42 +0,0 @@ -Translating----geekpi - -Keep History Of Notifications With Recent Notifications AppIndicator -================================================================================ -![How to see recent notifications in Ubuntu 14.04](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/recent_notifications_Ubuntu_14.jpeg) - -Most of the desktop environments like Unity and Gnome have notification featured. Something which I like a lot. It specially helps me when I am listening to [streaming radio on Ubuntu][1]. But by default the notification is displayed on the top of the desktop for a couple of seconds and then it fades in disappearance. Now, what if you hear the notification sound but did not see it in time? How do you know what notification was it? - -If somehow you could have a history of all recent notifications, would it not be great? Yes, I know it would be great. You can easily keep track of all recent notifications in Ubuntu Unity or GNOME using Recent **Notifications applet indicator**. - -Recent Notifications sits in the top panel and keeps the history of all recent notifications. When there are new notifications captured by it, the indicator turns green to notify you of unread notifications. - -![Recent notifications in Ubuntu 14.04](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/recent_notifications_Ubuntu.jpeg) - -When you click on it, you will see all the recent notifications. You can either choose to clear all of the notifications or remove some of those. - -![Recent notifications applet indicator](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/recent_notifications_Ubuntu_1.jpeg) - -Unfortunately there are no configuration options here. Therefore you cannot block notifications from specific applications. All kind of notifications will be saved here. - -### Install Recent Notifications in Ubuntu 14.04 and 14.10 ### - -Normally this Recent Notification applet indicator should also work in Linux Mint Cinnamon edition. You can give it a try. Use the following commands to install Recent Notifications applet indicator in Ubuntu 14.04 and 14.10: - - sudo add-apt-repository ppa:jconti/recent-notifications - sudo apt-get update - sudo apt-get install indicator-notifications - -After installation, log out, log back in and you are good to go. Now none of the recent notifications will go unnoticed. Hand applet indicator, isn’t it? - --------------------------------------------------------------------------------- - -via: http://itsfoss.com/notifications-appindicator/ - -作者：[Abhishek][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://itsfoss.com/author/Abhishek/ -[1]:http://itsfoss.com/apps-internet-streaming-radio-ubuntu/ \ No newline at end of file diff --git a/translated/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md b/translated/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md new file mode 100644 index 0000000000..2cc7a4778a --- /dev/null +++ b/translated/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md @@ -0,0 +1,40 @@ +使用最近通知工具保持通知历史 +================================================================================ +![How to see recent notifications in Ubuntu 14.04](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/recent_notifications_Ubuntu_14.jpeg) + +大多数桌面环境像Unity和Gnome都有通知特性。我很喜欢其中一些。它尤其当我[在Ubuntu上收听流媒体][1]时帮到我。默认上通知会在桌面的顶部显示几秒接着就会小时。如果你听见了通知的声音但是没有看到内容怎么办？你该如何知道通知的内容？ + +如果你可以看到最近所有通知的历史会很棒吧？是的，我知道这很棒。你可以在Ubuntu Unity或者Gnome中使用最近**通知小工具**来追踪所有的最近通知。 + +最近通知位于顶部面板，并且有最近所有通知的历史。当它捕获到新的通知后，它就会变绿来表明你有未读的通知。 + +![Recent notifications in Ubuntu 14.04](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/recent_notifications_Ubuntu.jpeg) + +当你点击它后，你就会看到最近所有的通知。你可以选择清空所有或者删除部分。 + +![Recent notifications applet indicator](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/recent_notifications_Ubuntu_1.jpeg) + +不幸的是它没有配置选项。因此你不能屏蔽特定程序的通知。所有的通知都会被保存。 + +### 在Ubuntu 14.04 和 14.10 中安装最近通知工具 ### + +一般说来这个最近通知工具应该也可以在Linux Mint Cinnamon版本中运行。你可以试一试。使用下面的命令来在在Ubuntu 14.04 和 14.10 中安装最近通知工具： + + sudo add-apt-repository ppa:jconti/recent-notifications + sudo apt-get update + sudo apt-get install indicator-notifications + +安装完成后，重新登录后你就可以用了。现在它是没有通知的状态。很方便的小工具，不是么？ + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/notifications-appindicator/ + +作者：[Abhishek][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:http://itsfoss.com/apps-internet-streaming-radio-ubuntu/ \ No newline at end of file From c7c7ef3bbe7c35327a1b00091676677e09a9af17 Mon Sep 17 00:00:00 2001 From: liyoufan Date: Sat, 24 Jan 2015 17:56:47 +0800 Subject: [PATCH 015/207] Update 13 - The history of Android.md --- .../The history of Android/13 - The history of Android.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/talk/The history of Android/13 - The history of Android.md b/sources/talk/The history of Android/13 - The history of Android.md index 85c04441ac..31f5cd7eb4 100644 --- a/sources/talk/The history of Android/13 - The history of Android.md +++ b/sources/talk/The history of Android/13 - The history of Android.md @@ -1,4 +1,4 @@ -The history of Android +【translating】The history of Android ================================================================================ ![](http://cdn.arstechnica.net/wp-content/uploads/2014/03/ready-fight.png) @@ -101,4 +101,4 @@ via: http://arstechnica.com/gadgets/2014/06/building-android-a-40000-word-histor [3]:http://arstechnica.com/information-technology/2010/07/android-22-froyo/ [4]:http://arstechnica.com/information-technology/2010/07/android-22-froyo/ [a]:http://arstechnica.com/author/ronamadeo -[t]:https://twitter.com/RonAmadeo \ No newline at end of file +[t]:https://twitter.com/RonAmadeo From c0d8129cb9f48c1ec8dbda806ef432b14f0dfad7 Mon Sep 17 00:00:00 2001 From: wxy Date: Sat, 24 Jan 2015 21:59:36 +0800 Subject: [PATCH 016/207] PUB:20141205 Find Out Network Adapters Available In Ubuntu Linux @geekpi --- ...d Out Network Adapters Available In Ubuntu Linux.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename {translated/tech => published}/20141205 Find Out Network Adapters Available In Ubuntu Linux.md (90%) diff --git a/translated/tech/20141205 Find Out Network Adapters Available In Ubuntu Linux.md b/published/20141205 Find Out Network Adapters Available In Ubuntu Linux.md similarity index 90% rename from translated/tech/20141205 Find Out Network Adapters Available In Ubuntu Linux.md rename to published/20141205 Find Out Network Adapters Available In Ubuntu Linux.md index d20083a363..b92b7cf01f 100644 --- a/translated/tech/20141205 Find Out Network Adapters Available In Ubuntu Linux.md +++ b/published/20141205 Find Out Network Adapters Available In Ubuntu Linux.md @@ -1,10 +1,10 @@ -在Ubuntu上找出可用的网络适配器 +如何在Ubuntu上找出可用的网络适配器 ================================================================================ 想知道**在Linux中你正在使用的网卡是什么吗？** 在Linux中很容易就找出网卡的生产商。打开一个终端并输入下面的额命令： sudo lshw -C network -如果上面的命令不能在sudo下使用，那就移除sudo。它的输出看上去有点奇怪但是很有用。 +如果上面的命令不能在sudo下使用，那就别用 sudo 的特权模式。它的输出看上去有点奇怪但是很有用。 ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/12/Network_Adapter_Linux.jpeg) @@ -36,7 +36,7 @@ > > resources: irq:18 memory:b0600000-b0607fff memory:b0400000-b05fffff -如你所见，我Macbook Air上的无线网卡是BCM4360，这是一款在Ubuntu下面经常无法检测无线网络的很容易出问题的网卡。 +如你所见，我Macbook Air上的无线网卡是BCM4360，这是一款在Ubuntu下面很容易出现无法检测无线网络问题的网卡。 [lshw][1] 命令实际上死用来列出硬件的，因此命令的名字是lshw。带上网络的选项后，就会只过滤出网络硬件了。 @@ -82,7 +82,7 @@ > > 04:00.0 SATA controller: Marvell Technology Group Ltd. 88SS9183 PCIe SSD Controller (rev 14) -这些命令会同时列出有线和无线的网卡。你应该注意到上面的输出中显示我的系统中没有有线网卡。因为我使用的是Macbook Air，他没有以太网端口 +这些命令会同时列出有线和无线的网卡。你应该注意到上面的输出中显示我的系统中没有有线网卡。因为我使用的是Macbook Air，它没有以太网端口 我希望这边文章可以帮助你找到你系统中的网卡。欢迎提出问题和建议。 @@ -92,7 +92,7 @@ via: http://itsfoss.com/find-network-adapter-ubuntu-linux/ 作者：[Abhishek][a] 译者：[geekpi](https://github.com/geekpi) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 7bc48d7fba0cf323b5131dc6db743e9401b2fe8a Mon Sep 17 00:00:00 2001 From: wxy Date: Sat, 24 Jan 2015 22:20:52 +0800 Subject: [PATCH 017/207] PUB:20141222 A Great Tool To Show Linux Command Progress Like ETA @GOLinux --- ...To Show Linux Command Progress Like ETA.md | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) rename {translated/tech => published}/20141222 A Great Tool To Show Linux Command Progress Like ETA.md (67%) diff --git a/translated/tech/20141222 A Great Tool To Show Linux Command Progress Like ETA.md b/published/20141222 A Great Tool To Show Linux Command Progress Like ETA.md similarity index 67% rename from translated/tech/20141222 A Great Tool To Show Linux Command Progress Like ETA.md rename to published/20141222 A Great Tool To Show Linux Command Progress Like ETA.md index 084a2b2858..e51bd26b4f 100644 --- a/translated/tech/20141222 A Great Tool To Show Linux Command Progress Like ETA.md +++ b/published/20141222 A Great Tool To Show Linux Command Progress Like ETA.md @@ -1,12 +1,12 @@ -一个用%显示Linux命令进度预计完成时间的伟大工具 +一个可以显示Linux命令运行进度的伟大工具 ================================================================================ -Coreutils Viewer（**cv**）是一个简单的程序，它可以用于显示任何核心组件命令的进度。它使用文件描述信息来确定一个命令的进度，比如cp命令。**cv**之美在于，它能够和其它Linux命令一起使用，比如你所知道的watch以及I/O重定向命令。这样，你就可以在脚本中使用，或者你能想到的所有方式，别让你的想象力束缚住你。 +Coreutils Viewer（**cv**）是一个简单的程序，它可以用于显示任何核心组件命令（如：cp、mv、dd、tar、gzip、gunzip、cat、grep、fgrep、egrep、cut、sort、xz、exiting）的进度。它使用文件描述信息来确定一个命令的进度，比如cp命令。**cv**之美在于，它能够和其它Linux命令一起使用，比如你所知道的watch以及I/O重定向命令。这样，你就可以在脚本中使用，或者你能想到的所有方式，别让你的想象力束缚住你。 ### 安装 ### 你可以从cv的[github仓库那儿][1]下载所需的源文件。把zip文件下载下来后，将它解压缩，然后进入到解压后的文件夹。 -该程序依赖于**ncurses library**。如果你已经在你的Linux系统中安装了ncurses，那么cv的安装过程对你而言就是那么得轻松写意。 +该程序需要**ncurses library**。如果你已经在你的Linux系统中安装了ncurses，那么cv的安装过程对你而言就是那么的轻松写意。 通过以下两个简单步骤来进行编译和安装吧。 @@ -23,20 +23,21 @@ Coreutils Viewer（**cv**）是一个简单的程序，它可以用于显示任 $ cv -如果没有核心组件命令在运行，那么cv程序会退出，并告诉你：No coreutils is running。 +如果没有核心组件命令在运行，那么cv程序会退出，并告诉你：没有核心组件命令在运行。 ![cv no command](http://blog.linoxide.com/wp-content/uploads/2014/11/cv-no-command.png) 要有效使用该程序，请在你系统上运行某个核心组件程序。在本例中，我们将使用**cp**命令。 -当拷贝一个打文件时，你就可以看到进度了，以百分比显示。 +当拷贝一个打文件时，你就可以看到当前进度了，以百分比显示。 ![cv default](http://blog.linoxide.com/wp-content/uploads/2014/11/cv-default.png) -### 添加选项到cv ### +### 添加选项到 cv ### 你也可以添加几个选项到cv命令，就像其它命令一样。一个有用的选项是让你了解到拷贝或移动大文件时的预计剩余时间。 -添加**-w**选项，它会帮你做以上这些事。 + +添加**-w**选项，它就会帮你显示预计的剩余时间。 $ cv -w @@ -46,9 +47,9 @@ Coreutils Viewer（**cv**）是一个简单的程序，它可以用于显示任 $ cv -wq -### cv和watch命令 ### +### cv 和 watch 命令 ### -watch是一个用于周期性运行程序并显示输出结果的程序。有时候，你可能想要看看命令运行期间的状况而不想存储数据到日志文件中。在这种情况下，watch就会派上用场了，它可以和cv一起使用。 +watch是一个用于周期性运行程序并显示输出结果的程序。有时候，你可能想要持续看看命令运行状况而不想将 cv 的结果存储到日志文件中。在这种情况下，watch就会派上用场了，它可以和cv一起使用。 $ watch cv -qw @@ -58,7 +59,7 @@ watch是一个用于周期性运行程序并显示输出结果的程序。有时 ### 在日志文件中查看输出结果 ### -正如所承诺的那样，你可以使用cv来重定向它的输出结果到一个日志文件。这功能在命令运行太快而看不到任何有意义的内容时特别有用。 +正如其所承诺的那样，你可以使用cv来重定向它的输出结果到一个日志文件。这功能在命令运行太快而看不到任何有意义的内容时特别有用。 要在日志文件中查看进度，你仅仅需要重定向输出结果，就像下面这样。 @@ -81,7 +82,7 @@ watch是一个用于周期性运行程序并显示输出结果的程序。有时 但是，要获取上述手册页，你必须执行make install来安装cv。 -耶！现在，你的Linux工具箱中又多了个伟大的工具。 +耶！现在，你的Linux工具箱中又多了个伟大的工具。 你学会么？亲自去试试吧~ -------------------------------------------------------------------------------- @@ -89,7 +90,7 @@ via: http://linoxide.com/linux-command/tool-show-command-progress/ 作者：[Allan Mbugua][a] 译者：[GOLinux](https://github.com/GOLinux) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From bf5b9619d554c254c9c07ee8bbe37d99a370db3e Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Sun, 25 Jan 2015 13:23:45 +0800 Subject: [PATCH 018/207] translating --- ... to download and install ixgbe driver on Ubuntu or Debian.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md b/sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md index 238794a019..31219b9ec4 100644 --- a/sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md +++ b/sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md @@ -1,3 +1,5 @@ +Translating----geekpi + Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian ================================================================================ > **Question**: I want to download and install the latest ixgbe driver for my Intel 10 Gigabit Ethernet card. How can I install ixgbe driver on Ubuntu (or Debian)? From 6dcf189a616f19f3e58e25b25c5dd0de1e262074 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Sun, 25 Jan 2015 13:54:58 +0800 Subject: [PATCH 019/207] translated --- ...nstall ixgbe driver on Ubuntu or Debian.md | 146 ------------------ 1 file changed, 146 deletions(-) delete mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md b/sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md deleted file mode 100644 index 31219b9ec4..0000000000 --- a/sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md +++ /dev/null @@ -1,146 +0,0 @@ -Translating----geekpi - -Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian -================================================================================ -> **Question**: I want to download and install the latest ixgbe driver for my Intel 10 Gigabit Ethernet card. How can I install ixgbe driver on Ubuntu (or Debian)? - -Intel's PCI Express 10 Gigabit (10G) network inerface cards (e.g., 82598, 82599, x540) are supported by ixgbe driver. The stock kernel of the modern Linux distributions already comes with ixgbe driver as a loadable module. However, there are cases where you may want to compile and install ixgbe driver on your own. For example, you may want to try the new features of the latest ixgbe driver. Also, the problem of the default ixgbe driver in the stock kernel is that it does not allow you to customize many of its driver parameters. If you want to fully customize ixgbe device driver (e.g., RSS, multi-queue, interrupt throttling, etc), you need to manually compile ixgbe driver from the source. - -Here is how to download and install ixgbe driver on Ubuntu, Debian or their derivatives. - -### Step One: Install Prerequites ### - -As prerequisites, install matching kernel headers and development packages. - - $ sudo apt-get install linux-headers-$(uname -r) - $ sudo apt-get install gcc make - -### Step Two: Compile Ixgbe Driver ### - -Download the source code of the [latest ixgbe driver][1]. - - $ wget http://sourceforge.net/projects/e1000/files/ixgbe%20stable/3.23.2/ixgbe-3.23.2.tar.gz - -Compile ixgbe driver as follows. - - $ tar xvfvz ixgbe-3.23.2.tar.gz - $ cd ixgbe-3.23.2/src - $ make - -### Step Three: Check Ixgbe Driver ### - -After compilation, you will see **ixgbe.ko** created in ixgbe-3.23.2/src directory. This is the ixgbe device driver which will be loaded into the kernel. - -Check the information of this kernel module with modinfo command. Note that you need to specify an absolute path to the module (e.g., ./ixgbe.ko or /home/xmodulo/ixgbe/ixgbe-3.23.2/src/ixgbe.ko). The output will show the version of ixgbe driver. - - $ modinfo ./ixgbe.ko - ----------- - - filename: /home/xmodulo/ixgbe/ixgbe-3.23.2/src/ixgbe.ko - version: 3.23.2 - license: GPL - description: Intel(R) 10 Gigabit PCI Express Network Driver - author: Intel Corporation, - srcversion: 2ADA5E537923E983FA9DAE2 - alias: pci:v00008086d00001560sv*sd*bc*sc*i* - alias: pci:v00008086d00001558sv*sd*bc*sc*i* - alias: pci:v00008086d0000154Asv*sd*bc*sc*i* - alias: pci:v00008086d00001557sv*sd*bc*sc*i* - alias: pci:v00008086d0000154Fsv*sd*bc*sc*i* - alias: pci:v00008086d0000154Dsv*sd*bc*sc*i* - alias: pci:v00008086d00001528sv*sd*bc*sc*i* - alias: pci:v00008086d000010F8sv*sd*bc*sc*i* - alias: pci:v00008086d0000151Csv*sd*bc*sc*i* - alias: pci:v00008086d00001529sv*sd*bc*sc*i* - alias: pci:v00008086d0000152Asv*sd*bc*sc*i* - alias: pci:v00008086d000010F9sv*sd*bc*sc*i* - alias: pci:v00008086d00001514sv*sd*bc*sc*i* - alias: pci:v00008086d00001507sv*sd*bc*sc*i* - alias: pci:v00008086d000010FBsv*sd*bc*sc*i* - alias: pci:v00008086d00001517sv*sd*bc*sc*i* - alias: pci:v00008086d000010FCsv*sd*bc*sc*i* - alias: pci:v00008086d000010F7sv*sd*bc*sc*i* - alias: pci:v00008086d00001508sv*sd*bc*sc*i* - alias: pci:v00008086d000010DBsv*sd*bc*sc*i* - alias: pci:v00008086d000010F4sv*sd*bc*sc*i* - alias: pci:v00008086d000010E1sv*sd*bc*sc*i* - alias: pci:v00008086d000010F1sv*sd*bc*sc*i* - alias: pci:v00008086d000010ECsv*sd*bc*sc*i* - alias: pci:v00008086d000010DDsv*sd*bc*sc*i* - alias: pci:v00008086d0000150Bsv*sd*bc*sc*i* - alias: pci:v00008086d000010C8sv*sd*bc*sc*i* - alias: pci:v00008086d000010C7sv*sd*bc*sc*i* - alias: pci:v00008086d000010C6sv*sd*bc*sc*i* - alias: pci:v00008086d000010B6sv*sd*bc*sc*i* - depends: ptp,dca - vermagic: 3.11.0-19-generic SMP mod_unload modversions - parm: InterruptType:Change Interrupt Mode (0=Legacy, 1=MSI, 2=MSI-X), default IntMode (deprecated) (array of int) - parm: IntMode:Change Interrupt Mode (0=Legacy, 1=MSI, 2=MSI-X), default 2 (array of int) - parm: MQ:Disable or enable Multiple Queues, default 1 (array of int) - parm: DCA:Disable or enable Direct Cache Access, 0=disabled, 1=descriptor only, 2=descriptor and data (array of int) - parm: RSS:Number of Receive-Side Scaling Descriptor Queues, default 0=number of cpus (array of int) - parm: VMDQ:Number of Virtual Machine Device Queues: 0/1 = disable, 2-16 enable (default=8) (array of int) - parm: max_vfs:Number of Virtual Functions: 0 = disable (default), 1-63 = enable this many VFs (array of int) - parm: VEPA:VEPA Bridge Mode: 0 = VEB (default), 1 = VEPA (array of int) - parm: InterruptThrottleRate:Maximum interrupts per second, per vector, (0,1,956-488281), default 1 (array of int) - parm: LLIPort:Low Latency Interrupt TCP Port (0-65535) (array of int) - parm: LLIPush:Low Latency Interrupt on TCP Push flag (0,1) (array of int) - parm: LLISize:Low Latency Interrupt on Packet Size (0-1500) (array of int) - parm: LLIEType:Low Latency Interrupt Ethernet Protocol Type (array of int) - parm: LLIVLANP:Low Latency Interrupt on VLAN priority threshold (array of int) - parm: FdirPballoc:Flow Director packet buffer allocation level: - 1 = 8k hash filters or 2k perfect filters - 2 = 16k hash filters or 4k perfect filters - 3 = 32k hash filters or 8k perfect filters (array of int) - parm: AtrSampleRate:Software ATR Tx packet sample rate (array of int) - parm: FCoE:Disable or enable FCoE Offload, default 1 (array of int) - parm: LRO:Large Receive Offload (0,1), default 1 = on (array of int) - parm: allow_unsupported_sfp:Allow unsupported and untested SFP+ modules on 82599 based adapters, default 0 = Disable (array of int) - -### Step Four: Test Ixgbe Driver ### - -Before testing the new module, you need to remove an old ersion of ixgbe module if it exists in the kernel: - - $ sudo rmmod ixgbe - -Go ahead and insert the newly built ixgbe module into the kernel with insmod command. Make sure to specify an absolute path to the module. - - $ sudo insmod ./ixgbe.ko - -If the above command runs successfully, it will not show any message. - -If you want, you can try passing additional prameter(s). For example, to set the number of RSS queues to 16: - - $ sudo insmod ./ixgbe.ko RSS=16 - -Check out **/var/log/kern.log** to see if ixgbe driver is successfully activated. Look for "Intel(R) 10 Gigabit PCI Express Network Driver" in the log. The ixgbe version should be matched with the output of modinfo shown earlier. - - Sep 18 14:48:52 spongebob kernel: [684717.906254] Intel(R) 10 Gigabit PCI Express Network Driver - version 3.22.3 - -![](https://farm8.staticflickr.com/7583/16056721867_f06e152076_c.jpg) - -### Step Five: Install Ixgbe Driver ### - -Once you verify that a new ixgbe driver is successfully loaded, the last step is to install the driver on your system. - - $ sudo make install - -**ixgbe.ko** will then be installed under /lib/modules//kernel/drivers/net/ethernet/intel/ixgbe. - -From this point on, you can load ixgbe driver with modprobe command as follows. Note that you no longer need to specify an absolute path. - - $ sudo modprobe ixgbe - -If you want ixgbe driver to be loaded automatically upon boot, you can add "ixgbe" to the end of /etc/modules. - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/download-install-ixgbe-driver-ubuntu-debian.html - -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://sourceforge.net/projects/e1000/files/ixgbe%20stable/ \ No newline at end of file From 4c2214f6c2633d96577dcabe8bbdeba451bcb571 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Sun, 25 Jan 2015 13:56:08 +0800 Subject: [PATCH 020/207] translated --- ated]12 - The history of Android.md | 7113 +++++++++++++++++ gihua | 232 + ...nstall ixgbe driver on Ubuntu or Debian.md | 144 + 3 files changed, 7489 insertions(+) create mode 100644 ated]12 - The history of Android.md create mode 100644 gihua create mode 100644 translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md diff --git a/ated]12 - The history of Android.md b/ated]12 - The history of Android.md new file mode 100644 index 0000000000..346158bb9f --- /dev/null +++ b/ated]12 - The history of Android.md @@ -0,0 +1,7113 @@ +commit bf5b9619d554c254c9c07ee8bbe37d99a370db3e +Author: zhengsihua +Date: Sun Jan 25 13:23:45 2015 +0800 + + translating + +commit 68e5ad658a4c3497449c31a7eadbb0516baa76ff +Author: zhengsihua +Date: Sat Jan 24 13:58:59 2015 +0800 + + translated + +commit 126d103bec40f9338a28caf048d87980e7ff81e6 +Author: zhengsihua +Date: Sat Jan 24 13:12:58 2015 +0800 + + translating + +commit 55b5a17d77b048219177e1f237b552265c8735c9 +Merge: b90b0e6 cadf2b8 +Author: geekpi +Date: Sat Jan 24 13:03:24 2015 +0800 + + Merge pull request #2284 from alim0x/master + + [translated]12 - The history of Android.md + +commit cadf2b8e6082cb045322d6e5be11a90507971255 +Author: alim0x +Date: Sat Jan 24 12:34:03 2015 +0800 + + [translated]12 - The history of Android.md + +commit b90b0e6f2ffeeb15b474ef6852be052e0d0e9500 +Author: wxy +Date: Sat Jan 24 12:05:53 2015 +0800 + + PUB:20150106 2015--Open Source Has Won, But It Isn't Finished + + @runningwater + +commit 50d77b9f32e77cbba25eeb2e45e8da67007edfb6 +Merge: 4a3d1c2 289fc1d +Author: Xingyu.Wang +Date: Sat Jan 24 11:07:54 2015 +0800 + + Merge pull request #2283 from H-mudcup/master + + Translated by H-mudcup + +commit 289fc1d826a678fedff1560206892285acc0ebfb +Author: H-mudcup +Date: Fri Jan 23 18:36:05 2015 +0800 + + Create 20140819 Top 4 Linux download managers.md + +commit bf37e3ff9f772207e81c6fc068cdf208c895f087 +Author: H-mudcup +Date: Fri Jan 23 18:32:47 2015 +0800 + + Delete 20140819 Top 4 Linux download managers.md + +commit 9c944371295fcb6a457e83aafe05661aaf478c2b +Merge: fa817df 4a3d1c2 +Author: H-mudcup +Date: Fri Jan 23 18:32:18 2015 +0800 + + Merge pull request #10 from LCTT/master + + 同步2015/1/23 + +commit 4a3d1c216ff31c3a9c3321b8c6c7e8aa16408192 +Author: DeadFire +Date: Fri Jan 23 16:42:05 2015 +0800 + + 20150123-1 选题 + +commit 9af2bba9121ad68f25bda387a5f724455726096b +Merge: b4b4c28 c77b9e2 +Author: Xingyu.Wang +Date: Fri Jan 23 16:20:22 2015 +0800 + + Merge pull request #2280 from Vic020/master + + Translated:20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04 + +commit b4b4c28b2c6f349a3b072b8e75d149b38ca6aba9 +Merge: 97cda34 cbf2f00 +Author: Xingyu.Wang +Date: Fri Jan 23 16:19:45 2015 +0800 + + Merge pull request #2279 from 2q1w2007/master + + 选题 + 格式中建议采用 H3标题，如果嵌套层次多，可增加 H2标题；层次非常多，可以使用 H1,H4。 + +commit 97cda347ce7856d5c47961c0ef406753f8611746 +Merge: 6852399 50ee769 +Author: geekpi +Date: Fri Jan 23 10:35:05 2015 +0800 + + Merge pull request #2282 from geekpi/master + + translated + +commit 50ee769861dc59c053936d466ad6d6e8e0c28713 +Author: zhengsihua +Date: Fri Jan 23 10:34:07 2015 +0800 + + translated + +commit 685239920ac7ac540f3d706414bbcaff333c800e +Merge: fa6a21a 955219b +Author: geekpi +Date: Fri Jan 23 10:00:57 2015 +0800 + + Merge pull request #2281 from geekpi/master + + translating + +commit 955219b1a8180109f20917d4bcb122afe8383be1 +Author: zhengsihua +Date: Fri Jan 23 09:55:35 2015 +0800 + + translating + +commit c77b9e2e2cebef2f195f95d8e2c8137b258ea123 +Author: Vic___ +Date: Fri Jan 23 00:01:05 2015 +0800 + + Moved + +commit 81fb54a565cfe5452c7e03f8667d3a5ea77340db +Author: Vic___ +Date: Fri Jan 23 00:00:02 2015 +0800 + + translated + +commit cbf2f006fb4063cce55ca4e0bdc3e59fb0aa0d27 +Author: 2q1w2007 <2q1w2007@163.com> +Date: Thu Jan 22 23:07:38 2015 +0800 + + 选题 + How are C data types “supported directly by most computers”? + +commit 50c09bde87772124167a544d1062ee55c661ad44 +Merge: d54627b fa6a21a +Author: Junkai <2q1w2007@users.noreply.github.com> +Date: Thu Jan 22 23:02:20 2015 +0800 + + Merge pull request #2 from LCTT/master + + 2015/01/22 + +commit fa6a21a32f211a2533ea17b3bb3aeee287bc40c5 +Author: wxy +Date: Thu Jan 22 21:47:59 2015 +0800 + + PUB:How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS + + @SPccman + +commit 7e2774538792356566132b26dc0c1241707c59e7 +Author: wxy +Date: Thu Jan 22 21:22:49 2015 +0800 + + PUB:20141124 Linux blkid Command to Find Block Devices Details + + @felixonmars + +commit 704555fa869bc59295b3b7f2dfd8bc5403dd5b99 +Author: wxy +Date: Thu Jan 22 21:11:33 2015 +0800 + + PUB:20141120 How to install an Opensource VPN Server on Linux + + @geekpi + +commit 7c7ee6a171373f47c53b08cb1cbb174c2695402d +Author: wxy +Date: Thu Jan 22 21:01:22 2015 +0800 + + PUB:20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10 + + @geekpi + +commit 29e887d2951454e8f8ef77d9fb68cf96e0de83ed +Author: wxy +Date: Thu Jan 22 20:54:46 2015 +0800 + + PUB:20141009 How to convert image audio and video formats on Ubuntu + + @mr-ping + +commit f52763aec00abc33afabb57c5cf06887ce5aad5d +Merge: b9039a4 ae6e08a +Author: Xingyu.Wang +Date: Thu Jan 22 20:45:31 2015 +0800 + + Merge pull request #2278 from Stevearzh/master + + Translating by Stevearzh + +commit ae6e08a3757da9deb6542a843556418df4bd1ae0 +Author: Stevearzh +Date: Thu Jan 22 20:04:55 2015 +0800 + + Translating by Stevearzh + +commit b9039a42d65b5e87e7f91c08d49a8ff8d0381a1e +Author: carolinewuyan <309866211@qq.com> +Date: Thu Jan 22 17:14:43 2015 +0800 + + 已校对 + +commit 68c1b1d6aca07856abfe3e68dcfcac413bb4fd64 +Author: DeadFire +Date: Thu Jan 22 16:48:43 2015 +0800 + + 20150122-2 选题 + +commit a64d6616b4c5ef11593682528386abf99efd8a66 +Merge: 4e1caae 88c2152 +Author: Xingyu.Wang +Date: Thu Jan 22 13:53:46 2015 +0800 + + Merge pull request #2277 from Medusar/master + + Rename How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps to How... + +commit 88c2152c5884ebced13ddcd7b2b3a06482f1fe0d +Author: Medusar <939958749@qq.com> +Date: Thu Jan 22 12:10:50 2015 +0800 + + Rename How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps to How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md + + 命名错误，重新命名 + +commit 4e1caae562f96bbc3f88a3349209c78e44d04829 +Author: DeadFire +Date: Thu Jan 22 10:39:22 2015 +0800 + + 20150122-1 选题 + +commit a2a9ed6eeaeecdc934bb08d52039d73aaba93fee +Merge: d368819 933c579 +Author: Xingyu.Wang +Date: Thu Jan 22 10:38:28 2015 +0800 + + Merge pull request #2276 from Medusar/master + + How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps 翻译完毕 + good job + +commit d368819a59fe09269cebdbb670493ebb9c7b8046 +Author: carolinewuyan <309866211@qq.com> +Date: Thu Jan 22 10:15:59 2015 +0800 + + 已校对 + +commit 933c579852d81f20024416a4047a179ccbe3a148 +Author: Medusar <939958749@qq.com> +Date: Wed Jan 21 23:36:16 2015 +0800 + + Create How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps + +commit 287baade1a07d54bcc2fdcc13af8666331fb9782 +Author: Medusar <939958749@qq.com> +Date: Wed Jan 21 23:29:30 2015 +0800 + + Delete 20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md + +commit 8a9bb7c9dd9b275eb4ef0dcbe75c21b7a5cf5c96 +Merge: 041dec3 8254598 +Author: Xingyu.Wang +Date: Wed Jan 21 21:47:09 2015 +0800 + + Merge pull request #2274 from Medusar/master + + Update 20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Ste... + 干得漂亮~ + +commit 041dec383262af6053d677e30e60ee749dc2c3b9 +Merge: 16991e9 f8f56a5 +Author: geekpi +Date: Wed Jan 21 21:26:35 2015 +0800 + + Merge pull request #2275 from geekpi/master + + translated + +commit f8f56a5a5be134027114a52d07053e4c52e3153a +Author: zhengsihua +Date: Wed Jan 21 21:25:40 2015 +0800 + + translated + +commit 82545984d3934ade4d1d5c7faa0bf35e0e9c7415 +Author: Medusar <939958749@qq.com> +Date: Wed Jan 21 21:15:58 2015 +0800 + + Update 20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md + + start translating + +commit 16991e9f47c0c1416533c96be9b01d821a41c5e0 +Merge: 99cbe50 3469c61 +Author: geekpi +Date: Wed Jan 21 20:39:10 2015 +0800 + + Merge pull request #2273 from geekpi/master + + translating + +commit 3469c614d6bf530b78f812acaefbf52c34b6ec92 +Author: zhengsihua +Date: Wed Jan 21 20:37:30 2015 +0800 + + translating + +commit 99cbe5088a5eeda2188c7eb147da6b16ab5a6749 +Merge: 1ce5287 d54627b +Author: Xingyu.Wang +Date: Wed Jan 21 20:12:08 2015 +0800 + + Merge pull request #2271 from 2q1w2007/master + + 两个选题 + 很好~~ + +commit d54627b5f41ec9ec86ecf348c9aa8338b3554e4c +Merge: 1c9a86b 4885bae +Author: 2q1w2007 <2q1w2007@163.com> +Date: Wed Jan 21 20:09:59 2015 +0800 + + Merge branch 'master' of github.com:2q1w2007/TranslateProject + + Conflicts: + sources/talk/20150121 Did this JavaScript break the console.md + sources/talk/20150121 If a 32-bit integer overflows.md + +commit 1c9a86bf197214b3b0fb9ec92e811b4a59d9a557 +Author: 2q1w2007 <2q1w2007@163.com> +Date: Wed Jan 21 20:03:31 2015 +0800 + + 格式修正 + +commit 4885bae1f7c284ec27cdbfbc827b44b9214b20bd +Author: 2q1w2007 <2q1w2007@163.com> +Date: Wed Jan 21 20:03:31 2015 +0800 + + 格式修正 + +commit 1ce52879ddbb05f398ad22a6f819975fbd3d0122 +Merge: 74bd960 489b22b +Author: Xingyu.Wang +Date: Wed Jan 21 19:57:24 2015 +0800 + + Merge pull request #2272 from mtunique/patch-2 + + Translating Linux FAQs with Answers--How to check disk space on Linux wi... + +commit 74bd9601b6b7ab260cb320c96c76af595fffd1ec +Merge: 55f0d49 a9683a8 +Author: Xingyu.Wang +Date: Wed Jan 21 19:54:33 2015 +0800 + + Merge pull request #2270 from ZhouJ-sh/master + + translated 20150119 3 Ways To Create A Lightweight And Persistent Xub… + +commit 489b22badd6f189969741b530d99e3d9bb807ad9 +Author: Tao Meng +Date: Wed Jan 21 19:50:56 2015 +0800 + + Translating Linux FAQs with Answers--How to check disk space on Linux with df command by mtunique + + Translating Linux FAQs with Answers--How to check disk space on Linux with df command by mtunique + +commit 3f513acb8a34415513fe5db053d8de89ffcbdfba +Author: 2q1w2007 <2q1w2007@163.com> +Date: Wed Jan 21 18:59:46 2015 +0800 + + 。。。 + +commit 3679969319489cd184b9150bf6272c00869fd64f +Author: 2q1w2007 <2q1w2007@163.com> +Date: Wed Jan 21 18:58:45 2015 +0800 + + 选题 + Did this JavaScript break the console? + +commit a2894417c911445cca786083971bc23aaa55706b +Author: 2q1w2007 <2q1w2007@163.com> +Date: Wed Jan 21 18:44:31 2015 +0800 + + 选题 + If a 32-bit integer overflows, can we use a 40-bit structure instead of a 64-bit long one? + +commit a9683a8267858fa2ef06528f500897f3de4a1ea3 +Author: ZhouJ-sh <32321321@qq.com> +Date: Wed Jan 21 18:16:51 2015 +0800 + + 修改链接 + +commit 19aa9bc619e1668987695e831f1fd4a99a7903c3 +Author: ZhouJ-sh <32321321@qq.com> +Date: Wed Jan 21 18:10:28 2015 +0800 + + translate complete , delete sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md + +commit d91316c19c6668b82cfabf9f89e4ad07c7193202 +Author: ZhouJ-sh <32321321@qq.com> +Date: Wed Jan 21 18:09:27 2015 +0800 + + translated 20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md + +commit 5cda43ed6cad1dad66f2cdc5ec590650c0d38f3c +Merge: d3bcd51 55f0d49 +Author: Junkai <2q1w2007@users.noreply.github.com> +Date: Wed Jan 21 17:54:40 2015 +0800 + + Merge pull request #1 from LCTT/master + + 2015/01/21 + +commit 55f0d498d452142ec6eee955a3e5ff05905c341e +Author: DeadFire +Date: Wed Jan 21 16:51:17 2015 +0800 + + 20150121-3 选题 + +commit 4fc1280f935e85a2a830e75faed1dd7b72a83291 +Author: DeadFire +Date: Wed Jan 21 16:30:21 2015 +0800 + + 20150121-2 选题 + +commit 9922596791a0c4222418c2c0edbfe8e947100123 +Author: DeadFire +Date: Wed Jan 21 16:18:33 2015 +0800 + + 20150121-1 选题 + +commit f9028e3ece7d2f387e07de5e28cbc589b5ce8fad +Merge: 2b77206 c4526a6 +Author: runningwater +Date: Tue Jan 20 14:47:47 2015 +0800 + + Merge pull request #2269 from runningwater/master + + 翻译中 by runningwater + +commit c4526a6717a525da0030a0f01e9533d1663c9f57 +Author: runningwater +Date: Tue Jan 20 14:47:16 2015 +0800 + + 翻译中 by runningwater + +commit fba1ddb312e304d8e38e3f3e6ad1695e68af14e3 +Merge: 110ad52 2b77206 +Author: ZhouJ-sh <32321321@qq.com> +Date: Tue Jan 20 11:05:36 2015 +0800 + + Merge pull request #5 from LCTT/master + + Merge from base + +commit 2b772067f3624d4b78915f3472754a6305e60c9b +Merge: 7c1edfc 0aac3e8 +Author: geekpi +Date: Tue Jan 20 11:00:03 2015 +0800 + + Merge pull request #2268 from geekpi/master + + translated + +commit 0aac3e8dafbcda297145ba6625e7cee42d099ced +Author: zhengsihua +Date: Tue Jan 20 10:57:34 2015 +0800 + + translated + +commit 7c1edfc305892eb6ed1f32bc9ccee9f53652cfce +Merge: c09a40b ca2eb1e +Author: runningwater +Date: Tue Jan 20 10:53:30 2015 +0800 + + Merge pull request #2267 from runningwater/master + + 翻译完成 + +commit c09a40bf52ce7d567329f185d12e872fd6f4ff1e +Merge: 1338477 fa817df +Author: runningwater +Date: Tue Jan 20 10:53:09 2015 +0800 + + Merge pull request #2264 from H-mudcup/master + + Translating By H-mudcup + +commit 1338477db8be3a3c754fa4a479ba20d14d1e5cbe +Merge: 37805f4 110ad52 +Author: runningwater +Date: Tue Jan 20 10:52:40 2015 +0800 + + Merge pull request #2263 from ZhouJ-sh/master + + translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md & delete source + +commit 37805f4777e6242b34c5db36a4ed6aa77819cd29 +Merge: 1182827 7423976 +Author: runningwater +Date: Tue Jan 20 10:51:54 2015 +0800 + + Merge pull request #2262 from alim0x/master + + [translaing]the haistory of android - 12 + +commit ca2eb1e0b8a4d06d4522b5c04a6b93fcf43fa9dc +Author: runningwater +Date: Tue Jan 20 10:50:16 2015 +0800 + + 翻译完成 + +commit 11828279c7b3667a1f8fe17b669857557ebc17db +Merge: dab09ae f155e6d +Author: geekpi +Date: Tue Jan 20 09:56:17 2015 +0800 + + Merge pull request #2266 from geekpi/master + + translating + +commit f155e6d8fa0ae090b51e4df91296cca3923dbe45 +Author: zhengsihua +Date: Tue Jan 20 09:55:27 2015 +0800 + + translating + +commit dab09aefe73cc5aa80320c6740702faa7e4990df +Merge: 7248f82 06dedac +Author: geekpi +Date: Tue Jan 20 09:54:23 2015 +0800 + + Merge pull request #2265 from geekpi/master + + translated + +commit 06dedaca1de4aeb018a4d81b5d6cf5046b43e6d6 +Author: zhengsihua +Date: Tue Jan 20 09:53:28 2015 +0800 + + translated + +commit 637598d6a8bcf23692ca448412c14e1867add9cf +Author: zhengsihua +Date: Tue Jan 20 09:43:03 2015 +0800 + + translating + +commit 7248f8228ce3303fc78518d2cc2c538ba4b4614d +Author: DeadFire +Date: Mon Jan 19 22:48:00 2015 +0800 + + 20150119-4 选题 + +commit fa817dfe19628deb9fc32f06c8edc71b844fe52a +Author: H-mudcup +Date: Mon Jan 19 22:47:42 2015 +0800 + + Update 20140819 Top 4 Linux download managers.md + +commit 93a9c1690ac23f6a67c875dbc9eac42486071341 +Merge: 01a0a41 77c1b7b +Author: H-mudcup +Date: Mon Jan 19 22:45:28 2015 +0800 + + Merge pull request #9 from LCTT/master + + 同步2015/1/19 + +commit 77c1b7baf03cedf96e0cf245ab74f7097f255db9 +Author: DeadFire +Date: Mon Jan 19 22:44:19 2015 +0800 + + 20150119-3 选题 + +commit 2d08d1cdd3663bb88c20de5b86c520c50b4dab47 +Author: DeadFire +Date: Mon Jan 19 22:32:09 2015 +0800 + + 20150119-2 选题 + +commit 8dd8c387bd862de9f683fadf99cea96bb38b13c6 +Author: DeadFire +Date: Mon Jan 19 22:22:41 2015 +0800 + + 20150119-1 选题 + +commit 110ad520ff023e1204aa6192bda34821254ef9d8 +Author: ZhouJ-sh <32321321@qq.com> +Date: Mon Jan 19 18:39:31 2015 +0800 + + 调整部分细节 + +commit a75a14f9fa77c5e1f666976a5bfb352fe38495be +Author: ZhouJ-sh <32321321@qq.com> +Date: Mon Jan 19 18:03:58 2015 +0800 + + translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md + +commit 8bae3c1a249e51dd003a2b2ce507fef4ce802874 +Author: ZhouJ-sh <32321321@qq.com> +Date: Mon Jan 19 17:51:07 2015 +0800 + + translate complete. delete sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md + +commit f1336ab9e6b9d601737220a06b08c4e90a610408 +Author: ZhouJ-sh <32321321@qq.com> +Date: Mon Jan 19 17:50:28 2015 +0800 + + translating sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md + +commit e0d0557fa4b4945487ae3a4d8363e430bb125b35 +Author: ZhouJ-sh <32321321@qq.com> +Date: Mon Jan 19 16:10:28 2015 +0800 + + translating by zhouj-sh + +commit 79a6d05c27969d5bdf0d8d7139faf65c30b5187e +Author: ZhouJ-sh <32321321@qq.com> +Date: Mon Jan 19 14:36:42 2015 +0800 + + add sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md + +commit 814f81b13d9b64295235211ddeab00da9d9d4fa0 +Author: ZhouJ-sh <32321321@qq.com> +Date: Mon Jan 19 13:56:53 2015 +0800 + + delete sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md + +commit 74239768b1e788c60e78bc226ea01631d5c42f1b +Author: alim0x +Date: Mon Jan 19 13:45:03 2015 +0800 + + [translaing]the haistory of android - 12 + +commit b84066519448846da033ddb2ddb5450e91e23aeb +Merge: 0bed6db b56f724 +Author: joeren +Date: Mon Jan 19 13:43:06 2015 +0800 + + Merge pull request #2261 from ly0/patch-1 + + [Translating]What is good audio editing software on Linux + +commit b56f724ca227d0ba74c86283513b746ef89c19f4 +Author: latyas(懒) +Date: Mon Jan 19 13:42:23 2015 +0800 + + [Translating]What is good audio editing software on Linux + +commit 0c4ad0bc8e79e28c1f7f8ccf805708829baa8ea9 +Author: ZhouJ-sh <32321321@qq.com> +Date: Mon Jan 19 12:05:39 2015 +0800 + + translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md + +commit 0bed6db0157ef60fe4873130f79106558b9a48be +Author: wxy +Date: Mon Jan 19 10:42:09 2015 +0800 + + PUB:20150104 Docker Image Insecurity + + @tinyeyeser + +commit 7e84dad563b118543cb724b2adffdd471b1dfd2d +Author: wxy +Date: Mon Jan 19 10:22:17 2015 +0800 + + PUB:20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem + + @geekpi + +commit a01b43d76a35dc3584bbfc268ebb5d64101c00aa +Author: wxy +Date: Mon Jan 19 10:09:17 2015 +0800 + + PUB:20141120 How to configure and secure your Postfix email server + + @GOLinux + +commit a881635bda06eae899f39ffebdd452db3077bf5f +Author: wxy +Date: Sun Jan 18 23:33:24 2015 +0800 + + PUB:20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X + + @runningwater + +commit 2432f8ac8c5add7f23e13a846cd7157872763c45 +Author: wxy +Date: Sun Jan 18 23:16:40 2015 +0800 + + PUB:20141204 How To Delete Oracle 11g Database Manually + + @geekpi + +commit 61a511d27f039dc97cdfa2be05d4f4808f3b1d7c +Author: wxy +Date: Sun Jan 18 23:08:36 2015 +0800 + + PUB:20141127 Five Magnificent Linux Music Streaming Clients + + @Stevearzh + +commit d952637700af776b9ed1687aa3c6d782b7cd579e +Author: wxy +Date: Sun Jan 18 22:57:21 2015 +0800 + + PUB:20141224 Calife--A lightweight alternative to sudo + + @GOLinux + +commit 0e5f7070dec047ef4ce04d5a0dadd776383dc683 +Merge: 1023fcc 208bdf9 +Author: Xingyu.Wang +Date: Sun Jan 18 22:39:33 2015 +0800 + + Merge pull request #2259 from SPccman/master + + How to Manage Network using nmcli Tool in RedHat / CentOS 7.x + 下回文件名前面的日期不要去掉哦~ + +commit 208bdf9f160225edb96062352f7fe826e3c42ac9 +Author: DoubleC <450760206@qq.com> +Date: Sun Jan 18 21:00:20 2015 +0800 + + 翻译完成 + + 翻译完成 + +commit 86f317ce86abb9ffa8b4977f2606a081e95b315d +Author: DoubleC <450760206@qq.com> +Date: Sun Jan 18 20:49:03 2015 +0800 + + delete source file + + delete source file + +commit 58620a3f1867fe11bf150d09bd3905693f4e2900 +Merge: 6e31b7e 1023fcc +Author: DoubleC <450760206@qq.com> +Date: Sun Jan 18 20:44:31 2015 +0800 + + Merge pull request #14 from LCTT/master + + update + +commit 1023fcc74db9a67fb49c05db1e03fe46d0ae35d7 +Merge: a76be45 923230a +Author: geekpi +Date: Sun Jan 18 15:29:18 2015 +0800 + + Merge pull request #2258 from geekpi/master + + translated + +commit 923230af5674e243a2d2168d5c6634c5c17db3c5 +Author: zhengsihua +Date: Sun Jan 18 15:27:49 2015 +0800 + + translated + +commit a76be45006eda702f23a0667dd243cac1262d53b +Merge: a7d2226 d3017c1 +Author: geekpi +Date: Sun Jan 18 15:24:59 2015 +0800 + + Merge pull request #2257 from geekpi/master + + translated + +commit d3017c1855d2b0fae4ecb8bae59243c442843530 +Merge: 45126b5 a7d2226 +Author: zhengsihua +Date: Sun Jan 18 15:20:49 2015 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit a7d222693082f1e586c6189398d1bcb1a38f8f81 +Author: geekpi +Date: Sun Jan 18 14:42:22 2015 +0800 + + Update 20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md + +commit 46b43e0ba81c5262d58afb42b4b2aa7d8385e4a1 +Author: wxy +Date: Sun Jan 18 12:59:52 2015 +0800 + + PUB:20140701 Easy File Comparisons With These Great Free Diff Tools + + @H-mudcup + +commit 1610b8f56b0f5ef07e25681a73ad32c9ea00f52b +Author: wxy +Date: Sun Jan 18 12:15:46 2015 +0800 + + 清除过期文章 + +commit 8e154021a807b16cabbcf9bc015899d7b3fa1421 +Merge: 275ab86 279ea5f +Author: Xingyu.Wang +Date: Sun Jan 18 12:08:18 2015 +0800 + + Merge pull request #2256 from Vic020/patch-27 + + Vic020 + +commit 279ea5f48922cfad3caaeaae719b50a4b9057cac +Author: Vic___ +Date: Sat Jan 17 22:44:53 2015 +0800 + + Vic020 + +commit 275ab86f82e3082f2f288dd312eef9dff35baa27 +Merge: 4fc4bf9 efc8353 +Author: Xingyu.Wang +Date: Sat Jan 17 22:20:50 2015 +0800 + + Merge pull request #2251 from ZhouJ-sh/master + + 选题 20150116 A Step By Step Guide To Installing Xubuntu Linux.md + +commit 45126b50e27e224f0b4a04865c14c4bdc3c84c70 +Author: zhengsihua +Date: Sat Jan 17 14:39:14 2015 +0800 + + translated + +commit 4fc4bf9a34b606450158714ea64f95710dca0bea +Merge: c4991f8 4d9c0d7 +Author: geekpi +Date: Sat Jan 17 14:27:39 2015 +0800 + + Merge pull request #2255 from geekpi/master + + translating + +commit 4d9c0d7c9994a7663c87c8a165ed1dd89339f5f4 +Author: zhengsihua +Date: Sat Jan 17 14:26:02 2015 +0800 + + translating + +commit c4991f839164ffa5e4ad59ca794255d780d8a933 +Merge: 0bdc527 1b6d810 +Author: geekpi +Date: Sat Jan 17 14:21:04 2015 +0800 + + Merge pull request #2254 from SPccman/patch-14 + + SPccman translating + +commit 1b6d81032f650e86354b8c20aa84af3afc5918df +Author: DoubleC <450760206@qq.com> +Date: Sat Jan 17 11:14:26 2015 +0800 + + SPccman translating + + 申领文章 + +commit 0bdc52765db5225d49f26c334af7c6a7842f8f3e +Merge: 0d6eba4 474941f +Author: geekpi +Date: Fri Jan 16 21:21:20 2015 +0800 + + Merge pull request #2253 from geekpi/master + + translating + +commit 474941fb36cc81b21c9aee9ee40b705a189d935e +Author: zhengsihua +Date: Fri Jan 16 21:20:02 2015 +0800 + + translating + +commit 0d6eba4dabb9c23edadac78b1df52a763244e4cc +Merge: 125d5e4 c9b90bf +Author: geekpi +Date: Fri Jan 16 21:10:13 2015 +0800 + + Merge pull request #2252 from geekpi/master + + translating + +commit c9b90bfdf16fc793ff45e05416fcf1d98b3b0096 +Author: zhengsihua +Date: Fri Jan 16 21:09:31 2015 +0800 + + translating + +commit efc83533565aef0b678a44f1cd5c64822567535e +Author: ZhouJ-sh <32321321@qq.com> +Date: Fri Jan 16 16:58:18 2015 +0800 + + 选题 20150116 A Step By Step Guide To Installing Xubuntu Linux.md + +commit 125d5e4481d54242560df88db01e188fcdd700ba +Author: wxy +Date: Fri Jan 16 16:51:03 2015 +0800 + + PUB:20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server + + @liaoishere + +commit e5f83b245af974340cd1337043f2bfdf474735c3 +Author: wxy +Date: Fri Jan 16 16:22:30 2015 +0800 + + PUB:20141119 Smartctl--Monitoring & Analysis tool for Hard drive + + @GOLinux + +commit 8317c05e54f688d8eb1c6517506a69fbd99738ad +Author: wxy +Date: Fri Jan 16 15:28:06 2015 +0800 + + 补充删除 + + @ZhouJ-sh + +commit 71de35194d0a09652f9af2492fa4259eb90ad8b0 +Merge: e7664c4 1c661ba +Author: Xingyu.Wang +Date: Fri Jan 16 15:23:09 2015 +0800 + + Merge pull request #2248 from ZhouJ-sh/master + + 选题&翻译 20150115 How To Run Linux Applications From The Terminal In Background Mode.md + + 您好，非常感谢您的翻译和选题。有一点小问题，请您下次稍微注意下： + 您这个翻译，是一次性提交了选题和译文，为了保持原文参考，您没有删除原文，但是这样您的原文就没人删除了。 + 所以，建议您，选题单独一个 PR，翻译的译文（包括删除选题的原文）再来一个 PR，并拉开时间差比较好。 + + 此外，您这里把上一个翻译的原文给删除了，其实应该在上次提交译文时候删除——这个也是我疏忽了，我当时应该给补充删除的。 + 这次的这个 PR 的原文，我稍后会帮您删除。 + + 再次，感谢您的参与和奉献~ + +commit e7664c48501fbbc6ba71385c15745d60239b7026 +Merge: d751ace e84846c +Author: geekpi +Date: Fri Jan 16 11:47:10 2015 +0800 + + Merge pull request #2250 from geekpi/master + + translated + +commit e84846cf7b1eef7028fb5330650bc94565b9382d +Author: zhengsihua +Date: Fri Jan 16 11:45:10 2015 +0800 + + translated + +commit d751ace8baabd7be1740a3b4334f0bf709570e56 +Merge: 0e24355 a1d3bd8 +Author: geekpi +Date: Fri Jan 16 10:10:43 2015 +0800 + + Merge pull request #2249 from geekpi/master + + translating + +commit a1d3bd813f5aedb9eab5e3f5427ebb0f38700358 +Author: zhengsihua +Date: Fri Jan 16 10:09:49 2015 +0800 + + translating + +commit 0e2435557d47ab8d7449bf4b4a19afe02e2ccc8c +Author: DeadFire +Date: Thu Jan 15 23:24:02 2015 +0800 + + 20150115-5 更新前面-3过长的文件名 + +commit 585da02c61dcdb83345110ae2f181f1240536fb6 +Author: DeadFire +Date: Thu Jan 15 23:21:52 2015 +0800 + + 20150115-4 更新前面文件名后缀。为何-3选题显示不了？ + +commit 0a1a2a86d11cc620cc88574c7ef8b8b400882610 +Author: wxy +Date: Thu Jan 15 23:14:01 2015 +0800 + + PUB:Quick systemd-nspawn guide + + @SPccman 翻译的不错 + +commit 38178327ae8a2aa6705257358070d45999f4eb19 +Author: DeadFire +Date: Thu Jan 15 23:11:41 2015 +0800 + + 20150115-3 选题 + +commit 85feb3e7d5facfa3bb3fb712274b5813678bcec6 +Author: wxy +Date: Thu Jan 15 22:47:39 2015 +0800 + + PUB:20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x + + @ZTinoZ + +commit 476e61555682f5ae304239cdb351cbe8dd5bea36 +Author: wxy +Date: Thu Jan 15 22:31:18 2015 +0800 + + PUB:20141224 Linux FAQs with Answers--How to install 7zip on Linux + + @runningwater + +commit 7959c6367d4b491f5ebfa1c31654cc0ccae23a9f +Author: wxy +Date: Thu Jan 15 22:31:02 2015 +0800 + + PUB:20141118 How to boot on an ISO image from Grub + + @GOLinux + +commit ff129b92f9be3eae1ba9bd71bcf84c7c15935d04 +Author: DeadFire +Date: Thu Jan 15 22:26:14 2015 +0800 + + 20150115-2 选题 + +commit d7d9009a1a9b3aab54573b7b09408c766a072a3c +Author: DeadFire +Date: Thu Jan 15 22:08:23 2015 +0800 + + 20150115-1 选题 + +commit 1c661ba3c22ed1b372f547c91990cf8f2dbb37d9 +Author: ZhouJ-sh <32321321@qq.com> +Date: Thu Jan 15 16:05:12 2015 +0800 + + 已出版，删除原文 + +commit 736eaa9596317e6ab526c07d46d9eb70cc0353ad +Author: ZhouJ-sh <32321321@qq.com> +Date: Thu Jan 15 15:46:39 2015 +0800 + + 修改格式错误 + +commit ebf0c22f67fe7cdd325b2ef0a37159b28470c0b9 +Author: ZhouJ-sh <32321321@qq.com> +Date: Thu Jan 15 15:42:50 2015 +0800 + + 翻译 20150115 How To Run Linux Applications From The Terminal In Background Mode.md + +commit 47b4c22a570d836cd1393f3212018ad5d6dd9fde +Author: ZhouJ-sh <32321321@qq.com> +Date: Thu Jan 15 15:42:04 2015 +0800 + + 选题 20150115 How To Run Linux Programs From The Terminal In Background Mode + +commit 46aa7dccbb4c15109c330579ec2e85185fcb65f5 +Merge: 3074417 df75566 +Author: ZhouJ-sh <32321321@qq.com> +Date: Thu Jan 15 11:54:12 2015 +0800 + + Merge pull request #4 from LCTT/master + + Merge from base + +commit df75566eaf80f5e9649245c11eb609c162bdcaaf +Merge: ce45b34 3b0362d +Author: geekpi +Date: Thu Jan 15 10:08:24 2015 +0800 + + Merge pull request #2247 from geekpi/master + + translated + +commit 3b0362d7042c4b18b7459f72afb5b7897c1fa331 +Author: zhengsihua +Date: Thu Jan 15 10:07:42 2015 +0800 + + translated + +commit ce45b341542dd9fa1a07f0b2245748d0b7e2dcfc +Merge: 33250c4 24ce934 +Author: geekpi +Date: Thu Jan 15 09:47:45 2015 +0800 + + Merge pull request #2246 from geekpi/master + + translating + +commit 24ce934e9e8266b0c7fc232cf15095078eccdd8b +Author: zhengsihua +Date: Thu Jan 15 09:47:00 2015 +0800 + + translating + +commit 33250c43af33a8beffcbb7d0cfbadc8e2b2d0282 +Merge: 568a923 fe4a3f1 +Author: geekpi +Date: Thu Jan 15 09:45:40 2015 +0800 + + Merge pull request #2245 from geekpi/master + + translated + +commit fe4a3f1b052d4424982c012f33e709fbe03602f3 +Author: zhengsihua +Date: Thu Jan 15 09:44:59 2015 +0800 + + translated + +commit 568a9237c8afc2ed6627cc6809810b062cd8efb5 +Merge: 8ec8782 449e095 +Author: geekpi +Date: Thu Jan 15 09:32:47 2015 +0800 + + Merge pull request #2244 from geekpi/master + + translating + +commit 449e095f1a9e3d83dd0680cf27bda51db1733e28 +Author: zhengsihua +Date: Thu Jan 15 09:31:29 2015 +0800 + + translating + +commit 8ec87824af266f95c5992d0cc4281d9ac47c580b +Merge: 9c33a4a 63d09ac +Author: geekpi +Date: Thu Jan 15 09:29:41 2015 +0800 + + Merge pull request #2243 from geekpi/master + + translated + +commit 63d09acaf0aecae25cb9746fa010aaa757c77e29 +Author: zhengsihua +Date: Thu Jan 15 09:28:29 2015 +0800 + + translated + +commit 13b29eddae52e3ab264fc4cf8b015beb17c7e899 +Author: zhengsihua +Date: Thu Jan 15 09:27:25 2015 +0800 + + translated + +commit 9c33a4a75d7ccd3d1755b7f0fcb366f27f613b72 +Merge: e0b61b5 d3de17c +Author: geekpi +Date: Thu Jan 15 09:09:02 2015 +0800 + + Merge pull request #2242 from geekpi/master + + translating + +commit d3de17c1c683c527eebdaa0f3e711efddb55dc38 +Author: zhengsihua +Date: Thu Jan 15 09:07:36 2015 +0800 + + translating + +commit e0b61b555a77eb137f776b2af3a18d5d76a1cc2f +Author: wxy +Date: Wed Jan 14 22:57:42 2015 +0800 + + PUB:20141112 How to Debug CPU Regressions Using Flame Graphs + + @coloka 好专业的文章·~ + +commit 1f234cad69e1c1afb009c6a0a7b72e3e7e4eaf46 +Author: DeadFire +Date: Wed Jan 14 22:43:16 2015 +0800 + + 20150114-3 选题 + +commit dcbacad5cf47dcdb36e252a509d6c6c2be4048f9 +Author: DeadFire +Date: Wed Jan 14 22:34:53 2015 +0800 + + 20150114-2 选题 + +commit 84a61c70ff887e54906d84e1d57833d53cc28c98 +Author: wxy +Date: Wed Jan 14 22:34:33 2015 +0800 + + PUB:20141115 What are some obscure but useful Vim commands + + @wangjiezhe 译者注加的非常棒！ + +commit 735b0d58e5f1b99a4f77debfa90f0a4c2aa5c0db +Author: DeadFire +Date: Wed Jan 14 22:18:49 2015 +0800 + + 20150114-1 选题 + +commit 03d18259520456c08d2ee72b3fd42d8ec13ac5a3 +Author: wxy +Date: Wed Jan 14 21:42:54 2015 +0800 + + PUB:20141211 NetHack + + @Stevearzh 翻译的很不错！游戏也很给力！ + +commit 60cfb46909cc8e962163d5bfc0f60aaf75a4a60e +Author: wxy +Date: Wed Jan 14 21:03:28 2015 +0800 + + 该文已有一样的发布了 + + 所以不发布了。 + +commit 6b0663b4fad108e3a6b15ceca4a4817a1435c9da +Author: wxy +Date: Wed Jan 14 21:00:50 2015 +0800 + + PUB:20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu + + @zhouj-sh + +commit c0851408e476a013e233f5f23d3c4dff944b4c42 +Merge: fd7ef3b e043349 +Author: Xingyu.Wang +Date: Wed Jan 14 20:11:28 2015 +0800 + + Merge pull request #2241 from mr-ping/master + + translated by ping + +commit e0433490251776767d7422f51524bd0cbabe6059 +Author: Ping +Date: Wed Jan 14 14:37:27 2015 +0800 + + translated by ping + +commit fd7ef3bc8f6215c69acbefa89261a541cc66b210 +Author: wxy +Date: Wed Jan 14 14:11:38 2015 +0800 + + PUB:20141027 ntpq -p output + + @liaoishere 这篇好专业啊，翻译的很不错！ + +commit 34182d3ae5bf0fcecf5157076704b0c5187bdce1 +Author: wxy +Date: Wed Jan 14 13:41:15 2015 +0800 + + PUB:20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu + + @Vic020 + +commit c0c13b1452365a8c73b6509ff9890586ea381929 +Merge: 42d8398 b59c18c +Author: joeren +Date: Wed Jan 14 10:26:15 2015 +0800 + + Merge pull request #2240 from GOLinux/master + + [Translated]20150106 Managing Linux server configs with the SaltStack.md + +commit b59c18cbfc1269109b3600a8285ec852d44a52e8 +Author: GOLinux +Date: Wed Jan 14 10:24:56 2015 +0800 + + [Translated]20150106 Managing Linux server configs with the SaltStack.md + +commit 42d83980ab03cd446c7d1063c05f49a92bbe31eb +Merge: de44a41 bf6fbe0 +Author: joeren +Date: Wed Jan 14 08:53:47 2015 +0800 + + Merge pull request #2239 from GOLinux/master + + [Translating] 20150106 Managing Linux server configs with the SaltStack.md + +commit bf6fbe01792ce408e3f56e2497b3560fd5461161 +Author: joeren +Date: Wed Jan 14 08:52:41 2015 +0800 + + Update 20150106 Managing Linux server configs with the SaltStack.md + +commit 926f32990429b01bcb5f9326a1ba30484ad8ec12 +Merge: a330de1 de44a41 +Author: joeren +Date: Wed Jan 14 08:50:42 2015 +0800 + + Merge pull request #25 from LCTT/master + + Update Repo + +commit de44a418fa88660941932f66a740879b72c6aea1 +Merge: 543ce85 bd1d995 +Author: joeren +Date: Wed Jan 14 08:49:38 2015 +0800 + + Merge pull request #2238 from mr-ping/master + + [translating]20141009 How to convert image audio and video formats on Ubuntu + +commit bd1d9952167cabd2a4141b70ca590dbe54cf4259 +Merge: e6e93f5 543ce85 +Author: Ping +Date: Wed Jan 14 07:53:01 2015 +0800 + + Merge branch 'master' of github.com:LCTT/TranslateProject into newbranch + +commit e6e93f56b1a7c2253686078fbd5d6c9025ef2d8a +Author: Ping +Date: Wed Jan 14 07:51:53 2015 +0800 + + Translating + +commit 543ce858290e062a755739b17d29a86bec1a4d9b +Author: wxy +Date: Tue Jan 13 22:19:21 2015 +0800 + + PUB:20141226 The Good The Bad And The Ugly Of Linux In 2014 + + @H-mudcup + +commit 71e8d589ccdee219afe87a61bbd0583d09e864bc +Author: wxy +Date: Tue Jan 13 22:01:09 2015 +0800 + + PUB:20140929 What Linux Users Should Know About Open Hardware + + @zpl1025 + +commit 9886fdd41521b85eb3915e84c0ddee58f854fa25 +Author: wxy +Date: Tue Jan 13 20:30:17 2015 +0800 + + PUB:20140928 What is a good subtitle editor on Linux + + @barney-ro + +commit 59a96f897169497efeb57452cb4aacf83fa23582 +Author: wxy +Date: Tue Jan 13 20:22:59 2015 +0800 + + PUB:20141125 Four ways Linux is headed for no-downtime kernel patching + + @coloka + +commit f3196a73ff7b8299d80c00a2c8507c50e0515463 +Author: wxy +Date: Tue Jan 13 20:18:30 2015 +0800 + + 过期，未发布 + + @kingname ，这篇已经远超新闻期限，所以没有发布。抱歉。 + +commit e1cca21879783bb58327368c11f744a51ed3887e +Author: tinyeyeser +Date: Tue Jan 13 15:27:41 2015 +0800 + + 已校对 by小眼儿 + +commit 34219f472beffe97fcd002af3260c2156a37cdf7 +Author: tinyeyeser +Date: Tue Jan 13 15:25:58 2015 +0800 + + 已校对 by小眼儿 + +commit a76e2d7405c677332abe0496425648b9c3ef08af +Author: carolinewuyan <309866211@qq.com> +Date: Tue Jan 13 14:06:57 2015 +0800 + + 已校对 + +commit d1c1f8794ac89086c17b9e43a2d7fd867032db35 +Merge: c3cb2a5 6dcb07d +Author: geekpi +Date: Tue Jan 13 11:59:21 2015 +0800 + + Merge pull request #2237 from geekpi/master + + translated + +commit 6dcb07d9209b867b8e73ded0ef15e3fe7f216a73 +Author: zhengsihua +Date: Tue Jan 13 11:57:38 2015 +0800 + + translated + +commit c3cb2a5dc57b7ae84f206845f8b576eec806f265 +Merge: fed4f09 4b5c782 +Author: geekpi +Date: Tue Jan 13 11:28:47 2015 +0800 + + Merge pull request #2236 from geekpi/master + + translating + +commit 4b5c782737d159ad6694bdbc77b7629f8f658ef3 +Author: zhengsihua +Date: Tue Jan 13 11:27:50 2015 +0800 + + translating + +commit a330de140d606e0c7b316e42d59f384a56e81525 +Merge: ff7a2b0 fed4f09 +Author: joeren +Date: Tue Jan 13 08:20:49 2015 +0800 + + Merge pull request #24 from LCTT/master + + Update Repo + +commit fed4f0962c7a7e6e0c9cf644faa7705e9f1c111c +Merge: baa5806 906b925 +Author: geekpi +Date: Mon Jan 12 22:22:38 2015 +0800 + + Merge pull request #2235 from geekpi/master + + translated + +commit 906b9250f68b24cede6a0ef1c15d73e6f149e301 +Author: zhengsihua +Date: Mon Jan 12 22:21:29 2015 +0800 + + translated + +commit baa58061afeee738e990a0b4a4bc155d11196ba5 +Merge: e4ab9d2 fa37f1d +Author: geekpi +Date: Mon Jan 12 21:31:42 2015 +0800 + + Merge pull request #2234 from geekpi/master + + translating + +commit fa37f1d36d87feac22d7cf7d329c89c4bb337271 +Author: zhengsihua +Date: Mon Jan 12 21:28:33 2015 +0800 + + translating + +commit e4ab9d2c783c25c1823da7c78fb49b1b66c16f7c +Author: DeadFire +Date: Mon Jan 12 16:28:48 2015 +0800 + + 20150112-5 选题 + +commit 084da04255f655f28e59880c705bfec6f061d7a7 +Author: DeadFire +Date: Mon Jan 12 16:16:14 2015 +0800 + + 20150112-4 选题 + +commit 25d2d99051e2c5d7d5dc4cf32b3ecf73573e2923 +Author: wxy +Date: Mon Jan 12 15:57:42 2015 +0800 + + PUB:20141108 When hackers grow old + + @Stevearzh + +commit be147eb7fe0cb9e50940aa4b49618a280245db3e +Author: tinyeyeser +Date: Mon Jan 12 15:08:12 2015 +0800 + + 已校对 by小眼儿 + + 原文真的很硬很难！译者已经翻译的很不错了~ 只是某些语句稍有逻辑上的语义错误。 + 我硬着头皮死啃半天，已尽量校对改正。 + +commit a4c26041aae6254ee0d68d35386bf867788b5e56 +Merge: 83f4ddf a66e60e +Author: joeren +Date: Mon Jan 12 13:43:04 2015 +0800 + + Merge pull request #2233 from kingname/patch-3 + + Delete 20141219 Git 2.2.1 Released To Fix Critical Security Issue.md + +commit 83f4ddfc142743e401cbeb5d8b2f73337f9e71e5 +Merge: 9d07f03 43154bb +Author: joeren +Date: Mon Jan 12 13:42:53 2015 +0800 + + Merge pull request #2232 from kingname/patch-2 + + Git 发布2.2.1版，修复严重安全问题 + +commit a66e60edaa77feb4feaa829983c6cd504912281d +Author: kingname +Date: Mon Jan 12 13:35:01 2015 +0800 + + Delete 20141219 Git 2.2.1 Released To Fix Critical Security Issue.md + +commit 43154bbb52f9557f840fecfe5fd25f9b3a70321b +Author: kingname +Date: Mon Jan 12 13:33:14 2015 +0800 + + Git 发布2.2.1版，修复严重安全问题 + +commit 9d07f03b9a71640b5adcc5cfca4ab7b303a0e8d9 +Merge: 33564c2 c1602f7 +Author: Xingyu.Wang +Date: Mon Jan 12 13:30:23 2015 +0800 + + Merge pull request #2231 from kingname/patch-1 + + Translating by kingname + +commit 33564c2a24d5e7f35e230b13d239e0ae4b900142 +Author: DeadFire +Date: Mon Jan 12 13:28:37 2015 +0800 + + 20150112-3 选题 + +commit c1602f7bf85928b05a4cf416092196f4938d27ae +Author: kingname +Date: Mon Jan 12 13:06:55 2015 +0800 + + Translating by kingname + +commit 841036a33cad9b4583230a9d3531009153f8fb6d +Author: DeadFire +Date: Mon Jan 12 11:48:07 2015 +0800 + + 20150112-2 选题 + +commit a2b404a7114eadbb3ff8f8a454c4b54ca923db9c +Author: DeadFire +Date: Mon Jan 12 11:25:39 2015 +0800 + + 20150112-1 选题 + +commit 3fd5e8c64d4125c63919df9c8cd5905197b66da7 +Author: tinyeyeser +Date: Mon Jan 12 11:15:33 2015 +0800 + + 已校对 by小眼儿 + +commit 9f93f9c428c575afc3c7f749d2b93297666c22a1 +Merge: 706954d 1897f32 +Author: runningwater +Date: Mon Jan 12 10:54:02 2015 +0800 + + Merge pull request #2230 from ZTinoZ/master + + Translating by ZTinoZ + +commit 1897f32f1f26b60ce05a793837c2afe7670d378a +Author: ZTinoZ +Date: Mon Jan 12 10:37:45 2015 +0800 + + Translating by ZTinoZ + +commit 3751162fe320fc9593cec8fcb4bdc730e00a150c +Merge: aff39ed 706954d +Author: ZTinoZ +Date: Mon Jan 12 09:21:04 2015 +0800 + + Merge pull request #6 from LCTT/master + + Update the repository + +commit 01a0a41f573d44a10f126ea9f46170d2e001c185 +Merge: 8aa5fbd 706954d +Author: H-mudcup +Date: Mon Jan 12 07:29:24 2015 +0800 + + Merge pull request #8 from LCTT/master + + 同步2015/1/12 + +commit 706954dc8bc544116e9b379e1f2e37c5c2d5beff +Author: wxy +Date: Mon Jan 12 00:11:21 2015 +0800 + + PUB:20140926 ChromeOS vs Linux--The Good, the Bad and the Ugly + + @barney-ro + +commit 5c464d67b5065e6de76d90cef23a3d4d2728bd0c +Author: runningwater +Date: Sun Jan 11 22:31:53 2015 +0800 + + 翻译中 by runningwater + +commit d4d5127026f488a9ba82e2996bd3daccf716fd64 +Author: wxy +Date: Sun Jan 11 19:45:59 2015 +0800 + + 补充删除 + + @H-mudcup + +commit 567016231eff53d2193d456870fb7a642ebc85ce +Merge: c4c3ac6 2743887 +Author: Xingyu.Wang +Date: Sun Jan 11 19:45:29 2015 +0800 + + Merge pull request #2229 from disylee/patch-1 + + Update 20150104 How to debug a C or C++ program with Nemiver debugger.md + +commit c4c3ac64b7b06e7c0e173bc12937c2a8cfbc4974 +Merge: 17e6f0a 8aa5fbd +Author: Xingyu.Wang +Date: Sun Jan 11 19:44:46 2015 +0800 + + Merge pull request #2228 from H-mudcup/master + + [Translated] Easy File Comparisons With These Great Free Diff Tools.md + 忘记删除原文了，这次我替你删除了吧~~ + +commit 2743887a274c1c4b22e69840979881e904a34d7e +Author: disylee +Date: Sun Jan 11 14:20:31 2015 +0800 + + Update 20150104 How to debug a C or C++ program with Nemiver debugger.md + + disylee + +commit 8aa5fbd9eebd00092a8e6ce2cdb683b846e2cb1d +Author: H-mudcup +Date: Sun Jan 11 11:55:37 2015 +0800 + + Create 20140701 Easy File Comparisons With These Great Free Diff Tools.md + +commit 1da6d877ce7cdc636773f017e69d14f4728ad9e8 +Merge: bab7c60 17e6f0a +Author: H-mudcup +Date: Sun Jan 11 11:47:09 2015 +0800 + + Merge pull request #7 from LCTT/master + + 同步2015/1/11 + +commit 17e6f0a763677207825c43f1550351ae767841ed +Merge: a755aa8 75d72b2 +Author: geekpi +Date: Sun Jan 11 11:15:35 2015 +0800 + + Merge pull request #2227 from geekpi/master + + translated + +commit 75d72b252bb612a033fcd8886006e69cc809832b +Author: zhengsihua +Date: Sun Jan 11 11:13:08 2015 +0800 + + translated + +commit a755aa873972fe7badb240ec4912ddc342791c43 +Merge: 3ee3fd1 f1d8732 +Author: geekpi +Date: Sun Jan 11 10:19:31 2015 +0800 + + Merge pull request #2226 from geekpi/master + + translating + +commit f1d8732a27eab2ba86bdda588d57a012170cdbe1 +Author: zhengsihua +Date: Sun Jan 11 10:18:16 2015 +0800 + + translating + +commit 3ee3fd1d1e2060131bdd6d1cc88b77224899b1ed +Merge: 4b19d23 ea4e2b4 +Author: geekpi +Date: Sat Jan 10 11:49:36 2015 +0800 + + Merge pull request #2225 from geekpi/master + + translated + +commit ea4e2b4d84a1c5f39531a740dbb267f677eaeddd +Author: zhengsihua +Date: Sat Jan 10 11:48:04 2015 +0800 + + translated + +commit 4b19d2371c7ae940aab60491e71f5701ff359c18 +Merge: cafe6c2 c552514 +Author: geekpi +Date: Sat Jan 10 11:19:19 2015 +0800 + + Merge pull request #2224 from geekpi/master + + translating + +commit c552514a3bff82c23fa3e5deaed6eda0d5cdbdf0 +Author: zhengsihua +Date: Sat Jan 10 11:18:39 2015 +0800 + + translating + +commit cafe6c2434a9af8b7f2780da5534b0eed8b4ad8e +Merge: 0deaef8 fd1beb5 +Author: geekpi +Date: Fri Jan 9 21:28:23 2015 +0800 + + Merge pull request #2223 from geekpi/master + + translated + +commit fd1beb516ebefbec2df49c615b19941eb032ece6 +Author: zhengsihua +Date: Fri Jan 9 21:27:45 2015 +0800 + + translated + +commit 0deaef86375677123a9d12c7a93fab49a2a31185 +Merge: 403c9a8 9a926e4 +Author: geekpi +Date: Fri Jan 9 20:55:53 2015 +0800 + + Merge pull request #2222 from geekpi/master + + translating + +commit 9a926e435a1463a006d7db5936b3b785405038b6 +Author: zhengsihua +Date: Fri Jan 9 20:54:17 2015 +0800 + + translating + +commit 403c9a8ec460040914eb444f3d20fc9c277e71ad +Merge: c516ab1 47acced +Author: runningwater +Date: Fri Jan 9 18:44:36 2015 +0800 + + Merge pull request #2221 from runningwater/master + + 翻译完成 + +commit 47acced1a2928abc7f260a21365ccc1354cc7ba5 +Author: runningwater +Date: Fri Jan 9 18:43:49 2015 +0800 + + 翻译完成 + +commit c516ab10b54aece8aa48461f1338fb6c12a2b9c3 +Merge: 7609f46 516c0fc +Author: tinyeyeser +Date: Fri Jan 9 15:39:20 2015 +0800 + + Merge pull request #2220 from mr-ping/master + + Translated by Ping + +commit 7609f4637113f8ec730e937cfc4d56aa411c16fe +Author: tinyeyeser +Date: Fri Jan 9 15:26:36 2015 +0800 + + 已校对 by小眼儿 + + 翻译句式通顺，断句合理，符合中文阅读习惯。难得！ + 但个别地方翻译有错误，甚至与原意相悖，校对后已修改。 + +commit 516c0fcd53f0668d261c749607640100d80e805d +Merge: 47fb6bd 490830d +Author: Ping +Date: Fri Jan 9 13:56:10 2015 +0800 + + Merge remote-tracking branch 'upstream/master' into newbranch + +commit 47fb6bd76b8684cda6dd94f72109d3004be17cfd +Author: Ping +Date: Fri Jan 9 13:43:28 2015 +0800 + + [Translated]20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md + +commit 490830d01b0001b0e3a596ea9d22c3b34ac32b07 +Author: tinyeyeser +Date: Fri Jan 9 13:45:04 2015 +0800 + + 已校对 by小眼儿 + +commit 6093990d8f97f8af0c3eaded93132ad5783bd739 +Author: wxy +Date: Fri Jan 9 09:32:12 2015 +0800 + + PUB:20141224 Linux FAQs with Answers--How to install kernel headers on Linux + + @geekpi + +commit aff39edee1e7f31bf00190ceee4dbfb7badc7972 +Merge: 8df9d8a 7156c3b +Author: ZTinoZ +Date: Fri Jan 9 09:25:31 2015 +0800 + + Merge pull request #5 from LCTT/master + + Update the repository + +commit 7156c3bbdff04a2d22e371f20ef187dfb2ef9073 +Merge: 328b4d8 f0e9447 +Author: tinyeyeser +Date: Fri Jan 9 09:23:46 2015 +0800 + + Merge pull request #2219 from mr-ping/master + + Mr-Ping 翻译中 + +commit 328b4d883844d6526a0f662fb8737e3ed99355c7 +Author: wxy +Date: Fri Jan 9 09:21:52 2015 +0800 + + PUB:20140910 With Apple Watch Unveiled, Could an Ubuntu Smartwatch Be Next + + @su-kaiyao + +commit 1ea6efba941e0c4417534e76ad29425d7dd3d5e9 +Merge: 4a2c74a bdeba77 +Author: tinyeyeser +Date: Fri Jan 9 09:20:57 2015 +0800 + + Merge pull request #2218 from tinyeyeser/master + + 已翻译 by小眼儿 + +commit bdeba77fdcdd6c31a2e6fcece0eb33d4ce288138 +Author: tinyeyeser +Date: Fri Jan 9 09:19:45 2015 +0800 + + 已翻译 by小眼儿 + +commit f0e9447450c639f7153c6ae2713d75585f43eb0e +Author: Ping +Date: Fri Jan 9 09:12:04 2015 +0800 + + Mr-Ping 翻译中 + +commit ff7a2b0b757c3797821bbd0bae1b6d1e687c95bf +Merge: c5c2288 4a2c74a +Author: joeren +Date: Fri Jan 9 09:02:49 2015 +0800 + + Merge pull request #23 from LCTT/master + + Update Repo + +commit 4a2c74afc0c31df78f725983d25621d1456a0edd +Merge: f884444 bab7c60 +Author: runningwater +Date: Fri Jan 9 08:30:19 2015 +0800 + + Merge pull request #2217 from H-mudcup/master + + Translating by H-mudcup + +commit bab7c60dc29de34894dc8336a25dc8177f53325b +Author: H-mudcup +Date: Fri Jan 9 08:14:24 2015 +0800 + + Update 20140701 Easy File Comparisons With These Great Free Diff Tools.md + +commit 5a66c383bab7627c6f00c5c604924651b95e39ca +Merge: 2b8eb8c f884444 +Author: H-mudcup +Date: Fri Jan 9 08:11:47 2015 +0800 + + Merge pull request #6 from LCTT/master + + 同步2015/1/9 + +commit f884444180e09d3ee4f873feaadda9e04cb67e25 +Author: wxy +Date: Fri Jan 9 08:04:22 2015 +0800 + + PUB:20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems + + @barney-ro + +commit b1e81109cad9d00c26855322048727331e312139 +Author: wxy +Date: Fri Jan 9 07:21:07 2015 +0800 + + PUB:20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux + + @H-mudcup + +commit 05b53a429694eec76678c824ff04f8f28a3d807a +Author: wxy +Date: Fri Jan 9 07:17:09 2015 +0800 + + PUB:20141211 Yes, This Trojan Infects Linux. No, It' s Not The Tuxpocalypse + + @tinyeyeser + +commit 882339520a85cece044d3e76d3000f14b06ffe71 +Merge: 46b8923 8df9d8a +Author: Xingyu.Wang +Date: Fri Jan 9 00:59:11 2015 +0800 + + Merge pull request #2215 from ZTinoZ/master + + Finish the translation by ZTinoZ + +commit 46b8923973a94df66cee2e9f3e7b882c0010f27a +Merge: 17f7eec 8f5aeea +Author: geekpi +Date: Thu Jan 8 17:32:09 2015 +0800 + + Merge pull request #2216 from geekpi/master + + translated + +commit 8f5aeea25de604283b3ecf0829f585b0a8d242e2 +Author: zhengsihua +Date: Thu Jan 8 17:30:26 2015 +0800 + + translated + +commit 17f7eec130b27cd579214230cdbd3fd3aea6462f +Merge: 10ef4a2 01a9f16 +Author: geekpi +Date: Thu Jan 8 17:02:48 2015 +0800 + + Merge pull request #2214 from geekpi/master + + translating + +commit 01a9f16c46f0a72f7cb5e7e576145cba21d26bc5 +Author: zhengsihua +Date: Thu Jan 8 17:00:31 2015 +0800 + + translating + +commit 8df9d8a2dbfc036e85dba927202510c59771491a +Author: ZTinoZ +Date: Thu Jan 8 16:57:31 2015 +0800 + + Finish the Translation by ZTinoZ + +commit 10ef4a215aaf2ead4a30fe0c229c505a2aa8cd16 +Author: DeadFire +Date: Thu Jan 8 15:51:34 2015 +0800 + + 20150108-1 选题 + +commit d65f445403de978e969867d7dcb7cbf1617e2899 +Merge: e20c944 17e3b27 +Author: tinyeyeser +Date: Thu Jan 8 14:56:47 2015 +0800 + + Merge pull request #2213 from Vic020/master + + Translated:How To Install Kodi 14 + +commit 17e3b272063e391216076ea44feb24aea202d860 +Author: Vic___ +Date: Thu Jan 8 12:48:30 2015 +0800 + + Moved + +commit d30d88da63f0824cfd15a1d034b504ec63a1951c +Author: Vic___ +Date: Thu Jan 8 12:48:01 2015 +0800 + + Translated + +commit 2b8eb8c2e20945d9381e0decb6080c62aa2df241 +Merge: 12f4d5b e20c944 +Author: H-mudcup +Date: Thu Jan 8 11:25:46 2015 +0800 + + Merge pull request #5 from LCTT/master + + 同步2015/1/8 + +commit e20c94422d61f5fa95e09421fd5340a8a20da450 +Merge: 2311517 38338a7 +Author: Xingyu.Wang +Date: Thu Jan 8 10:35:13 2015 +0800 + + Merge pull request #2210 from Stevearzh/master + + [Translated by Stevearzh]20141226 How to Download Music from Grooveshark with a Linux OS.md + +commit 2311517f595be9c1af546521a6a5d5bd7083b8fc +Merge: 791a907 12f4d5b +Author: Xingyu.Wang +Date: Thu Jan 8 10:34:55 2015 +0800 + + Merge pull request #2209 from H-mudcup/master + + Translated by H-mudcup + +commit 791a907b4faf2ecdaec1cd650bff3cb70d8205a2 +Merge: c7a5bd8 6e3f25f +Author: geekpi +Date: Wed Jan 7 21:07:42 2015 +0800 + + Merge pull request #2212 from geekpi/master + + translated + +commit 6e3f25fa050fbaa807452518f28be29e949ea62f +Author: zhengsihua +Date: Wed Jan 7 21:06:47 2015 +0800 + + translated + +commit c7a5bd899ab013895adfbf83563e7fa7ed25f869 +Merge: 0bc39b1 03a283a +Author: geekpi +Date: Wed Jan 7 20:54:24 2015 +0800 + + Merge pull request #2211 from geekpi/master + + translating + +commit 03a283aaff319da1b5522347b1ab20e30db78798 +Author: zhengsihua +Date: Wed Jan 7 20:47:32 2015 +0800 + + translating + +commit 38338a75969021460b8edfb8d6bed9a108137279 +Author: Stevearzh +Date: Wed Jan 7 16:31:08 2015 +0800 + + Translated by Stevearzh + +commit 0bc39b1f100b4d93f35c6d796a9f1ab3b2388946 +Author: tinyeyeser +Date: Wed Jan 7 16:00:11 2015 +0800 + + 已校对 by小眼儿 + +commit 51c42753fcaabce184d2e242bdae05b4ec1f46ce +Author: wxy +Date: Wed Jan 7 15:50:03 2015 +0800 + + PUB:20141023 How to turn your CentOS box into a BGP router using Quagga + + @disylee + +commit 83003afecac7532b1d564244233e53f0a73a8690 +Author: ZTinoZ +Date: Wed Jan 7 14:21:38 2015 +0800 + + Translating by ZTinoZ + +commit 13ad0b8f4402599a2b3dce71913a7be17d0d071e +Author: wxy +Date: Wed Jan 7 14:01:23 2015 +0800 + + PUB:20141013 How to configure peer-to-peer VPN on Linux + + @felixonmars + +commit 145b91641fd1acb24b73905d4ae6e3202c359209 +Author: wxy +Date: Wed Jan 7 13:45:45 2015 +0800 + + PUB:20140912 What' s wrong with IPv4 and Why we are moving to IPv6 + + @bazz2 + +commit 75e55d791c62439fc0b5fdc3d723a8b086830059 +Author: tinyeyeser +Date: Wed Jan 7 10:23:43 2015 +0800 + + 已校对 by小眼儿 + +commit 12f4d5b9990adc190dcc68bfd6cff4a5b544ed86 +Author: H-mudcup +Date: Wed Jan 7 10:17:51 2015 +0800 + + Create 20141106 Tomahawk Music Player Returns With New Look, Features.md + +commit d6a5e14d67ff33806c3b10edef5a6af6d710f996 +Author: H-mudcup +Date: Wed Jan 7 10:16:16 2015 +0800 + + Delete 20141106 Tomahawk Music Player Returns With New Look, Features.md + +commit 8037854bae15996a4d79fa11cb6f346d36a93fd2 +Author: tinyeyeser +Date: Wed Jan 7 09:37:18 2015 +0800 + + 翻译中 by小眼儿 + +commit 6b8ab98e8c40ba846a9f0608a325c02c395366a2 +Merge: 2819923 16e313d +Author: geekpi +Date: Tue Jan 6 19:12:20 2015 +0800 + + Merge pull request #2206 from H-mudcup/master + + Translating by H-mudcup + +commit 2819923c91c230f43a29a1a2ed60d7b4602649b0 +Merge: 78aab17 21b9f1d +Author: geekpi +Date: Tue Jan 6 19:11:41 2015 +0800 + + Merge pull request #2208 from geekpi/master + + translated + +commit 21b9f1dbc216fc0cc667b0ac7e4cb2cf789e2c92 +Author: zhengsihua +Date: Tue Jan 6 18:56:05 2015 +0800 + + translated + +commit 068036a530a4aab7233c4ee5e7a27fbfab0bde66 +Author: zhengsihua +Date: Tue Jan 6 18:48:32 2015 +0800 + + deleted + +commit 78aab177aca431de3aea0c53d1113a50c30889d7 +Author: geekpi +Date: Tue Jan 6 17:54:21 2015 +0800 + + Update 20150105 Ubuntu apt-get and apt-cache commands with practical examples.md + +commit a2c2f6726eb6f3c87d8f26bc80cad4c85759989f +Author: ZTinoZ +Date: Tue Jan 6 17:38:16 2015 +0800 + + Translating by ZTinoZ + +commit a950929cddcbcd85e51b6dc0af62387c3f041d43 +Author: tinyeyeser +Date: Tue Jan 6 17:22:28 2015 +0800 + + 已翻译 by小眼儿 + +commit 91902126c4086880b256b06c215f4759a81c23b7 +Merge: ee0e950 f604661 +Author: tinyeyeser +Date: Tue Jan 6 17:15:23 2015 +0800 + + Merge pull request #2207 from tinyeyeser/master + + 已翻译 by小眼儿 + +commit f604661fa17704504c240b043f7d960daf7f46e0 +Author: tinyeyeser +Date: Tue Jan 6 17:11:37 2015 +0800 + + 已翻译 by小眼儿 + + Signed-off-by: tinyeyeser + +commit ee0e9502558cd774095f3b467bf9af40621a1c60 +Author: DeadFire +Date: Tue Jan 6 16:37:55 2015 +0800 + + 20150106-1 选题 + +commit 16e313d6a5a09b8879fc75a185d9d30b207f3b62 +Author: H-mudcup +Date: Tue Jan 6 12:37:04 2015 +0800 + + Update 20141106 Tomahawk Music Player Returns With New Look, Features.md + +commit 780113f8e666b2d652772347e5a033fa1c5e1ab0 +Merge: 3ff479d 9b4d773 +Author: H-mudcup +Date: Tue Jan 6 12:13:16 2015 +0800 + + Merge pull request #4 from LCTT/master + + 同步2015/1/6 + +commit 9b4d773824b01aa2e184e43bf7a654b8c12659ad +Merge: 1dff8e3 cd31073 +Author: Xingyu.Wang +Date: Mon Jan 5 21:56:25 2015 +0800 + + Merge pull request #2205 from Vic020/patch-26 + + 抢地主 + +commit 1dff8e3db67e54b23ff6fc36615fe60aec3c6e4e +Merge: 17bccaf 6e31b7e +Author: Xingyu.Wang +Date: Mon Jan 5 21:56:04 2015 +0800 + + Merge pull request #2204 from SPccman/master + + Quick systemd-nspawn guide + +commit cd31073929e78be980c951231883606c0f8d82b0 +Author: Vic___ +Date: Mon Jan 5 20:17:49 2015 +0800 + + Update 20150105 How To Install Kodi 14 (XBMC) In Ubuntu 14.04 and Linux Mint 17.md + +commit 6e31b7ec439db2e50c644f59db754c04ad0b2c03 +Author: DoubleC <450760206@qq.com> +Date: Mon Jan 5 20:16:30 2015 +0800 + + Create Quick systemd-nspawn guide.md + + complete + +commit 06eb045b2855d3e2a722853b5b48b80e9b7d9fd7 +Author: DoubleC <450760206@qq.com> +Date: Mon Jan 5 20:13:07 2015 +0800 + + delete source file + + delete source file + +commit 52717946a7c72f42effb1af5f638f2407b32a627 +Merge: 49fbafb 17bccaf +Author: DoubleC <450760206@qq.com> +Date: Mon Jan 5 20:12:07 2015 +0800 + + Merge pull request #13 from LCTT/master + + Update + +commit 17bccaf9afd68897a1199dac07fec68db36b3d13 +Author: DeadFire +Date: Mon Jan 5 16:19:42 2015 +0800 + + 20150105-1 选题 + +commit df83a70203c28d382cbc2f7468fc47c3fc06e82e +Merge: ed63571 04de393 +Author: Xingyu.Wang +Date: Mon Jan 5 16:16:54 2015 +0800 + + Merge pull request #2203 from liaoishere/master + + [translated] 20141008 How to configure HTTP load balancer with HAProxy on Linux + +commit ed6357105ac697156ad373e0b57ffaff82dbab58 +Merge: 35b3139 e8b1750 +Author: Xingyu.Wang +Date: Mon Jan 5 16:16:27 2015 +0800 + + Merge pull request #2202 from barney-ro/master + + [translating]20141219 2015 will be the year Linux takes over the enterprise and other predictions + +commit 35b3139674e7705cd6b42c405807a3cd50d10621 +Author: tinyeyeser +Date: Mon Jan 5 16:13:28 2015 +0800 + + 翻译中 by小眼儿 + +commit 04de393fe77aa70f894a58b887e893d968948a51 +Author: liaoishere +Date: Mon Jan 5 13:48:11 2015 +0800 + + [translated] 20141008 How to configure HTTP load balancer with HAProxy on Linux + +commit d18ac9bd28a84786b144452cb159a24726655c7d +Author: ZTinoZ +Date: Mon Jan 5 13:30:10 2015 +0800 + + Translating by ZTinoZ + +commit e8b1750f68ab640023024fab3b9ffbe888e2d359 +Author: barney-ro +Date: Mon Jan 5 13:11:49 2015 +0800 + + [translating]20141219 2015 will be the year Linux takes over the enterprise and other predictions + +commit 460698dbc42fcf31992878e2fac57c6236d8c8c1 +Merge: ca03351 8f3fb80 +Author: Xingyu.Wang +Date: Mon Jan 5 12:47:57 2015 +0800 + + Merge pull request #2201 from liaoishere/master + + liaoishere is translating + +commit 8f3fb80c7f5fad2e8a047aa4ff28cf8b515ba6cd +Author: liaoishere +Date: Mon Jan 5 11:19:19 2015 +0800 + + liaoishere is translating + + translating 20141008 How to configure HTTP load balancer with HAProxy on Linux.md + +commit ca03351d4daf0e787cdbf451291cbec5a6c67041 +Merge: 5934485 c5c2288 +Author: joeren +Date: Mon Jan 5 10:13:30 2015 +0800 + + Merge pull request #2200 from GOLinux/master + + [Translated]20150104 How To Install Websvn In CentOS 7.md + +commit c5c22882993fc28a1b56309342905fd82e9ba326 +Author: GOLinux +Date: Mon Jan 5 10:12:16 2015 +0800 + + [Translated]20150104 How To Install Websvn In CentOS 7.md + +commit 593448563867c1d4de9a6f63487199d9566158a7 +Merge: 78eea5e b471789 +Author: joeren +Date: Mon Jan 5 09:51:05 2015 +0800 + + Merge pull request #2199 from GOLinux/master + + [Translating]20150104 How To Install Websvn In CentOS 7.md + +commit b47178940451cbb41697405138a2be9e9fe1e1e0 +Author: joeren +Date: Mon Jan 5 09:50:40 2015 +0800 + + Update 20150104 How To Install Websvn In CentOS 7.md + +commit 4b7691b3549f7745ef1001349865d8e0d0a9e11c +Merge: 5566a97 78eea5e +Author: joeren +Date: Mon Jan 5 09:49:17 2015 +0800 + + Merge pull request #22 from LCTT/master + + Update Repository + +commit 78eea5edfed41854db51cc6e5b1f738256d30b45 +Merge: a2c7dad 3ff479d +Author: joeren +Date: Mon Jan 5 09:48:23 2015 +0800 + + Merge pull request #2198 from H-mudcup/master + + Translated Flow ‘N Play Movie Player Has a Stylish Interface [Ubuntu Installation] + +commit a2c7dad8dff050496a23388832390478a6203caa +Merge: bd187e3 7c761d0 +Author: joeren +Date: Mon Jan 5 09:47:59 2015 +0800 + + Merge pull request #2197 from KayGuoWhu/master + + [translating] 20141222 A brief history of Linux malware + +commit bd187e3aea48f8cd6757ad0dde09dbc47b71ce62 +Merge: 1da8f35 031955c +Author: joeren +Date: Mon Jan 5 09:47:52 2015 +0800 + + Merge pull request #2196 from liaoishere/master + + translating 20141027 ntpq -p output + +commit 3ff479dae6f3a2a3c7f5edf6a084ef39492b26f1 +Author: H-mudcup +Date: Sun Jan 4 19:37:56 2015 +0800 + + Create 20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md + + Translated by H-mudcup + +commit c2be7bf490f560ec3f67626a892be1a22a7425ae +Author: H-mudcup +Date: Sun Jan 4 18:47:24 2015 +0800 + + Delete 20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md + +commit fc13165571778d6a6e535d7e2a381cb890917755 +Merge: 104d8c7 1da8f35 +Author: H-mudcup +Date: Sun Jan 4 18:46:01 2015 +0800 + + Merge pull request #3 from LCTT/master + + 同步 + +commit 031955c2a3eaaec352009c570de154d3a380a211 +Merge: acf066d 1da8f35 +Author: liaoishere +Date: Sun Jan 4 17:39:16 2015 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit acf066d9638e6dc9d31eb3fdb30a713ce1d3aa0b +Author: liaoishere +Date: Sun Jan 4 17:36:56 2015 +0800 + + [translated] 20141027 ntpq -p output + +commit 4b24d172b1e9994e18bc1668e76fd22fb55e8d45 +Author: ZTinoZ +Date: Sun Jan 4 17:00:07 2015 +0800 + + Translating by ZTinoZ + +commit 1da8f3500df779e2a01189bc9c43bb15c9d1b191 +Author: DeadFire +Date: Sun Jan 4 16:17:47 2015 +0800 + + 20150104-4 选题 + +commit 104d8c71df1e2819bda99abe74927a2a90efff90 +Merge: 5ea7de0 d3b1336 +Author: H-mudcup +Date: Sun Jan 4 15:28:06 2015 +0800 + + Merge pull request #2 from LCTT/master + + update 2015/1/4 + +commit d3b13366378e8e27bcb2a6c253144a4d9d62546a +Author: DeadFire +Date: Sun Jan 4 14:55:03 2015 +0800 + + 20150104-3 选题 + +commit 68819fccd8af60ca60c8077252ed7e1938df8ecd +Author: DeadFire +Date: Sun Jan 4 14:54:47 2015 +0800 + + 20150104-2 选题 + +commit 7c761d02f8c2caad2f9decb5ae794caa22bdcdab +Author: KayGuoWhu +Date: Sun Jan 4 14:40:38 2015 +0800 + + the first translating of 2015 + +commit fc1ec72d1e923ff3a1517fcf458cd79fd0521fef +Author: liaoishere +Date: Sun Jan 4 14:34:07 2015 +0800 + + liaoishere is translating 20141027 ntpq -p output + +commit ca450ff5f3f9e55e3b1a59d8ec54da7696b722b6 +Merge: 27ce29b 8d16e0b +Author: liaoishere +Date: Sun Jan 4 14:32:59 2015 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit 8d16e0b5be7332ad146f7fe0484f320ef4ad582c +Merge: 0425cc7 5ea7de0 +Author: Xingyu.Wang +Date: Sun Jan 4 11:20:34 2015 +0800 + + Merge pull request #2195 from H-mudcup/master + + Translating Flow ‘N Play Movie Player Has a Stylish Interface [Ubuntu Installation] + +commit 5ea7de03ae065dcf3f1583d3af4a76737b15d8c3 +Author: H-mudcup +Date: Sun Jan 4 11:15:17 2015 +0800 + + Update 20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md + +commit 17326e0e9c01181d316cca26a5a9dbe4559c77dd +Merge: d495db5 0425cc7 +Author: H-mudcup +Date: Sun Jan 4 11:01:59 2015 +0800 + + Merge pull request #1 from LCTT/master + + update 2015/1/4 + +commit 307441701b1037f680ed4b9b94aff0cc6508c0c3 +Merge: ddb74b9 0425cc7 +Author: ZhouJ-sh <32321321@qq.com> +Date: Sun Jan 4 10:46:18 2015 +0800 + + Merge pull request #3 from LCTT/master + + Merge from base + +commit 0425cc77cdd817b37854fd933e5f86969b733be8 +Author: DeadFire +Date: Sun Jan 4 10:36:31 2015 +0800 + + 20150104-1 选题 + +commit ae286d51cb46a4dfedc96ecca494d91e6ccc3032 +Merge: 4ea7103 d495db5 +Author: Xingyu.Wang +Date: Sun Jan 4 10:28:01 2015 +0800 + + Merge pull request #2194 from H-mudcup/master + + U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux + +commit d495db54a008d9b31019090081508c07ab49c03c +Author: H-mudcup +Date: Sun Jan 4 10:19:40 2015 +0800 + + Delete 20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md + +commit 70796857b7093a2b655a98f99c80e577de50edcf +Author: H-mudcup +Date: Sun Jan 4 10:12:49 2015 +0800 + + Create 20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md + +commit 5566a971b2c51d163f97a15422401550c358cd55 +Merge: 3b192a8 4ea7103 +Author: joeren +Date: Sun Jan 4 07:51:15 2015 +0800 + + Merge pull request #21 from LCTT/master + + Update Repository + +commit 27ce29b5199e53310cfd11896a48cdc984a3b6fe +Merge: f481c29 4ea7103 +Author: liaoishere +Date: Sun Jan 4 01:31:45 2015 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit 4ea710321c428240d68aa7e54649d3d8006f4342 +Merge: 3315e3d f98c9a1 +Author: Xingyu.Wang +Date: Sat Jan 3 20:51:09 2015 +0800 + + Merge pull request #2189 from liaoishere/master + + [translated] 20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server + +commit f481c2995db787c978a6fcdd59978229063470c0 +Merge: f98c9a1 3315e3d +Author: liaoishere +Date: Sat Jan 3 14:25:11 2015 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit 3315e3ddcbb5517761dba9c4bde97f0905cf04de +Merge: 54bff27 8081292 +Author: geekpi +Date: Sat Jan 3 14:06:49 2015 +0800 + + Merge pull request #2193 from geekpi/master + + translated + +commit 8081292d0890dfccaf8869c648584cb81fa6f512 +Author: zhengsihua +Date: Sat Jan 3 14:02:14 2015 +0800 + + delete source file + +commit 773311b89d928498f20076360be67e8a9df135c7 +Merge: 3813262 d4431f3 +Author: zhengsihua +Date: Sat Jan 3 13:57:33 2015 +0800 + + Merge branch 'master' of https://github.com/geekpi/TranslateProject + +commit 54bff2750b9e95db880631d4b5bbb4f80e9012f1 +Merge: 349e04c d4431f3 +Author: geekpi +Date: Sat Jan 3 13:56:28 2015 +0800 + + Merge pull request #2192 from geekpi/master + + translating + +commit 381326294179b5860f84233cf8043f6143dac628 +Author: zhengsihua +Date: Sat Jan 3 13:55:32 2015 +0800 + + translated + +commit d4431f3774ea0b5b7f6bf733b78af7290574041c +Author: geekpi +Date: Sat Jan 3 00:04:12 2015 -0500 + + translating + +commit f98c9a1c08b0e04949badb72387522ab24be4e75 +Author: liaoishere +Date: Sat Jan 3 00:19:03 2015 +0800 + + [translated] 20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server + +commit 349e04c3139cd17fca89f754784e890f3e6066b6 +Merge: 2195e0e daf91ce +Author: runningwater +Date: Sat Jan 3 00:01:18 2015 +0800 + + Merge pull request #2188 from liaoishere/master + + liaoishere is translating 20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server + +commit daf91ce773096eb7b2b5a324dfa4ca49b95fc75a +Author: liaoishere +Date: Fri Jan 2 23:13:56 2015 +0800 + + liaoishere is translating 20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server + +commit 2195e0e84e2bb2a43da1a146ee6d990ff609a7f0 +Author: wxy +Date: Fri Jan 2 23:02:10 2015 +0800 + + PUB:20141115 How to perform system backup with backup-manager on Linux + + @GOLinux + +commit 656458d0777f210f84f978eda233a5b14e284f2f +Author: wxy +Date: Fri Jan 2 22:53:45 2015 +0800 + + 补充删除 + +commit e69e4f48de6fce460adb003ab4920a4e5e1ca117 +Author: wxy +Date: Fri Jan 2 22:41:11 2015 +0800 + + PUB:20141023 What are useful Bash aliases and functions + + @luoyutiantang + +commit 2ee23919969daed6097991c13964cf6cf1c46f3c +Merge: d7ca250 1609916 +Author: runningwater +Date: Fri Jan 2 19:59:10 2015 +0800 + + Merge pull request #2185 from H-mudcup/patch-1 + + Translating by H-mudcup + +commit d7ca25005bcbe76fdd6bd7a6388019714dcb247a +Merge: 0101a84 fa96853 +Author: geekpi +Date: Fri Jan 2 18:18:27 2015 +0800 + + Merge pull request #2187 from geekpi/master + + translated + +commit fa96853c90cdcf4404a1ba9bdd91e6494e6829f8 +Author: zhengsihua +Date: Fri Jan 2 18:15:46 2015 +0800 + + translated + +commit 0101a8408b7a4231a0cb9cfe068449c8a553d065 +Merge: becb5c0 aea12ba +Author: geekpi +Date: Fri Jan 2 17:03:26 2015 +0800 + + Merge pull request #2186 from geekpi/master + + translating + +commit aea12ba42b531f214ec02e3294ee91649add0ba1 +Author: zhengsihua +Date: Fri Jan 2 17:01:28 2015 +0800 + + translating + +commit becb5c029511647667aeede5566836e4362ad190 +Author: wxy +Date: Fri Jan 2 13:33:16 2015 +0800 + + PUB:20140915 10 Open Source Cloning Software For Linux Users + + @felixonmars + +commit f925f5db94bf83ba8a1b3958a8de354bf1136639 +Author: wxy +Date: Fri Jan 2 13:15:09 2015 +0800 + + PUB:20141224 Linux FAQs with Answers--How to check SSH protocol version on Linux + + @geekpi + +commit 16de73e52f860bd33e6017ab2ca1d5dc3bb1f988 +Author: wxy +Date: Fri Jan 2 13:04:15 2015 +0800 + + 错误的放在了根下 + +commit 1609916663ad1fe0b4cc59715900d727141a43eb +Author: H-mudcup +Date: Fri Jan 2 12:41:58 2015 +0800 + + Translating by H-mudcup + + U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux + +commit f42e58092f7ceafd7f4340ddf03338f1fd426169 +Merge: e41ff61 7429dad +Author: Xingyu.Wang +Date: Thu Jan 1 23:14:19 2015 +0800 + + Merge pull request #2184 from SPccman/patch-13 + + SPccman + 下回请用所申领的文章标题作为 PR的标题哈。 + +commit 7429dad38ec3d3ec85defc572e565d26b2489d0a +Author: DoubleC <450760206@qq.com> +Date: Thu Jan 1 18:02:45 2015 +0800 + + SPccman + + 申领 + +commit e41ff61df76a302c9a085532bd323212b1baa39b +Merge: 7a0f9d6 189d460 +Author: Xingyu.Wang +Date: Thu Jan 1 16:29:55 2015 +0800 + + Merge pull request #2183 from geekpi/master + + translated + +commit 189d460a74588d3408caa9ad354414391028636f +Author: zhengsihua +Date: Thu Jan 1 11:45:53 2015 +0800 + + translated + +commit 7a0f9d6a49c6d0b9300900b9f7ad9529d7b448b7 +Merge: 7245158 682f441 +Author: geekpi +Date: Thu Jan 1 10:08:51 2015 +0800 + + Merge pull request #2182 from geekpi/master + + translating + +commit 682f441674eee44bd8bad38533e3ae18b79535de +Author: zhengsihua +Date: Thu Jan 1 10:06:48 2015 +0800 + + translating + +commit 7245158ee184d70b7dae84ac5208c37a43a9b5d3 +Merge: 7d05480 2fa94b2 +Author: runningwater +Date: Thu Jan 1 00:59:11 2015 +0800 + + Merge pull request #2181 from liaoishere/master + + [translated] 20141120 How to install Xen hypervisor on unused old hardwa... + +commit 2fa94b20bf7e9ada3a9ddbbfba5b9298cf79dab9 +Author: liaoishere +Date: Thu Jan 1 00:41:31 2015 +0800 + + [translated] 20141120 How to install Xen hypervisor on unused old hardware + +commit 7d05480104815f4abf0578fe37686ebc18d4065e +Author: wxy +Date: Thu Jan 1 00:17:50 2015 +0800 + + 归档201412，告别2014，谢谢各位 LCTTer！ + +commit 36bb57baf207e100a27b060cd685c28e59f395b1 +Merge: 6f071e9 9f2e09e +Author: Xingyu.Wang +Date: Wed Dec 31 23:42:59 2014 +0800 + + Merge pull request #2180 from alim0x/master + + [translated]11 - The history of Android.md + 新年快乐~~ + +commit 6f071e9b3cb98c55ca9e5e80ccd62739c799e186 +Author: wxy +Date: Wed Dec 31 23:08:50 2014 +0800 + + PUB:20141222 Linus Torvalds Launches Linux Kernel 3.19 RC1, One of the Biggest So Far + + @geekpi + +commit e138c32c0d0c6275b1e2db0e9d541f12f8f9bb5b +Author: wxy +Date: Wed Dec 31 22:54:06 2014 +0800 + + PUB:20141230 Second Edition of Ubuntu Manual 14.04 LTS Is Ou + + @zhouj-sh 明天就能见到了： http://linux.cn/article-4570-1.html + +commit a4b2d54341072ddf12590e2beeb30ce6f2c47b8f +Author: wxy +Date: Wed Dec 31 22:51:03 2014 +0800 + + 放错位置。。 + +commit 9f2e09ea39a5c6d1481f9570ed6c487d872a31da +Author: alim0x +Date: Wed Dec 31 22:41:43 2014 +0800 + + [translated]11 - The history of Android.md + +commit 4b20fc8ccbfffe9f9b4567ea098bb72d1550c3cc +Author: wxy +Date: Wed Dec 31 22:31:39 2014 +0800 + + 处理不完美的 PR + +commit 94a35875ac6c4471dcb9df5564d537f71afe31da +Merge: 7054d70 ef8c7bf +Author: Xingyu.Wang +Date: Wed Dec 31 22:26:47 2014 +0800 + + Merge pull request #2179 from barney-ro/master + + [translated]20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems + + 是的，是因为你给丢失了扩展名。 + +commit 7054d70600dbcf203a9d82af0fcb9ab4b71f5e73 +Merge: 36da19b ed7e244 +Author: Xingyu.Wang +Date: Wed Dec 31 22:26:05 2014 +0800 + + Merge pull request #2178 from H-mudcup/master + + 翻译完成20141226 The Good The Bad And The Ugly Of Linux In 2014.md + +commit 36da19b260e83120e17889cafe44856157265046 +Merge: 7354f5d a96dfa1 +Author: Xingyu.Wang +Date: Wed Dec 31 22:25:34 2014 +0800 + + Merge pull request #2177 from liaoishere/master + + liaosihere is translating + +commit 7354f5d8d248d6beed2ead7c6aabf0bf5a0bf9e3 +Merge: bea9184 ddb74b9 +Author: Xingyu.Wang +Date: Wed Dec 31 22:24:12 2014 +0800 + + Merge pull request #2176 from ZhouJ-sh/master + + 选题&翻译 Second Edition of Ubuntu Manual 14.04 LTS Is Out + + 谢谢您的首次参与，辛苦啦。不过建议您以后可以将您要推荐的选题给LCTT 的选题，由其添加，你可以自行认领。这样流程比较一致。不过您的这个选题的格式制作也很好。作为鼓励，新人的翻译会尽快发布~~ + +commit ef8c7bfa6c9c2899d26a12dd1a6df7007bf5ef05 +Author: Zhili.Yang +Date: Wed Dec 31 22:14:44 2014 +0800 + + Delete 20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems.md + +commit 7633fec9a5470014aca38f8d8065f7e72dfa6eb8 +Author: Zhili.Yang +Date: Wed Dec 31 22:13:02 2014 +0800 + + [translated]20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems + +commit ed7e2448b27175274ae3de46f11413dd519083d6 +Author: H-mudcup +Date: Wed Dec 31 18:30:32 2014 +0800 + + Create 20141226 The Good The Bad And The Ugly Of Linux In 2014.md + +commit 59e014701d68362b7c6f0bb1053a7256ddee93c9 +Author: H-mudcup +Date: Wed Dec 31 18:29:16 2014 +0800 + + Delete 20141226 The Good The Bad And The Ugly Of Linux In 2014.md + +commit a96dfa15d6a07733d8d02406578bf4768e454637 +Author: liaoishere +Date: Wed Dec 31 17:59:21 2014 +0800 + + liaosihere is translating + +commit ddb74b91fa9bdaef9d22b47243e454c207470562 +Author: ZhouJ-sh <32321321@qq.com> +Date: Wed Dec 31 17:45:52 2014 +0800 + + 选题 sources/news/20141230 Second Edition of Ubuntu Manual 14.04 LTS Is Out + +commit af3bd6bf260ef52fa4ef1cb4754829bc7d70c9ba +Author: ZTinoZ +Date: Wed Dec 31 17:43:19 2014 +0800 + + Translating by ZTinoZ + +commit 3a97aad992ee78b3815f59d82890311602ec6d47 +Author: ZhouJ-sh <32321321@qq.com> +Date: Wed Dec 31 17:43:19 2014 +0800 + + translat /news/20141230 Second Edition of Ubuntu Manual 14.04 LTS Is Out + +commit bea9184de731cd3d9cdaed11508319366a0cde62 +Merge: 2bcc32d 90e3fc4 +Author: Xingyu.Wang +Date: Wed Dec 31 13:25:48 2014 +0800 + + Merge pull request #2175 from ideas4u/patch-3 + + Update 20141229 4 Steps to Setup Local Repository in Ubuntu using APT-mi... + +commit 90e3fc481bbc755f49f19bda36183cfe7add044b +Author: ideas4u +Date: Wed Dec 31 13:09:48 2014 +0800 + + Update 20141229 4 Steps to Setup Local Repository in Ubuntu using APT-mirror.md + + translating req + +commit 2bcc32daec5f69a9bce752bd3e7f00b643b82db0 +Merge: cb2ce57 3a03323 +Author: Xingyu.Wang +Date: Wed Dec 31 12:58:25 2014 +0800 + + Merge pull request #2173 from ideas4u/patch-2 + + Create 20141211 How to use matplotlib for scientific plotting on Linux 已完成 + +commit cb2ce57b43cd89c2898a620e61635f6b861691e0 +Merge: 38fb9e5 587f865 +Author: Xingyu.Wang +Date: Wed Dec 31 12:58:09 2014 +0800 + + Merge pull request #2174 from ideas4u/patch-1 + + Delete 20141211 How to use matplotlib for scientific plotting on Linux.m... + +commit 587f865cb2bd27bdbb4090f6db9fc4f3538b3af2 +Author: ideas4u +Date: Wed Dec 31 12:55:26 2014 +0800 + + Delete 20141211 How to use matplotlib for scientific plotting on Linux.md + +commit 38fb9e504ca5a7edb42b7b033f37764b06d2d53e +Merge: 64d596e 7c5acd7 +Author: Xingyu.Wang +Date: Wed Dec 31 12:23:02 2014 +0800 + + Merge pull request #2171 from mtunique/master + + 【翻译完成】20141229 5 User Space Debugging Tools in Linux + +commit 7c5acd73f20bdea81542bf04c515fd0832fc08c1 +Author: mtunique +Date: Wed Dec 31 12:06:31 2014 +0800 + + 【翻译完成】20141229 5 User Space Debugging Tools in Linux + +commit 62ec8144152a046ca473fdd795285fb0d23e376d +Author: ZhouJ-sh <32321321@qq.com> +Date: Wed Dec 31 12:03:11 2014 +0800 + + 选题 20141230 Second Edition of Ubuntu Manual 14.04 LTS Is Out + +commit 909f645bf5b5a815391f4fade5a0a9f03d337b6d +Author: ZTinoZ +Date: Wed Dec 31 11:48:54 2014 +0800 + + Translating by ZTinoZ + +commit e9213927c5e39e29d3cab3032cd7abb3228fd176 +Author: mtunique +Date: Wed Dec 31 11:47:24 2014 +0800 + + 【翻译完成】20141229 5 User Space Debugging Tools in Linux + +commit 8b0e478477e0e4d6a9bef7d7809604868cbbef0b +Author: mtunique +Date: Wed Dec 31 11:45:24 2014 +0800 + + delete 20141229 5 User Space Debugging Tools in Linux.md + +commit a3b61d46f93527db1538238d376caaab06a0dad9 +Merge: 2bd8a0d 64d596e +Author: mtunique +Date: Wed Dec 31 11:44:07 2014 +0800 + + Merge remote-tracking branch 'lctt/master' + +commit 64d596e703116c1ece818626d98cfddada2b1da2 +Merge: e84fc42 c8c5ad2 +Author: Xingyu.Wang +Date: Wed Dec 31 11:04:37 2014 +0800 + + Merge pull request #2170 from H-mudcup/master + + update 2014/12/31 + +commit c8c5ad2a21321caa97514360dcad50eb42db48e2 +Author: H-mudcup +Date: Wed Dec 31 10:43:45 2014 +0800 + + Update 20141226 The Good The Bad And The Ugly Of Linux In 2014.md + + Translating by H-mudcup + +commit 146f514cb19f0e6ecd0524da62a0bec917a60c2a +Merge: 2daff13 e84fc42 +Author: ZhouJ-sh <32321321@qq.com> +Date: Wed Dec 31 10:39:52 2014 +0800 + + Merge pull request #2 from LCTT/master + + Merge from base + +commit ed7385ad7bce215f6f068da196a4c5556b6290d0 +Merge: 3923955 e84fc42 +Author: H-mudcup +Date: Wed Dec 31 10:36:24 2014 +0800 + + Merge pull request #3 from LCTT/master + + 更新2014年12月30日 + +commit e84fc42b9c8972831ed5d8d78ee9a58607dbafd8 +Merge: cd6228b 3b192a8 +Author: joeren +Date: Wed Dec 31 08:29:51 2014 +0800 + + Merge pull request #2169 from GOLinux/master + + [Translated] 20141224 Calife--A lightweight alternative to sudo.md + +commit 3b192a8aed6bd8c77da5f692b6d60f68e478eea9 +Author: GOLinux +Date: Wed Dec 31 08:27:07 2014 +0800 + + [Translated] 20141224 Calife--A lightweight alternative to sudo.md + +commit cd6228bc7810646208e22a01708b9b3f782cb9f6 +Merge: 70174be 82ac18e +Author: joeren +Date: Wed Dec 31 07:52:55 2014 +0800 + + Merge pull request #2168 from GOLinux/master + + [Translating]20141224 Calife--A lightweight alternative to sudo.md + +commit 82ac18e7e6a8f9a3109911533dcd4c3a2edc54dc +Author: joeren +Date: Wed Dec 31 07:52:28 2014 +0800 + + Update 20141224 Calife--A lightweight alternative to sudo.md + +commit dc8fc5d8a09e76b10f6effe7e609e36d75dea410 +Merge: b3d9bb7 70174be +Author: joeren +Date: Wed Dec 31 07:51:10 2014 +0800 + + Merge pull request #20 from LCTT/master + + Update Repository + +commit 70174bed6dbd5ccc51ab4dd7215923026ac1a48f +Merge: 95d5ce4 55be8f9 +Author: joeren +Date: Wed Dec 31 07:50:39 2014 +0800 + + Merge pull request #2167 from Vic020/master + + Translated: Linux FAQs with Answers--How to install Kingsoft Office on Linux + +commit 95d5ce4eb0dfa27a48013a8e020615b9a898e507 +Merge: acb74fb 2daff13 +Author: joeren +Date: Wed Dec 31 07:50:28 2014 +0800 + + Merge pull request #2166 from ZhouJ-sh/master + + 20141229 选题 2 Ways To Fix The UEFI Bootloader When Dual Booting Windo… + +commit acb74fb709c5faacadef795575b06e046abdd87a +Merge: 2ea4597 5cab529 +Author: joeren +Date: Wed Dec 31 07:50:14 2014 +0800 + + Merge pull request #2165 from Stevearzh/master + + Translating by Stevearzh + +commit 55be8f979ef92bcd893995ca0ed746b720c1ff62 +Author: Vic___ +Date: Tue Dec 30 22:49:59 2014 +0800 + + Moved + +commit 8bb194413564b652cb212b5143acb8e1f880fd90 +Author: Vic___ +Date: Tue Dec 30 22:48:53 2014 +0800 + + Translated + +commit 2daff130f975f6b6c566e3ca030f3e7e77d1b515 +Author: ZhouJ-sh <32321321@qq.com> +Date: Tue Dec 30 18:05:32 2014 +0800 + + translated 20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md + +commit 06c94466acd9089ff9f641666dbbb695d93900ce +Author: ZhouJ-sh <32321321@qq.com> +Date: Tue Dec 30 16:42:44 2014 +0800 + + 20141229 选题 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md + +commit 5cab52953e40e4dff4763a672888c53beb9d6b97 +Author: Stevearzh +Date: Tue Dec 30 14:43:41 2014 +0800 + + Translating by Stevearzh + +commit 2bd8a0dcaaf73a3b1686ae671704404baeac0dde +Merge: cea1528 2ea4597 +Author: mtunique +Date: Tue Dec 30 12:59:28 2014 +0800 + + Merge remote-tracking branch 'lctt/master' + +commit 2ea4597c9b7318eafbfac34e6674b41956110553 +Merge: 74b278b 0a3f390 +Author: Xingyu.Wang +Date: Tue Dec 30 12:23:45 2014 +0800 + + Merge pull request #2164 from ZTinoZ/master + + Translating by ZTinoZ + +commit 0a3f3906f5d07fc78c2d824665d6b4eb347fa45c +Author: ZTinoZ +Date: Tue Dec 30 11:50:33 2014 +0800 + + Translating by ZTinoZ + +commit e3991b36a9bc66dfc8f94bb5f718c7229ac3d6dc +Merge: 81f30fa 74b278b +Author: ZTinoZ +Date: Tue Dec 30 11:46:31 2014 +0800 + + Merge pull request #4 from LCTT/master + + Update the Repository + +commit 74b278b27b571bff6ddfdca295062f44ee6dcd0e +Merge: af1c4b6 81f30fa +Author: Xingyu.Wang +Date: Tue Dec 30 11:17:42 2014 +0800 + + Merge pull request #2163 from ZTinoZ/master + + Finish the translation by ZTinoZ + +commit af1c4b6b29ec0f87d747408546f3c34982a4e31b +Merge: 94fa3a1 6128f69 +Author: Xingyu.Wang +Date: Tue Dec 30 11:14:42 2014 +0800 + + Merge pull request #2162 from mtunique/patch-2 + + 【翻译中】5 User Space Debugging Tools in Linux + +commit 81f30fa2cabfe5cfa8b41d257538bba1f9657970 +Author: ZTinoZ +Date: Tue Dec 30 11:01:10 2014 +0800 + + Finish the translation by ZTinoZ + +commit cea15280546af2d1f5a47c33af6d775bb2bac6d2 +Merge: bf26401 94fa3a1 +Author: Tao Meng +Date: Tue Dec 30 10:57:00 2014 +0800 + + Merge pull request #1 from LCTT/master + + update + +commit 6128f6946fd72e0960a9145a972bc47b8f9ba602 +Author: Tao Meng +Date: Tue Dec 30 10:49:45 2014 +0800 + + 【翻译中】5 User Space Debugging Tools in Linux + + 【翻译中】5 User Space Debugging Tools in Linux + +commit 94fa3a1be59451035da2d1acf84844b2a89de3c6 +Merge: de39e53 b3d9bb7 +Author: joeren +Date: Tue Dec 30 10:18:00 2014 +0800 + + Merge pull request #2161 from GOLinux/master + + [Translated] 20141229 How to Create Btrfs Filesystem in Linux and its Features.md + +commit b3d9bb7ff393570fc9762f505134cd6dc983f309 +Author: GOLinux +Date: Tue Dec 30 10:16:14 2014 +0800 + + [Translated] 20141229 How to Create Btrfs Filesystem in Linux and its Features.md + +commit de39e5312bbc0b73e1367aae5d7cb99c0c70f763 +Merge: ab2f5a9 a183dfa +Author: joeren +Date: Tue Dec 30 09:07:32 2014 +0800 + + Merge pull request #2160 from GOLinux/master + + [Translating]20141229 How to Create Btrfs Filesystem in Linux and its Features.md + +commit a183dfaec77312c8a3f0baadc7077e068a439bed +Author: joeren +Date: Tue Dec 30 09:07:00 2014 +0800 + + Update 20141229 How to Create Btrfs Filesystem in Linux and its Features.md + +commit d6aa783d443a35125c9278bc93baabae9a8e3a82 +Merge: ddd7606 ab2f5a9 +Author: joeren +Date: Tue Dec 30 09:04:56 2014 +0800 + + Merge pull request #19 from LCTT/master + + Update Repository + +commit ab2f5a9d58613bf63651cd52b6873598f22e3d5b +Author: wxy +Date: Mon Dec 29 22:33:00 2014 +0800 + + PUB:20141219 Attic--Deduplicating backup program + + @GOLinux + +commit 79880065e17ad1248a7f97de8833404eb42f175c +Author: wxy +Date: Mon Dec 29 22:24:42 2014 +0800 + + PUB:20141211 Was 2014 The Year of Linux Desktop + + @ZTinoZ + +commit c1cb502768f3fd3944809571b7d7522c0a34a470 +Author: wxy +Date: Mon Dec 29 22:16:17 2014 +0800 + + PUB:20140818 Will Linux ever be able to give consumers what they want + + @zpl1025 + +commit c97974d2a66eaa8ff487b50c7efb2a00e70a0987 +Author: wxy +Date: Mon Dec 29 22:08:11 2014 +0800 + + PUB:20141224 Linux FAQs with Answers--How to install non-free packages on Debian + + @mtunique 翻译的不错！ + +commit ae8643533bbac80f49d9f4543877f602180fa2c0 +Merge: c175bbf cc87adf +Author: geekpi +Date: Mon Dec 29 21:43:34 2014 +0800 + + Merge pull request #2159 from geekpi/master + + translated + +commit cc87adfebb04b01a06df2dbf39fa1c073005a68d +Author: zhengsihua +Date: Mon Dec 29 21:41:24 2014 +0800 + + translated + +commit c175bbf0d37c2fc38ccf865894a8325be94e1235 +Author: wxy +Date: Mon Dec 29 21:37:22 2014 +0800 + + PUB:20141008 How To Use Steam Music Player on Ubuntu Desktop + + @H-mudcup 翻译的不错~加油~ + +commit 3ff9ad2ebc41360bd34892e73db4bec6e07aee09 +Author: wxy +Date: Mon Dec 29 21:24:41 2014 +0800 + + PUB:20141219 The 'grinch' isn't a Linux vulnerability, Red Hat says + + @yupmoon 翻译的不错，我一字未易。 + +commit de1dee6f001eec52984b944f764474d6300a9a63 +Merge: 56bad99 8556494 +Author: geekpi +Date: Mon Dec 29 21:01:03 2014 +0800 + + Merge pull request #2158 from geekpi/master + + translating + +commit 8556494c08c8087450e152ffafe77960b6925109 +Author: zhengsihua +Date: Mon Dec 29 20:44:38 2014 +0800 + + translating + +commit 932c6512f6cdda6b8be86214b4399c2bdac0f120 +Author: ZTinoZ +Date: Mon Dec 29 18:14:40 2014 +0800 + + Translating by ZTinoZ + +commit 56bad99e5415123255791fcaecbc94574d53f981 +Author: DeadFire +Date: Mon Dec 29 15:27:10 2014 +0800 + + 20141229-1 选题 + +commit ddd760648cd26206e9c23503526054464432c5c2 +Merge: 6213d88 bf911bd +Author: joeren +Date: Mon Dec 29 09:13:59 2014 +0800 + + Merge pull request #18 from LCTT/master + + Update Repository + +commit 3923955df081bd2e934fff3a71f275f093473eaf +Merge: 8b08356 bf911bd +Author: H-mudcup +Date: Mon Dec 29 08:07:38 2014 +0800 + + Merge pull request #2 from LCTT/master + + 更新2014年12月29日 + +commit bf911bde6cff67b9d626c74911f781c833d38eb5 +Merge: b5ef4a3 bf26401 +Author: Xingyu.Wang +Date: Sun Dec 28 22:54:25 2014 +0800 + + Merge pull request #2155 from mtunique/master + + 【翻译中】20141224 Linux FAQs with Answers--How to install non-free packages on Debian + +commit b5ef4a3d2148495af4821926f2ec869792cf0596 +Merge: 6d421e2 8b08356 +Author: Xingyu.Wang +Date: Sun Dec 28 22:53:17 2014 +0800 + + Merge pull request #2154 from H-mudcup/master + + Translated 20141008 How To Use Steam Music Player on Ubuntu Desktop.md + 没事，原文本来也是要删除的。恭喜你完成了第一篇翻译！我会马上发布~ + +commit 71ef31dc95fa3b531f7fd2a6d81add97ff9f27b5 +Author: ZTinoZ +Date: Sun Dec 28 20:51:48 2014 +0800 + + Translating by ZTinoZ + +commit 6d421e21ca5e1545bbf86f493867c46edc9eb148 +Merge: 6472c49 e587300 +Author: geekpi +Date: Sun Dec 28 18:40:35 2014 +0800 + + Merge pull request #2157 from geekpi/master + + translated + +commit e587300c7caa8bb4a0b5a506e8031cd4c6cb7760 +Author: zhengsihua +Date: Sun Dec 28 18:39:29 2014 +0800 + + translated + +commit 6472c49a12e672ccab370842fc97812e8a6eacb7 +Merge: 268dc0e e5402df +Author: geekpi +Date: Sun Dec 28 17:49:17 2014 +0800 + + Merge pull request #2156 from geekpi/master + + translating + +commit e5402df860eaffc1e2f8029608853e39eddfe855 +Author: zhengsihua +Date: Sun Dec 28 17:47:19 2014 +0800 + + translating + +commit bf26401b0e5c9dea193697a5c777b445fabbb16c +Author: mtunique +Date: Sun Dec 28 15:41:12 2014 +0800 + + 【翻译完成】20141224 Linux FAQs with Answers--How to install non-free packages on Debian + +commit 86489418630ff0192d1287ac8270331aac63e5f2 +Author: mtunique +Date: Sun Dec 28 14:25:11 2014 +0800 + + Translating by mtunique + +commit 8b083563a9861cff2ce34283992afd18f647f360 +Author: H-mudcup +Date: Sun Dec 28 12:54:47 2014 +0800 + + Create 20141008 How To Use Steam Music Player on Ubuntu Desktop.md + +commit 71cff408b174ef03c50ce9537a8053095cb30903 +Author: H-mudcup +Date: Sun Dec 28 12:50:54 2014 +0800 + + Delete 20141008 How To Use Steam Music Player on Ubuntu Desktop.md + +commit e8d26c2bdfcfa5cec796325cc21658306433db6a +Author: H-mudcup +Date: Sun Dec 28 12:26:48 2014 +0800 + + Update 20141008 How To Use Steam Music Player on Ubuntu Desktop.md + +commit 268dc0eadd15d7594a7705304b872c1a067f95a1 +Merge: 77a96b8 4782651 +Author: runningwater +Date: Sat Dec 27 23:00:08 2014 +0800 + + Merge pull request #2153 from runningwater/master + + 翻译中 by runningwater + +commit 4782651a2d3510a32a338e98e3c8853c5515c776 +Author: runningwater +Date: Sat Dec 27 22:54:25 2014 +0800 + + 翻译中 by runningwater + +commit 77a96b8be04015a26d64081c1ee25fb7ad77d602 +Merge: 2eef77c 34eb334 +Author: runningwater +Date: Sat Dec 27 22:23:15 2014 +0800 + + Merge pull request #2152 from runningwater/master + + 翻译完成 + +commit 34eb334cb73079690da6d50c3e5f33aeb793f29b +Author: runningwater +Date: Sat Dec 27 22:18:21 2014 +0800 + + 翻译完成 + +commit 2eef77cedb7d037905b0baf298028f481dc49e66 +Merge: 8893327 e4d68ad +Author: geekpi +Date: Sat Dec 27 12:01:26 2014 +0800 + + Merge pull request #2151 from geekpi/master + + translated + +commit e4d68ad946aa6681705e0876fa3ea3b5fbd427e7 +Author: zhengsihua +Date: Sat Dec 27 11:58:41 2014 +0800 + + translated + +commit 62de838381f98bf53dd8cf19a339f4b463f3d2eb +Author: zhengsihua +Date: Sat Dec 27 11:14:34 2014 +0800 + + translating + +commit 88933273fa784867fce3310f1703b8b1a14c509d +Merge: 28a0950 bbe861a +Author: geekpi +Date: Fri Dec 26 21:29:26 2014 +0800 + + Merge pull request #2150 from geekpi/master + + translated + +commit bbe861a9c8de30cacdfad16046c92bb4403e3b41 +Author: zhengsihua +Date: Fri Dec 26 21:27:07 2014 +0800 + + translated + +commit 28a0950f812670bda7fd7aa9c6a03ef226a30b24 +Merge: e079c94 de67c15 +Author: geekpi +Date: Fri Dec 26 20:36:10 2014 +0800 + + Merge pull request #2149 from geekpi/master + + translating + +commit de67c15c07237fc464939ee35a6f543de530a09a +Author: zhengsihua +Date: Fri Dec 26 20:32:32 2014 +0800 + + translating + +commit bdc7f0da338fdf3201d90a86286130b13a682a67 +Merge: 2955a22 e079c94 +Author: H-mudcup +Date: Fri Dec 26 18:21:55 2014 +0800 + + Merge pull request #1 from LCTT/master + + 更新2014年12月26日 + +commit e079c94dcbba39bb1747803b4984a9a5dde2ac76 +Author: DeadFire +Date: Fri Dec 26 16:51:06 2014 +0800 + + 20141226-2 选题 + +commit 4ca1c3dc87ea51e77702afc126b2be2bac3869d5 +Author: ZTinoZ +Date: Fri Dec 26 15:56:59 2014 +0800 + + Translating by ZTinoZ + +commit a6eca5d1cd2c3edce28c9a02f0eb9457071495d6 +Author: DeadFire +Date: Fri Dec 26 14:52:02 2014 +0800 + + 20141226-1 选题 + +commit 90e28a3b7cbdf9cd018980c8864b13cdcb739a68 +Merge: beb172b 9ac2839 +Author: Xingyu.Wang +Date: Fri Dec 26 14:26:59 2014 +0800 + + Merge pull request #2147 from disylee/master + + Translated by disylee + +commit beb172b1d17386bd1e2e5ffd443b44575c166e08 +Merge: 2196b81 6a389b5 +Author: Xingyu.Wang +Date: Fri Dec 26 14:26:17 2014 +0800 + + Merge pull request #2146 from H-mudcup/patch-1 + + Update 20141008 How To Use Steam Music Player on Ubuntu Desktop.md + +commit 2196b810b6b14e0593ebc034eab217bd621801ce +Merge: 9d73eb5 005ce23 +Author: Xingyu.Wang +Date: Fri Dec 26 14:26:03 2014 +0800 + + Merge pull request #2145 from Vic020/patch-24 + + Update 20141224 Linux FAQs with Answers--How to install Kingsoft Office ... + +commit 9d73eb5a0ee79cba76aeab065d8665d97196bdc8 +Merge: 2955a22 6213d88 +Author: joeren +Date: Fri Dec 26 10:29:52 2014 +0800 + + Merge pull request #2148 from GOLinux/master + + [Translated] 20141223 Setting up a 'PXE Network Boot Server' for Multiple Linux Distribution Installations in RHEL or CentOS 7.md + +commit 6213d88fe8b83fcc288f09337e6ded15af600662 +Merge: dfa5842 2955a22 +Author: joeren +Date: Fri Dec 26 10:28:45 2014 +0800 + + Merge pull request #17 from LCTT/master + + Update Repository + +commit dfa5842c74e41919c0894b37f767479103c3d50b +Author: GOLinux +Date: Fri Dec 26 10:25:20 2014 +0800 + + [Translated] 20141223 Setting up a 'PXE Network Boot Server' for Multiple Linux Distribution Installations in RHEL or CentOS 7.md + +commit 9ac2839a5250dae875f7276063ccc45ddc81d0a0 +Author: disylee +Date: Fri Dec 26 02:04:23 2014 +0800 + + Translated by disylee + +commit 6a389b5471a7a793bfd5699b98e7f650ed40379d +Author: H-mudcup +Date: Thu Dec 25 23:09:29 2014 +0800 + + Update 20141008 How To Use Steam Music Player on Ubuntu Desktop.md + + Translating by H-mudcup + +commit 2955a222bb9aba254a11ba57bd2e3fbd385e7422 +Author: wxy +Date: Thu Dec 25 21:54:09 2014 +0800 + + 晋升 runningwater 为 core + +commit b1ffe063d1accf4df1152a67ae529f73f4bfb297 +Author: wxy +Date: Thu Dec 25 21:53:41 2014 +0800 + + PUB:20141119 10 SCP Commands to Transfer Files or Folders in Linux + + @ZTinoZ + +commit 005ce238f59ef692fcad41a92eed18ae9674e6bd +Author: Vic___ +Date: Thu Dec 25 21:13:35 2014 +0800 + + Update 20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md + +commit 4d1008437a1d6f612a875f259fa934686b345c7e +Author: ZTinoZ +Date: Thu Dec 25 17:55:07 2014 +0800 + + Translating by ZTinoZ + +commit e6966181f74065b07f0a221c6fb62aa434301ab9 +Author: wxy +Date: Thu Dec 25 11:06:18 2014 +0800 + + PUB:20141118 Linux FAQs with Answers--How to install phpMyAdmin on CentOS + + @ZTinoZ + +commit e20bf8816c3d190c4f34f4a91a2fdfe2736376b5 +Author: wxy +Date: Thu Dec 25 10:47:21 2014 +0800 + + PUB:20140915 Make Downloading Files Effortless + + @zpl1025 + +commit 16622478f52e8c3712b2f6f47980eec2cdc797d5 +Merge: ba0faf4 ddde7ce +Author: Xingyu.Wang +Date: Thu Dec 25 13:02:24 2014 +0800 + + Merge pull request #2144 from ZTinoZ/master + + Translating by ZTinoZ + +commit ddde7ce69dfba1cc974e7efb2287de604b386d3d +Author: ZTinoZ +Date: Thu Dec 25 12:04:23 2014 +0800 + + Translating by ZTinoZ + +commit 7720875b8dca1ffbfd8f70a497947b55a87709ce +Merge: 8527820 ba0faf4 +Author: ZTinoZ +Date: Thu Dec 25 11:35:17 2014 +0800 + + Merge pull request #3 from LCTT/master + + Update the Repositories + +commit ba0faf47d88accd9ebd96419715611de538e8f94 +Merge: 6b448d8 8527820 +Author: Xingyu.Wang +Date: Thu Dec 25 11:06:45 2014 +0800 + + Merge pull request #2143 from ZTinoZ/master + + Finish the translation by ZTinoZ + +commit 852782056e92d0a160ef1e00639f659f2767ab86 +Author: ZTinoZ +Date: Thu Dec 25 10:57:59 2014 +0800 + + Finish the translation by ZTinoZ + +commit 6b448d82636cb660bd3dc13f1912340c2700fe92 +Author: wxy +Date: Thu Dec 25 10:22:53 2014 +0800 + + PUB:20140910 Why Do Some Old Programming Languages Never Die + + @runningwater + +commit 7ff13e77dc81bd2cc69c2bcb3e69dae8fc1965a4 +Merge: 0ec62b6 e7864a8 +Author: joeren +Date: Thu Dec 25 08:39:26 2014 +0800 + + Merge pull request #2142 from GOLinux/master + + [Translated] 20141222 A Great Tool To Show Linux Command Progress Like ETA.md + +commit e7864a8716c6086e3d891f29c333bc0619707299 +Author: GOLinux +Date: Thu Dec 25 08:36:29 2014 +0800 + + [Translated] 20141222 A Great Tool To Show Linux Command Progress Like ETA.md + +commit 3893ee8c5f6f41c3c37a25193833367701ae1374 +Author: ZTinoZ +Date: Wed Dec 24 17:58:37 2014 +0800 + + Translating by ZTinoZ + +commit 0ec62b6055241db57f18a2aee95bd9d99812321c +Author: DeadFire +Date: Wed Dec 24 16:52:39 2014 +0800 + + 20141224-1 选题 + +commit b27de43b7456e86f7565de8ceca8f1ed26401ce0 +Merge: 3f605ee 514c1dc +Author: joeren +Date: Wed Dec 24 16:19:54 2014 +0800 + + Merge pull request #2141 from GOLinux/master + + [Translating]20141223 Setting up a 'PXE Network Boot Server' for Multiple Linux Distribution Installations in RHEL or CentOS 7.md + +commit 514c1dcc67f146a32680dbc7547f7297ba8dc10a +Author: joeren +Date: Wed Dec 24 16:19:16 2014 +0800 + + Update 20141223 Setting up a 'PXE Network Boot Server' for Multiple Linux Distribution Installations in RHEL or CentOS 7.md + +commit 3f605ee665c2703b98c0a850b1ebf86896ab63f7 +Merge: 9f8ddd2 0d14c15 +Author: joeren +Date: Wed Dec 24 16:17:07 2014 +0800 + + Merge pull request #2140 from GOLinux/master + + [Translating]20141222 A Great Tool To Show Linux Command Progress Like ETA.md + +commit 0d14c152732feac36b06dc77d72063555fa285b4 +Author: joeren +Date: Wed Dec 24 16:16:07 2014 +0800 + + Update 20141222 A Great Tool To Show Linux Command Progress Like ETA.md + +commit 9f8ddd2df48cae5683e21eaac78ea2011b26ce84 +Merge: 7631797 32f484e +Author: joeren +Date: Wed Dec 24 10:12:11 2014 +0800 + + Merge pull request #2139 from GOLinux/master + + [Translated] 20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md + +commit 32f484e215636f830df94750ef81d3e1b41c94e1 +Author: GOLinux +Date: Wed Dec 24 10:09:36 2014 +0800 + + [Translated] 20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md + +commit 7631797c0ef70c693b65f1b676fbbed8ce674c87 +Merge: 9afa538 e08247d +Author: joeren +Date: Wed Dec 24 08:33:28 2014 +0800 + + Merge pull request #2138 from GOLinux/master + + [Translating]20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md + +commit e08247d21a4e070836ed5b184bb510c20971f0b4 +Author: joeren +Date: Wed Dec 24 08:32:53 2014 +0800 + + Update 20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md + +commit a68b42975bf1901e6a57acd737ce9ac0b61f5ea1 +Merge: 1bb3f96 9afa538 +Author: joeren +Date: Wed Dec 24 08:32:05 2014 +0800 + + Merge pull request #16 from LCTT/master + + Update Repository + +commit 9afa5387f3d89c4e8bfd7a1987b012bd08fcc2dc +Author: DeadFire +Date: Tue Dec 23 16:47:50 2014 +0800 + + 20141223-3 选题 + +commit 059350f824e7fb0e6292b60e84cccdc84e05591e +Author: DeadFire +Date: Tue Dec 23 16:42:23 2014 +0800 + + 20141223-2 选题 + +commit dcad76a0f9e4b0ce71fe58ef7df00aad5bc62086 +Author: DeadFire +Date: Tue Dec 23 13:39:39 2014 +0800 + + 20141223-1 选题 + +commit 1bb3f967b17c0650d30ce61c1f3b87cc0a382a6d +Merge: ff344ec 683c969 +Author: joeren +Date: Tue Dec 23 13:09:02 2014 +0800 + + Merge pull request #15 from LCTT/master + + Update Repository + +commit 683c96900a25b5c12a34a519592dc0b7b5f00e27 +Merge: 614911f b7fb010 +Author: joeren +Date: Tue Dec 23 13:07:50 2014 +0800 + + Merge pull request #2137 from yupmoon/master + + tranlated + +commit a1a057e40fa1545e7d17dc88782c6e2a0c35dd2c +Author: ZTinoZ +Date: Tue Dec 23 00:03:00 2014 +0800 + + Translating by ZTinoZ + +commit b7fb0102844a8ae8e0fa74e8c7fe19cc99fcbe60 +Author: yupmoon +Date: Mon Dec 22 22:19:48 2014 +0800 + + tranlated + +commit 614911fde4e657f699718ba833a805d9c4fc483c +Author: wxy +Date: Mon Dec 22 21:37:51 2014 +0800 + + PUB:20141112 Intro to Systemd Runlevels and Service Management Commands + + @coloka + +commit 2cb3b0820d66168585297d70367d2f9926ad6794 +Author: wxy +Date: Mon Dec 22 21:12:49 2014 +0800 + + PUB:20141030 rsync Command to Exclude a List of Files and Directories in Linux + + @GOLinux + +commit 262a2df7b592a12177d8c3d38df45ec3b9ef145f +Author: wxy +Date: Mon Dec 22 21:06:35 2014 +0800 + + PUB:20141222 How to use Rsync Command In Linux With Examples + + @geekpi + +commit 1fc675e6b9e9a15f08436625946b09e701d1b3e2 +Merge: e3782e8 0d692e2 +Author: geekpi +Date: Mon Dec 22 20:51:47 2014 +0800 + + Merge pull request #2136 from geekpi/master + + translated + +commit 0d692e270385c6d8f8753a7a3b1b99b5ccef3e8b +Author: zhengsihua +Date: Mon Dec 22 20:48:39 2014 +0800 + + translated + +commit e3782e8f1f4d0b827d64936741c86fe33d6ea254 +Merge: 5bbf79d 53214ad +Author: geekpi +Date: Mon Dec 22 20:28:32 2014 +0800 + + Merge pull request #2135 from geekpi/master + + translating + +commit 53214ad958cdcacb61c3033faa78fc8d847b9d4d +Author: geekpi +Date: Mon Dec 22 07:27:32 2014 -0500 + + translating + +commit 5bbf79dc8c239aa90ca9c075105846b7c84e83e5 +Merge: c481ea2 4d6a428 +Author: Xingyu.Wang +Date: Mon Dec 22 20:16:51 2014 +0800 + + Merge pull request #2134 from yupmoon/master + + ###yupmoon translating### + +commit c481ea218042ad9fabb3d2bbfbd34391a8f25640 +Author: DeadFire +Date: Mon Dec 22 16:36:34 2014 +0800 + + 20141222-3 选题 + +commit 17669ee7a2a2997542965381937c9834f3584381 +Author: DeadFire +Date: Mon Dec 22 15:37:01 2014 +0800 + + 20141222-2 选题 + +commit 44d2576118470007af3df3aa30d1919817c0a74a +Author: DeadFire +Date: Mon Dec 22 14:26:16 2014 +0800 + + 20141222-1 选题 + +commit 4d6a4286880baa269053e49a40af9f6e8b150bf6 +Author: yupmoon +Date: Mon Dec 22 11:17:54 2014 +0800 + + ###yupmoon translating### + +commit 4813316cb3955e346e518027357d8db850d2f95d +Merge: e6ffb9c ff344ec +Author: joeren +Date: Mon Dec 22 10:23:14 2014 +0800 + + Merge pull request #2133 from GOLinux/master + + [Translated] 20141219 Attic--Deduplicating backup program.md + +commit ff344ec2202e80b2846748f840b960b525a67477 +Author: GOLinux +Date: Mon Dec 22 10:19:50 2014 +0800 + + [Translated] 20141219 Attic--Deduplicating backup program.md + +commit e6ffb9c85e388e730846c543d60e1210591f860d +Merge: 78ab7ce 2f4a7a1 +Author: joeren +Date: Mon Dec 22 09:26:14 2014 +0800 + + Merge pull request #2132 from GOLinux/master + + [Translating] 20141219 Attic--Deduplicating backup program.md + +commit 2f4a7a1f067851615057121acf06b9faf233a8a0 +Author: joeren +Date: Mon Dec 22 09:25:44 2014 +0800 + + Update 20141219 Attic--Deduplicating backup program.md + +commit 62faae4910ea47013e7b6736b1968003b3529cc2 +Merge: 4167376 78ab7ce +Author: joeren +Date: Mon Dec 22 09:24:13 2014 +0800 + + Merge pull request #14 from LCTT/master + + Update Repository + +commit 78ab7ce2dc0eb306f7e011c894e908308135db29 +Merge: 9029711 49fbafb +Author: joeren +Date: Mon Dec 22 09:23:35 2014 +0800 + + Merge pull request #2131 from SPccman/master + + How to filter, split or merge pcap files on Linux + +commit 90297119de3e2d3ca5433f2bf2c2dd53ce358470 +Author: wxy +Date: Sun Dec 21 23:19:15 2014 +0800 + + PUB:20141120 Postfix tips and Troubleshooting Commands + + @Vic020 + +commit 937f096a63a741fef0cff615f4a89f315f482e6f +Author: wxy +Date: Sun Dec 21 23:08:07 2014 +0800 + + PUB:20141120 5 Best Open Source Web Browser Security Apps + + @yupmoon + +commit 908ca37521c0797cd3dbe697f5c7c24c6e757f23 +Author: wxy +Date: Sun Dec 21 22:40:07 2014 +0800 + + PUB:20141104 Pitivi 0.94 Uses GTK HeaderBar, Squashes Umpteen Bugs + + @ThomazL + +commit 49fbafbafb84afb7ea4353d2a18f99917d29af27 +Author: DoubleC <450760206@qq.com> +Date: Sun Dec 21 21:33:32 2014 +0800 + + complete + + 翻已完成 + +commit 8eca31ef32807bce5b4a304bcae4c66abf2afb43 +Author: DoubleC <450760206@qq.com> +Date: Sun Dec 21 21:27:11 2014 +0800 + + delete source file + + 删除原文 + +commit 5a0c84097c7cf18a705c465e5ae03e2527e640c7 +Merge: bec12e6 801855b +Author: DoubleC <450760206@qq.com> +Date: Sun Dec 21 21:19:15 2014 +0800 + + Merge pull request #12 from LCTT/master + + update + +commit 801855bc1cd6a63984d942115b6180268f860c59 +Merge: fca7f96 b866001 +Author: geekpi +Date: Sun Dec 21 14:39:31 2014 +0800 + + Merge pull request #2130 from geekpi/master + + translated + +commit b866001dbd018b90e2946fb2f3a514ae33774476 +Author: zhengsihua +Date: Sun Dec 21 14:37:48 2014 +0800 + + translated + +commit fca7f966b0d361bdcc7165c408276a24f821359e +Merge: d551188 5c7518a +Author: geekpi +Date: Sun Dec 21 13:34:50 2014 +0800 + + Merge pull request #2129 from geekpi/master + + translating + +commit 5c7518a24514333aa9674d6f5a183b38880a645e +Author: zhengsihua +Date: Sun Dec 21 13:32:19 2014 +0800 + + translating + +commit d5511888d38be2efbfbed5c5904f045029aab98f +Author: wxy +Date: Sun Dec 21 11:25:13 2014 +0800 + + PUB:20141204 How To Drop Database In Oracle 11 Without Using DBCA + + @Vic020 + +commit 0f1eb122e3f8229e674cc42d6d86d195935d259d +Author: wxy +Date: Sun Dec 21 11:19:10 2014 +0800 + + PUB:20141120 How to visualize memory usage on Linux + + @coloka + +commit 0a5e8200b948e8373cc64881d1e33633726b917b +Author: wxy +Date: Sun Dec 21 11:07:54 2014 +0800 + + PUB:20141127 Some Sentences about Java + + @a598799539 + +commit a741a4ca81d8f6ad6b789e41e056b222ffff3cfc +Author: wxy +Date: Sun Dec 21 10:59:36 2014 +0800 + + PUB:20141021 How to monitor a log file on Linux with logwatch + + @runningwater + +commit 234a0ae94eb2fdf1ab4b26f7220f513074691d19 +Author: wxy +Date: Sun Dec 21 10:31:59 2014 +0800 + + PUB:20141029 Shell Scripting--Checking Conditions with if + + @ThomazL + +commit b3235ccc86fec902dcec99128edf73d379e826f7 +Author: wxy +Date: Sat Dec 20 21:54:46 2014 +0800 + + 清除过期文章，回收过期未完成文章 + + 以下诸位逾期未完成的文章收回： @barney-ro @mdjsjdqe @felixonmars (3篇！) @CHINAANSHE + @forsil + +commit dffdcdb1183accaf119c0f1e1518c0f6cb965bc6 +Author: wxy +Date: Sat Dec 20 21:39:26 2014 +0800 + + 更正格式 + +commit de02f24cfb57be4685b1b91ec1b07d4bf306c594 +Author: wxy +Date: Sat Dec 20 21:39:13 2014 +0800 + + 过期 + + @geekpi 十分抱歉，这篇已经过期较长时间了，不合适发布了。 + +commit a8e6c6ad0f5b8bc191f646e06cf017e6cba1bd88 +Merge: 7d0d098 6f9d4bd +Author: Xingyu.Wang +Date: Sat Dec 20 21:16:38 2014 +0800 + + Merge pull request #2128 from Stevearzh/master + + [translated by Stevearzh]20141211 NetHack.md + +commit 6f9d4bd84a6cb56dcff67c5345a4f522efdb6b7b +Author: Stevearzh +Date: Sat Dec 20 16:41:03 2014 +0800 + + translated by Stevearzh + +commit 7d0d0986794c10c86f0b3a85f948d763d674b0f5 +Merge: f5f0271 0674555 +Author: geekpi +Date: Sat Dec 20 12:44:17 2014 +0800 + + Merge pull request #2127 from geekpi/master + + translated + +commit 0674555003b85b2a52cb3ada1651ad35664d0c14 +Author: zhengsihua +Date: Sat Dec 20 12:43:00 2014 +0800 + + translated + +commit f5f0271abda5e8f0d605d2c7de92a8b6048aa110 +Merge: 858d6fa 85875e9 +Author: geekpi +Date: Sat Dec 20 11:56:00 2014 +0800 + + Merge pull request #2126 from geekpi/master + + translating + +commit 85875e9a38476de3ac755e73eddd231e4edbde61 +Author: zhengsihua +Date: Sat Dec 20 11:55:04 2014 +0800 + + translating + +commit 858d6fa45697b68ca12f84bf9b64d0bba87495c3 +Merge: aa0cd7f 690324d +Author: geekpi +Date: Fri Dec 19 22:47:51 2014 +0800 + + Merge pull request #2125 from geekpi/master + + translated + +commit 690324d4a9f5c52a76c680f018355e675100db8e +Author: zhengsihua +Date: Fri Dec 19 22:40:23 2014 +0800 + + translated + +commit aa0cd7f3f3ee048907d8222ae31536c51c52034f +Author: wxy +Date: Fri Dec 19 00:06:42 2014 +0800 + + PUB:20141024 Amazing 25 Linux Performance Monitoring Tools + + @andyxue + +commit f9bcb73ff1e52a45d04e9638fb32568670de21ca +Author: wxy +Date: Thu Dec 18 22:18:20 2014 +0800 + + PUB:20141013 Migrating LVM Partitions to New Logical Volume (Drive)--Part VI + + @GOLinux + +commit ca0e7cb31b530d525940b4722ee0ff1db516fa3d +Author: geekpi +Date: Fri Dec 19 21:19:33 2014 +0800 + + Update 20141219 Creating your First App on Linux with Python and Flask.md + +commit e760c6d12101932f01eca6efdeed0e15f2052bca +Author: geekpi +Date: Fri Dec 19 21:19:08 2014 +0800 + + Update 20141219 Creating your First App on Linux with Python and Flask.md + +commit b317ee66fac0ab178713efd7149db0b15e822631 +Merge: 08115c8 5ea8db6 +Author: geekpi +Date: Fri Dec 19 20:56:01 2014 +0800 + + Merge pull request #2124 from SPccman/patch-12 + + spccman................ + +commit bd6db6f132fb71e8098d004fcf7ad9459bb684dd +Author: ZTinoZ +Date: Fri Dec 19 17:57:23 2014 +0800 + + Translating by ZTinoZ + +commit 5ea8db6566c1850a460c9daa9545cd115760ffd6 +Author: DoubleC <450760206@qq.com> +Date: Fri Dec 19 17:35:40 2014 +0800 + + spccman................ + + 申领文章 + +commit 08115c855421316e5438b65ff669da2d5e8f0144 +Author: DeadFire +Date: Fri Dec 19 16:08:49 2014 +0800 + + 20141219-6 选题 + +commit 08a34699d6766a95723ba1759bd7fa0cf7d85ca7 +Author: DeadFire +Date: Fri Dec 19 15:10:59 2014 +0800 + + 20141219-5 选题 + +commit 5f9f46f87b62788df0a73a49dcaf2cbd5f485cd5 +Author: DeadFire +Date: Fri Dec 19 11:30:25 2014 +0800 + + 20141219-4 选题 + +commit 6703a353ee83ed56572d3bc8a715be07d2630999 +Author: DeadFire +Date: Fri Dec 19 11:18:34 2014 +0800 + + 20141219-3 选题 + +commit 3460e6ed4fd6e8c2122b17d6050e22e880216945 +Author: DeadFire +Date: Fri Dec 19 10:50:38 2014 +0800 + + 20141219-2 选题 + +commit 69f68536769e9d6b4d4e20a8fdefb33891a4fd65 +Author: DeadFire +Date: Fri Dec 19 10:22:36 2014 +0800 + + 20141219-1 选题 + +commit 4167376769e5c8d5ed17b40d30b2f85c0e3c0612 +Merge: 3b87ab6 16bfd25 +Author: joeren +Date: Fri Dec 19 08:42:20 2014 +0800 + + Merge pull request #13 from LCTT/master + + Update Repository + +commit 16bfd25d308fefb34bb7beb5e6e1e972485e7a6b +Merge: 74d6ae5 274277a +Author: geekpi +Date: Thu Dec 18 22:24:24 2014 +0800 + + Merge pull request #2123 from geekpi/master + + translated + +commit 274277a29fb127cf874ea8b74cf397003ea854aa +Author: zhengsihua +Date: Thu Dec 18 22:18:04 2014 +0800 + + translated + +commit 74d6ae5c9bfcbbbe41aaf07a60a870013a13c711 +Merge: 2c49bae ca2a561 +Author: geekpi +Date: Thu Dec 18 22:17:07 2014 +0800 + + Merge pull request #2122 from geekpi/master + + translating + +commit ca2a561ba171f76e154fffcc7a2beccba02e77c2 +Author: zhengsihua +Date: Thu Dec 18 22:15:06 2014 +0800 + + translating + +commit fc073c3cfc82831a49a6cbde550d5aeff4857f4c +Author: ZTinoZ +Date: Thu Dec 18 20:56:35 2014 +0800 + + Translating by ZTinoZ + +commit 2c49baeed82a4d0199f7cd8570a2110504635c70 +Author: wxy +Date: Thu Dec 18 00:34:55 2014 +0800 + + PUB:20141112 How to Remove Music Players from Ubuntu Sound Menu + + @disylee + +commit 5cacaf750349e67deb475da54c3e8d68048c068d +Author: wxy +Date: Thu Dec 18 00:08:35 2014 +0800 + + PUB:20140818 Why Your Company Needs To Write More Open Source Software + + @barney-ro + +commit 6dff097ea10967752d78ff9c87184cfb6810cd4b +Author: wxy +Date: Wed Dec 17 23:42:19 2014 +0800 + + PUB:05 - The history of Android + + @alim0x + +commit 86dbb67ef725febcf36c3dae16978b7b5643ccc4 +Author: wxy +Date: Wed Dec 17 23:31:40 2014 +0800 + + PUB:20141027 How to encrypt files and directories with eCryptFS on Linux + + @GOLinux + +commit 2f4ad746369b6334f94072008dea3dd07ae76da1 +Author: wxy +Date: Wed Dec 17 23:19:04 2014 +0800 + + PUB:20141021 Configuring layer-two peer-to-peer VPN using n2n + + @GOLinux + +commit 2537751954bd04f3fa4720a893113d9f4d07bd54 +Merge: b721315 a55029a +Author: Xingyu.Wang +Date: Wed Dec 17 22:11:27 2014 +0800 + + Merge pull request #2121 from johnhoow/master + + 翻译完成 + +commit b721315edf7ebc7654082f848422505c447c7c69 +Merge: 53e5d19 45f20f6 +Author: Xingyu.Wang +Date: Wed Dec 17 22:11:10 2014 +0800 + + Merge pull request #2120 from alim0x/master + + [translated]10 - The history of Android.md + +commit 03202e2dfdbe5a3c988a5e96573619e34446539d +Author: ZTinoZ +Date: Wed Dec 17 20:54:13 2014 +0800 + + Translating by ZTinoZ + +commit 53e5d1942d52ff0db67f5c334c5dc07f37090c6b +Author: DeadFire +Date: Wed Dec 17 16:27:13 2014 +0800 + + 20141217-2 选题 + +commit a55029a9f62ccc457bbaf6d6a0fed64ce1ba2ad7 +Author: johnhoow +Date: Wed Dec 17 15:12:20 2014 +0800 + + modify + +commit 36c48afc1d55cd0c604c9f4fe3f13d9095eedf8c +Author: johnhoow +Date: Wed Dec 17 15:10:20 2014 +0800 + + modify + +commit eded5eee9b6c3d8202a8c4812e546c510537bf9b +Author: johnhoow +Date: Wed Dec 17 15:04:57 2014 +0800 + + translated + +commit 45f20f6a52bae3c06c5186c3bd6f3d544eb8a206 +Author: alim0x +Date: Wed Dec 17 13:11:36 2014 +0800 + + [translated]10 - The history of Android.md + +commit 3b87ab6c50e0a9e4c00f022891a99f00f653bb91 +Merge: fda2d2a 24eaa2d +Author: joeren +Date: Wed Dec 17 11:55:11 2014 +0800 + + Merge pull request #12 from LCTT/master + + Update Repository + +commit 24eaa2d4de95e363da5746b72f5db05d7643d8fa +Author: DeadFire +Date: Wed Dec 17 10:57:09 2014 +0800 + + 20141217-1 选题 + +commit 48b58798712c2e2ed4974a2d429e4b2486c2da5b +Merge: f66dd60 eeb84d9 +Author: Xingyu.Wang +Date: Wed Dec 17 10:07:48 2014 +0800 + + Merge pull request #2119 from yupmoon/master + + translating Open source all over the world.md + +commit eeb84d9941ff75f93487f187f64477bc6c0f1e43 +Author: yupmoon +Date: Wed Dec 17 09:55:28 2014 +0800 + + yupmoon translating... + +commit ffd2d2188af2f0b451f538deba5506dd49a701b1 +Merge: 0a65b81 f66dd60 +Author: yupmoon +Date: Wed Dec 17 09:48:38 2014 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit f66dd6081854bd04eb471cff9bb4f86b04bf2fd6 +Author: wxy +Date: Wed Dec 17 00:12:04 2014 +0800 + + PUB:20141017 How to check hard disk health on Linux using smartmontools + + @KayGuoWhu + +commit fd54eb2202aea934efbc05665087ae9394e60c42 +Author: wxy +Date: Tue Dec 16 23:55:43 2014 +0800 + + PUB:20141204 Readers' Choice Awards 2014--Linux Journal + + @yupmoon 翻译的不错！ + +commit 4175ca0b64dbb28ba6f5e93a1f0c94c57a5de29b +Author: wxy +Date: Mon Dec 15 16:29:14 2014 +0800 + + PUB:20141211 Linux Kernel 3.18 Released, This Is What' s New + + @geekpi + +commit f627136220594de83b9c904ab7b2db14aaf4a4cc +Author: wxy +Date: Mon Dec 15 16:18:04 2014 +0800 + + PUB:20141013 Manage Multiple Logical Volume Management Disks using Striping I O--Part V + + @GOLinux + +commit e3e23caf5c1494f2af793919bee6a72f19c0cb2e +Merge: 67339eb bec12e6 +Author: Xingyu.Wang +Date: Tue Dec 16 23:19:36 2014 +0800 + + Merge pull request #2118 from SPccman/master + + How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS & How to create a custom backup plan for Debian with backupninja + +commit 67339eb6dd63394c2a115eb1e8deeb64fc50687a +Merge: d1eb322 ef10044 +Author: Xingyu.Wang +Date: Tue Dec 16 23:18:10 2014 +0800 + + Merge pull request #2117 from yupmoon/master + + choice awards ...translated + +commit d1eb3228fbe143ab7b9947224b37984cedbc9110 +Merge: 103c336 34ea47e +Author: Xingyu.Wang +Date: Tue Dec 16 23:17:00 2014 +0800 + + Merge pull request #2116 from ZTinoZ/master + + Translating by ZTinoZ + +commit bec12e6fcc5a86556e6f36aee65cdff0132f32d4 +Author: DoubleC <450760206@qq.com> +Date: Tue Dec 16 20:01:34 2014 +0800 + + 翻译完成 + +commit 246b2f862eb854f5c93f7b691cab9c73f90b8652 +Author: DoubleC <450760206@qq.com> +Date: Tue Dec 16 20:00:45 2014 +0800 + + 翻译完成 + + 这篇文章，之前应该还有一篇，本来要一起发上来的，群里面催了一下，就算了，这篇先发 + +commit 97fd96a1eff948f3a09b9502b5555dcc0e9c3172 +Author: DoubleC <450760206@qq.com> +Date: Tue Dec 16 19:57:43 2014 +0800 + + delete source file + + 删除原文 + +commit d64adef0e96fc9b0f19e602cfd26fc1d4d58eec9 +Author: DoubleC <450760206@qq.com> +Date: Tue Dec 16 19:57:08 2014 +0800 + + delete source file + +commit 34a4de8535d2eee6da877a96653898b380cc44cc +Merge: 1e95d12 103c336 +Author: DoubleC <450760206@qq.com> +Date: Tue Dec 16 19:47:22 2014 +0800 + + Merge pull request #11 from LCTT/master + + update + +commit 0a65b817548bd4471d0c01eb820199255a21dda9 +Merge: ef10044 103c336 +Author: yupmoon +Date: Tue Dec 16 16:56:25 2014 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit ef10044316b5cc97a62d3ab0d9548165e03c532a +Author: yupmoon +Date: Tue Dec 16 16:52:31 2014 +0800 + + choice awards ...translated + +commit 34ea47e2c974dfa47167b2b815a1d2bf30aae55b +Author: ZTinoZ +Date: Tue Dec 16 09:32:20 2014 +0800 + + Translating by ZTinoZ + +commit 98d969797ea7d09a3355d3e9348494cedf6f8944 +Merge: fb7ea0e 103c336 +Author: ZhouJ-sh <32321321@qq.com> +Date: Tue Dec 16 09:29:53 2014 +0800 + + Merge pull request #1 from LCTT/master + + Merge from base + +commit 0f79c28187de7c512f059d2d89515175fb0b1ee2 +Merge: 174a778 103c336 +Author: ZTinoZ +Date: Tue Dec 16 09:27:57 2014 +0800 + + Merge pull request #2 from LCTT/master + + Update the repositories + +commit 103c336cb4e6994854a97ebbe3729abf92cbea2c +Merge: fc24411 fda2d2a +Author: joeren +Date: Tue Dec 16 08:44:59 2014 +0800 + + Merge pull request #2115 from GOLinux/master + + [Translated] 20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md + +commit fda2d2ad7fd05262b6a4d1a63d7c54842bf6dd10 +Author: GOLinux +Date: Tue Dec 16 08:42:14 2014 +0800 + + [Translated] 20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md + +commit fc2441129ac13bc6b929a10fdd2155910a94b680 +Merge: b435d45 d9ae8c1 +Author: joeren +Date: Tue Dec 16 08:14:55 2014 +0800 + + Merge pull request #2114 from GOLinux/master + + [Translating] 20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md + +commit d9ae8c1739e941fd0ffa83fa136ab3e3d50ff7f5 +Author: joeren +Date: Tue Dec 16 08:14:24 2014 +0800 + + Update 20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md + +commit 9490898a5e8430ad11dca7d7307fcf52e9345199 +Merge: 8d9777a b435d45 +Author: joeren +Date: Tue Dec 16 08:13:17 2014 +0800 + + Merge pull request #11 from LCTT/master + + Update Repository + +commit b435d45abcc48326659ca53d3be3b2fe5b499412 +Merge: 5f03ba9 174a778 +Author: joeren +Date: Tue Dec 16 08:12:45 2014 +0800 + + Merge pull request #2113 from ZTinoZ/master + + Finish the translation by ZTinoZ + +commit 174a778200dd9ddd22e964ad016096f054fde705 +Author: ZTinoZ +Date: Mon Dec 15 20:50:20 2014 +0800 + + Finish the translation by ZTinoZ + +commit 8d9777a37eedabb0a6afd46125fffb3fd1f63a88 +Merge: 193c789 5f03ba9 +Author: joeren +Date: Mon Dec 15 09:43:08 2014 +0800 + + Merge pull request #10 from LCTT/master + + Update Repository + +commit 5f03ba9eaaef6c51b42cb22cd72f606709c6bf80 +Author: wxy +Date: Sun Dec 14 19:24:23 2014 +0800 + + PUB:20141009 How to set up RAID 10 for high performance and fault tolerant disk I or O on Linux + + @KayGuoWhu + +commit 50ea541534d677c0c0508b99d80b68fc3227a216 +Merge: 45b2034 553b97a +Author: geekpi +Date: Sun Dec 14 14:24:29 2014 +0800 + + Merge pull request #2112 from geekpi/master + + [Translated] What is a good free control panel for VPS.md + +commit 553b97ac39432d37ddf721607d6a2d726df4e61b +Author: zhengsihua +Date: Sun Dec 14 14:18:08 2014 +0800 + + [Translated] What is a good free control panel for VPS.md + +commit 45b203456d03ddba9c22de083139cd0176d253ac +Merge: 9d595b9 3de7f54 +Author: geekpi +Date: Sun Dec 14 13:16:43 2014 +0800 + + Merge pull request #2111 from geekpi/master + + [Translating] What is a good free control panel for VPS.md + +commit 3de7f543e2d4f3284e16fae6f137956811648be2 +Author: zhengsihua +Date: Sun Dec 14 13:15:40 2014 +0800 + + [Translating] What is a good free control panel for VPS.md + +commit 9d595b919ce63edaf0cb51fcefe5e1211ce1a6a2 +Merge: 961a502 3179279 +Author: geekpi +Date: Sun Dec 14 13:07:42 2014 +0800 + + Merge pull request #2110 from runningwater/master + + 【翻译中 by runningwater】 20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X + +commit 317927958edbe926639647895d400240254ded0b +Author: runningwater +Date: Sat Dec 13 20:02:23 2014 +0800 + + 翻译中 by runningwater + +commit 961a502a4aeac47bf71b8b00bb9b2e7e4431e0de +Merge: 2522c4a 7aeeb75 +Author: geekpi +Date: Sat Dec 13 13:02:49 2014 +0800 + + Merge pull request #2109 from geekpi/master + + [Translated] How to use Evernote from the command line on Linux.md + +commit 7aeeb75205813f2e8739ef4c2e0e9662b425aa94 +Author: zhengsihua +Date: Sat Dec 13 13:01:07 2014 +0800 + + [Translated] How to use Evernote from the command line on Linux.md + +commit 2522c4af102f69d5a9afd75321c83d9145f03d49 +Merge: 47f3bba 473785a +Author: geekpi +Date: Sat Dec 13 12:10:37 2014 +0800 + + Merge pull request #2108 from geekpi/master + + [Translating] How to use Evernote from the command line on Linux + +commit 473785ad1920b82d97a2716dea5287dc72962991 +Author: zhengsihua +Date: Sat Dec 13 12:01:57 2014 +0800 + + [Translating] How to use Evernote from the command line on Linux + +commit 47f3bba0d769d3217a5cd47f6f5c996668d66182 +Merge: 881d47a 434de3b +Author: Xingyu.Wang +Date: Sat Dec 13 01:27:13 2014 +0800 + + Merge pull request #2107 from geekpi/master + + [Translated] Linux Kernel 3.18 Released, This Is What’s New + +commit 434de3b52a29302875c41912bf7487baaadb2dc5 +Author: zhengsihua +Date: Fri Dec 12 22:12:44 2014 +0800 + + [Translated] Linux Kernel 3.18 Released, This Is What’s New + +commit 881d47afdb1fb4669c3913593ab5981777425136 +Merge: d902163 b875372 +Author: geekpi +Date: Fri Dec 12 21:38:05 2014 +0800 + + Merge pull request #2106 from geekpi/master + + [Translating] Linux Kernel 3.18 Released, This Is What’s New + +commit b875372fe0c1dcb282883738d820f2a69ac06a66 +Author: zhengsihua +Date: Fri Dec 12 21:18:12 2014 +0800 + + [Translating] Linux Kernel 3.18 Released, This Is What’s New + +commit 3a033231a90ce6d076a1b80a0d3657aa0aa76cbb +Author: ideas4u +Date: Fri Dec 12 16:21:39 2014 +0800 + + Create 20141211 How to use matplotlib for scientific plotting on Linux + +commit d902163264553da73b36788bc7d405974e0f065c +Author: carolinewuyan <309866211@qq.com> +Date: Fri Dec 12 11:03:58 2014 +0800 + + 已发布 + +commit 489d3b5224247f8373ae4beffaf02bb8e12d007d +Author: carolinewuyan <309866211@qq.com> +Date: Fri Dec 12 11:01:08 2014 +0800 + + 已校对 + +commit 193c78927bb15e7a16771961f3d7dfae6eb1db79 +Merge: 99bb0fc 48dd231 +Author: joeren +Date: Fri Dec 12 10:27:18 2014 +0800 + + Merge pull request #9 from LCTT/master + + Update Repository + +commit 48dd231c3d68b0a7de27ab2b15e9356210339550 +Merge: 46ac8d6 99bb0fc +Author: joeren +Date: Fri Dec 12 10:25:56 2014 +0800 + + Merge pull request #2100 from GOLinux/master + + Delete duplicated files + +commit 99bb0fc98f8dd0ae540fed760c2cccfbfefa4703 +Author: GOLinux +Date: Fri Dec 12 10:23:21 2014 +0800 + + Delete duplicated files + +commit 46ac8d67cdbfacd5dd4c3c38a4c3071642ceebc7 +Merge: 15a8c87 ddaf9d4 +Author: joeren +Date: Fri Dec 12 10:19:47 2014 +0800 + + Merge pull request #2099 from GOLinux/master + + 两篇重复文章，已有人领，请勿重复申领。 + +commit ddaf9d4c1ee0e5061e0e5a2705c1f1bf5b9f8dc0 +Author: joeren +Date: Fri Dec 12 10:18:37 2014 +0800 + + Update 20141205 How to use matplotlib for scientific plotting on Linux.md + +commit 323481080d169c6d6cec55e01e2f7247300136e1 +Author: joeren +Date: Fri Dec 12 10:17:14 2014 +0800 + + Update 20141211 How to configure a syslog server with rsyslog on Linux.md + +commit af0a365de2f7b61f355595f2dabb03e4473941bd +Merge: 9ff2c39 15a8c87 +Author: joeren +Date: Fri Dec 12 09:58:21 2014 +0800 + + Merge pull request #8 from LCTT/master + + Update Repository + +commit 15a8c875469a8655e5fa697859a62db61d2e845e +Merge: ef92116 c6883a4 +Author: joeren +Date: Fri Dec 12 09:57:48 2014 +0800 + + Merge pull request #2098 from Stevearzh/master + + Translating by Stevearzh + +commit ef921160cbbf66562f5852f571c346ff2c75a990 +Merge: 47eef26 e7c71dd +Author: joeren +Date: Fri Dec 12 09:57:40 2014 +0800 + + Merge pull request #2097 from ideas4u/patch-1 + + Update 20141211 How to use matplotlib for scientific plotting on Linux.m... + +commit c6883a43a02b6614078d33b3573e708b922abdfd +Author: Stevearzh +Date: Thu Dec 11 23:27:34 2014 +0800 + + Translating by Stevearzh + +commit 47eef26efebb6dd56ef94358838b9d3e978ef4ed +Merge: 888b79d f0baa45 +Author: geekpi +Date: Thu Dec 11 21:37:10 2014 +0800 + + Merge pull request #2094 from Vic020/master + + 忘记推送了~ + +commit 888b79d229ea448e532905ffc5608c313dcc196a +Merge: 7dcf341 a8dd5da +Author: geekpi +Date: Thu Dec 11 21:36:27 2014 +0800 + + Merge pull request #2095 from SPccman/patch-10 + + 文章重复 + +commit 7dcf341999e8e94af6ab9f4c342d48b68501c738 +Merge: 3ad2ea5 0bceb3d +Author: geekpi +Date: Thu Dec 11 21:35:56 2014 +0800 + + Merge pull request #2096 from SPccman/patch-11 + + translating + +commit d98dd820a1e7926e289e643df11cb356adcb01d2 +Author: ZTinoZ +Date: Thu Dec 11 21:01:27 2014 +0800 + + Translating by ZTinoZ + +commit 3ad2ea5e505e6cfbba527ebb558461be3acff51e +Author: carolinewuyan <309866211@qq.com> +Date: Thu Dec 11 20:57:06 2014 +0800 + + 已发布 + +commit f17bb612a0be28921313a4a63e9dda67134138fc +Author: carolinewuyan <309866211@qq.com> +Date: Thu Dec 11 20:52:46 2014 +0800 + + 已校对 + +commit e7c71dd8ef8839f6ecea6a0bbdea01023828e06d +Author: ideas4u +Date: Thu Dec 11 17:59:17 2014 +0800 + + Update 20141211 How to use matplotlib for scientific plotting on Linux.md + +commit 762cfef575fb3bb58459145c896ece565b28432b +Author: DeadFire +Date: Thu Dec 11 17:43:58 2014 +0800 + + 20141211-6 选题 + +commit 0bceb3dac69ce61188e0e5c26b59646d0c5fd580 +Author: DoubleC <450760206@qq.com> +Date: Thu Dec 11 17:39:39 2014 +0800 + + translating + + apply artical + +commit a8dd5da95d05adf2c5be221e0d90d8a26274c919 +Author: DoubleC <450760206@qq.com> +Date: Thu Dec 11 17:33:48 2014 +0800 + + 文章重复 + + 文章重复，我之前领了，还没翻完。 + +commit 123fc31871aba93608d7b7e4c98d5cabdb8fdbd5 +Author: DeadFire +Date: Thu Dec 11 17:28:44 2014 +0800 + + 20141211-5 选题 + +commit dd2676ef2beadca89353d654e1261aeaf167b064 +Author: DeadFire +Date: Thu Dec 11 17:14:19 2014 +0800 + + 20141211-4 选题 + +commit 8db52bfc8a70111f084f5d490b5d19cff70fd914 +Author: DeadFire +Date: Thu Dec 11 17:03:50 2014 +0800 + + 20141211-3 选题 + +commit ffafaea7f9a912f16416270c72b7cb664965362e +Author: DeadFire +Date: Thu Dec 11 16:52:08 2014 +0800 + + 20141211-2 选题 + +commit 073e360542163476b08c856c0b5dad2e320ac8b7 +Author: DeadFire +Date: Thu Dec 11 16:45:37 2014 +0800 + + 20141211-1 选题 + +commit f0baa4539e8d9ce0de8f264e003da4a18c45b63b +Author: Vic___ +Date: Thu Dec 11 15:12:51 2014 +0800 + + Moved + +commit d927d84e12f2841d10c6369ca94cfb91f3fcd330 +Author: Vic___ +Date: Thu Dec 11 15:12:16 2014 +0800 + + Translated + +commit 4bd2187c942b3d09458301f2972064ea4b4c7b9f +Merge: 2102c12 9ff2c39 +Author: joeren +Date: Thu Dec 11 09:27:16 2014 +0800 + + Merge pull request #2093 from GOLinux/master + + [Translated] 20141210 How to configure rsyslog client for remote logging on CentOS.md + +commit 9ff2c39e16a4771c89c12d17c45de652aefeb1c8 +Author: GOLinux +Date: Thu Dec 11 09:25:54 2014 +0800 + + [Translated] 20141210 How to configure rsyslog client for remote logging on CentOS.md + +commit 2102c1219cf1679f98b5a03bac9651502426bb82 +Merge: 609ec2d 128de94 +Author: joeren +Date: Thu Dec 11 08:43:52 2014 +0800 + + Merge pull request #2092 from GOLinux/master + + [Translating] 20141210 How to configure rsyslog client for remote logging on CentOS.md + +commit 128de94826ac7b5cd05da48f9ca6708e7bf33515 +Author: joeren +Date: Thu Dec 11 08:43:05 2014 +0800 + + Update 20141210 How to configure rsyslog client for remote logging on CentOS.md + +commit f64b0123db9dd57c718661499ef0093c8ab8b8ef +Merge: 27d61e5 609ec2d +Author: joeren +Date: Thu Dec 11 08:42:23 2014 +0800 + + Merge pull request #7 from LCTT/master + + Update Repository + +commit 609ec2df0faac26a31038574ae04aad31a01e9e5 +Merge: 281fa43 e2dd617 +Author: Xingyu.Wang +Date: Wed Dec 10 21:13:21 2014 +0800 + + Merge pull request #2091 from su-kaiyao/master + + su-kaiyao translated 20141205 10 free Commands to Check Memory Usage in Linux.md + +commit 281fa431422f271d63eb66a212b4f0434d44f127 +Merge: 0c763de 4bf1011 +Author: Xingyu.Wang +Date: Wed Dec 10 21:12:37 2014 +0800 + + Merge pull request #2090 from yupmoon/master + + yupmoon translating 20141204 Readers' Choice Awards 2014--Linux Journal + +commit e2dd61786bc8237e8258434a73882576ffabb903 +Author: su-kaiyao <1250471161@qq.com> +Date: Wed Dec 10 20:50:34 2014 +0800 + + su-kaiyao translated + +commit 4f9077ac9ee9dd7b7d80bbb646170854d55291ca +Author: ZTinoZ +Date: Wed Dec 10 20:07:20 2014 +0800 + + Translating by ZTinoZ + +commit 0c763de017fb1843829ba82a967f9fdbb879bf6e +Author: DeadFire +Date: Wed Dec 10 16:16:48 2014 +0800 + + 20141210-1 选题 + +commit 4bf101114ef54100a1a0e15b6449bbcc022a3bda +Author: yupmoon +Date: Wed Dec 10 11:15:05 2014 +0800 + + yupmoon translating + +commit 5cdb8d3f4e1ada39ab467a39f12271e0fb7d37b2 +Merge: e8816d2 27d61e5 +Author: joeren +Date: Wed Dec 10 10:06:30 2014 +0800 + + Merge pull request #2089 from GOLinux/master + + [Translated] 20141208 Nathive--A libre software image editor.md + +commit 27d61e5795d1ba68c8dfcfab28711c9b414f3f79 +Author: GOLinux +Date: Wed Dec 10 10:03:43 2014 +0800 + + [Translated] Two + +commit e8816d2a067e2aa40fcf04053cbf43385f1c9341 +Merge: de9a981 dc4b334 +Author: joeren +Date: Wed Dec 10 09:08:51 2014 +0800 + + Merge pull request #2088 from GOLinux/master + + [Translating] 20141208 Getting Started With Ubuntu 14.04 (PDF Guide).md + +commit dc4b3340b2f9efeee2a42d9ecc9bfb7458c6cb8c +Author: joeren +Date: Wed Dec 10 09:08:32 2014 +0800 + + Update 20141208 Getting Started With Ubuntu 14.04 (PDF Guide).md + +commit de9a981f8ab7fc3f449b374c34418d49d8f6997b +Merge: b36c5c7 b4133cf +Author: joeren +Date: Wed Dec 10 09:07:51 2014 +0800 + + Merge pull request #2087 from GOLinux/master + + [Translating] 20141208 Nathive--A libre software image editor.md + +commit b4133cfddc22f8e3cb91389a2340432ffca7e98a +Author: joeren +Date: Wed Dec 10 09:07:31 2014 +0800 + + Update 20141208 Nathive--A libre software image editor.md + +commit b36c5c7f68938c148bea8f9b73360939f7c48203 +Merge: 37f3fd2 5389dfc +Author: joeren +Date: Wed Dec 10 09:06:30 2014 +0800 + + Merge pull request #2086 from GOLinux/master + + [Translated] 20141208 Linux FAQs with Answers--How to crop an image from the command line on Linux.md + +commit 5389dfc5aad3a6bb9d0ab00b15145ad818f77f23 +Author: GOLinux +Date: Wed Dec 10 09:04:38 2014 +0800 + + [Translated] 20141208 Linux FAQs with Answers--How to crop an image from the command line on Linux.md + +commit 37f3fd2e711e25ca0774a6b9843f3a322670a1dd +Merge: 0934db2 0559d98 +Author: joeren +Date: Wed Dec 10 08:38:23 2014 +0800 + + Merge pull request #2085 from GOLinux/master + + [Translating] 20141208 Linux FAQs with Answers--How to crop an image from the command line on Linux.md + +commit 0559d9835646fd7e9c41b6c3ad68468428d17487 +Author: joeren +Date: Wed Dec 10 08:37:42 2014 +0800 + + Update 20141208 Linux FAQs with Answers--How to crop an image from the command line on Linux.md + +commit be9a8ac489d7fecd08f4bed91c9b2e6d1ed43c4f +Merge: d099251 0934db2 +Author: joeren +Date: Wed Dec 10 08:36:48 2014 +0800 + + Merge pull request #6 from LCTT/master + + Update Repository + +commit 0934db2eb8543ead4adc215d39e254f84343dc42 +Merge: 723d9b0 c55bac0 +Author: joeren +Date: Wed Dec 10 08:35:43 2014 +0800 + + Merge pull request #2084 from yupmoon/master + + translated + +commit 723d9b0ea1fcde8a9b8a78d1e861e36b3ffdd448 +Merge: 90d94f8 ab0ed58 +Author: joeren +Date: Wed Dec 10 08:35:32 2014 +0800 + + Merge pull request #2083 from Stevearzh/master + + [Translated by Stevearzh]Five Magnificent Linux Music Streaming Clients + +commit c55bac0729ea6db74e7d867275638f2e6351352b +Merge: 48d8eb3 90d94f8 +Author: yupmoon +Date: Tue Dec 9 22:58:00 2014 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit 48d8eb34244fbc3b4cc0ca9e2de720e66eb51775 +Author: yupmoon +Date: Tue Dec 9 22:52:30 2014 +0800 + + translated + +commit 90d94f8b22daac8025ddad2308adae89c258d207 +Merge: fb7ea0e e04ad3b +Author: Xingyu.Wang +Date: Tue Dec 9 22:45:39 2014 +0800 + + Merge pull request #2082 from yupmoon/master + + yupmoon translating + 下回请修改 PR 的标题，带上文件名。 + +commit ab0ed58ba8c9b84023ef0eb508cc5bef3c9263e7 +Author: Stevearzh +Date: Tue Dec 9 22:10:32 2014 +0800 + + Translated by Stevearzh + +commit 521ad3dc3dec085e6b52d893b87b995523c312a8 +Author: Stevearzh +Date: Tue Dec 9 22:07:02 2014 +0800 + + Translated by Stevearzh + +commit e04ad3b1081977c7a32ee10ef949ed620e0df19e +Author: yupmoon +Date: Tue Dec 9 18:07:09 2014 +0800 + + yupmoon translating + +commit 4843057c838360371f90af236009f568b5b0b3a7 +Author: ZTinoZ +Date: Tue Dec 9 12:00:26 2014 +0800 + + Translating by ZTinoZ + +commit d099251ca2c9a3784044e9cd54c8c80ead061592 +Merge: 6e5d25a fb7ea0e +Author: joeren +Date: Tue Dec 9 11:58:55 2014 +0800 + + Merge pull request #5 from LCTT/master + + Update Repository + +commit fb7ea0e8367b7f17758d468c013b53acceb56530 +Merge: 907ab34 aebf340 +Author: Xingyu.Wang +Date: Tue Dec 9 10:04:29 2014 +0800 + + Merge pull request #2081 from coloka/master + + 【translating】How to configure a syslog server with rsyslog on Linux + +commit 907ab34aecda3f52bf0dc63ba9ab517b3928f337 +Author: wxy +Date: Tue Dec 9 00:16:58 2014 +0800 + + PUB:20141004 Practical Lessons in Peer Code Review + + @johnhoow + +commit dcd75324b12cf1a1c3d73ae99463e35f9d4e01b4 +Author: wxy +Date: Mon Dec 8 23:41:49 2014 +0800 + + PUB:20141030 How to run SQL queries against Apache log files on Linux + + @ThomazL + +commit aebf3406d683699672b214e45244a54613b8c577 +Author: coloka +Date: Mon Dec 8 23:13:05 2014 +0800 + + 【translating】How to configure a syslog server with rsyslog on Linux + +commit c12080cf74c4d9d4061497de60adf9ae37e8173c +Merge: 6919ef0 091fef5 +Author: Xingyu.Wang +Date: Mon Dec 8 21:37:41 2014 +0800 + + Merge pull request #2080 from Vic020/patch-23 + + 抢地主 + +commit 091fef52aa3b9da7055c5ccf2e15eb8b49aee6e7 +Author: Vic___ +Date: Mon Dec 8 18:38:06 2014 +0800 + + 抢地主 + +commit 88a89be1346aee4188575b1c9fff28063c5ca8be +Author: ZTinoZ +Date: Mon Dec 8 18:00:37 2014 +0800 + + Translating by ZTinoZ + +commit 6919ef07d64e7be757be0fb49c7e39b10b980770 +Merge: 8af28b6 98c3c32 +Author: Xingyu.Wang +Date: Mon Dec 8 16:22:52 2014 +0800 + + Merge pull request #2079 from su-kaiyao/master + + su-kaiyao translating 20141205 10 free Commands to Check Memory Usage in Linux.md + +commit 8af28b62a8dbc95328cd8bebb0652e3dab0d2bf3 +Merge: 1903cc9 36f58e0 +Author: Xingyu.Wang +Date: Mon Dec 8 16:20:55 2014 +0800 + + Merge pull request #2078 from disylee/patch-1 + + Update 20141203 Docker--Present and Future.md + +commit 1903cc9b554b5726305861934bcb6698e34a7319 +Author: DeadFire +Date: Mon Dec 8 16:19:15 2014 +0800 + + 20141208-3 选题 + +commit 177246828d3701a6d12c014511e6dd716d867df2 +Author: DeadFire +Date: Mon Dec 8 15:59:26 2014 +0800 + + 20141208-2 选题 + +commit 98c3c3272466e00d1bfbc0270253d4ae55803890 +Author: su-kaiyao <1250471161@qq.com> +Date: Mon Dec 8 14:30:03 2014 +0800 + + su-kaiyao translating + +commit 40573bc7c61f4100059f12bb81fda55f993cb148 +Author: DeadFire +Date: Mon Dec 8 11:23:55 2014 +0800 + + 20141208-1 选题 + +commit 36f58e07b0504b077e9d3a5e1f9e8068e4f65719 +Author: disylee +Date: Mon Dec 8 09:46:36 2014 +0800 + + Update 20141203 Docker--Present and Future.md + + by disylee + +commit 2205ebbc7fe5322d963787e03992e2be49f9b620 +Author: wxy +Date: Sun Dec 7 23:40:38 2014 +0800 + + PUB:20141125 Linux FAQs with Answers--How to fix ImportError--No module named scapy.all + + @GOLinux + +commit b6ea28565489965b2e92b233b48c2493f4200f12 +Author: wxy +Date: Sun Dec 7 23:12:29 2014 +0800 + + PUB:20140901 How to use on-screen virtual keyboard on Linux + + @forsil 翻译的不错。就是1、你没在文末写你的译者名称；2、请使用中文标点。 + +commit 6ed2cc9fdb86bfb357873c681462ea8bff035806 +Author: wxy +Date: Sun Dec 7 22:49:02 2014 +0800 + + PUB:20141204 Official Ubuntu 14.10 Utopic Unicorn T-Shirts Now Available to Buy + + @geekpi + +commit 20ccb6b22d9ec90faaaf62034e84222eab39ba81 +Author: wxy +Date: Sun Dec 7 22:34:51 2014 +0800 + + 移动到translated目录 + + @JonathanKang + +commit 00a6c2405e222a55587e420718b0efe314ff7224 +Merge: c34a215 7c27e83 +Author: Xingyu.Wang +Date: Sun Dec 7 22:31:12 2014 +0800 + + Merge pull request #2073 from coloka/master + + 【翻译完成】20141125 Four ways Linux is headed for no-downtime kernel patching.md + +commit c34a215975a8e54c4c6c06bb97f50e6bcbf75cb5 +Merge: a0607ee c8841c0 +Author: Xingyu.Wang +Date: Sun Dec 7 22:28:30 2014 +0800 + + Merge pull request #2072 from JonathanKang/master + + Translated + 忘记挪目录了吧？下次记得哦。 + +commit a0607eeaf892747caffa53ac5abe8bbe366470e7 +Merge: 0c4b458 e69d01e +Author: Xingyu.Wang +Date: Sun Dec 7 22:26:30 2014 +0800 + + Merge pull request #2071 from su-kaiyao/master + + su-kaiyao translated 20141204 How To Run Linux Programs From The Terminal In Background Mode.md + +commit 0c4b458f1a0d96464c28e1727f84bf7746e8461b +Merge: 6704154 9f0f5ca +Author: geekpi +Date: Sun Dec 7 17:45:10 2014 +0800 + + Merge pull request #2077 from geekpi/master + + translated + +commit 9f0f5ca11070cc542619aa74b74f834c5a6d9116 +Author: zhengsihua +Date: Sun Dec 7 17:43:57 2014 +0800 + + translated + +commit 6704154368db5ab5b27a6cdae92d34a6bd0dbf21 +Merge: d3bcd51 938c6fb +Author: geekpi +Date: Sun Dec 7 16:44:53 2014 +0800 + + Merge pull request #2076 from geekpi/master + + translating + +commit 938c6fb3946917506de88e748fc29c39163c9c5e +Author: zhengsihua +Date: Sun Dec 7 16:39:04 2014 +0800 + + translating + +commit c50cd50df5cc22acdeefba2d99df436231a809bb +Merge: d98d2b5 d3bcd51 +Author: zhengsihua +Date: Sun Dec 7 16:37:27 2014 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject + +commit 7c27e836d8a4fdc105d443b5155e59d852ffea02 +Merge: ce00a0c d3bcd51 +Author: coloka +Date: Sun Dec 7 11:19:03 2014 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject.git + +commit ce00a0c10ca71a593d87b8a6831445e7b92cc689 +Author: coloka +Date: Sun Dec 7 11:18:56 2014 +0800 + + 【翻译完成】20141125 Four ways Linux is headed for no-downtime kernel patching + +commit c8841c085193e40ed597c7afda073794d741d9de +Author: Jonathan Kang +Date: Sun Dec 7 10:04:48 2014 +0800 + + Translated + +commit e69d01e26072b178d650290137202300aa250769 +Author: su-kaiyao <1250471161@qq.com> +Date: Sat Dec 6 21:54:40 2014 +0800 + + su-kaiyao translated + +commit d3bcd518930881098af3e5abae645b5f54a24fa3 +Merge: 830e5a5 a5a76e1 +Author: Xingyu.Wang +Date: Sat Dec 6 17:10:48 2014 +0800 + + Merge pull request #2070 from su-kaiyao/master + + su-kaiyao translating 20141204 How To Run Linux Programs From The Terminal In Background Mode.md + +commit 830e5a546bd02b9a10a91845f5d6d6f0b86025ae +Merge: 5edd21d bae30fd +Author: Xingyu.Wang +Date: Sat Dec 6 17:10:16 2014 +0800 + + Merge pull request #2069 from SPccman/patch-9 + + Update 20141205 How to create a custom backup plan for Debian with backu... + +commit 5edd21de1f01fe5ad51c6fd4f54ea55e009bc256 +Merge: 1e7168c d8a14e7 +Author: Xingyu.Wang +Date: Sat Dec 6 17:09:54 2014 +0800 + + Merge pull request #2068 from Vic020/master + + Translated + +commit a5a76e14a91722e40d2b0f5d6cac9f3b5e56237a +Author: su-kaiyao <1250471161@qq.com> +Date: Sat Dec 6 12:50:01 2014 +0800 + + su-kaiyao translating + +commit bae30fddc09374099f4b7069383c93a612c0a4b4 +Author: DoubleC <450760206@qq.com> +Date: Sat Dec 6 10:26:22 2014 +0800 + + Update 20141205 How to create a custom backup plan for Debian with backupninja.md + + 申领文章 + +commit 1e7168c4d96f933be8e59265153307decf0ebd58 +Author: DeadFire +Date: Fri Dec 5 23:41:09 2014 +0800 + + 20141205-4 选题 + +commit d8a14e7733e99d7e58dcabdd735ce0dacdb726bd +Author: Vic___ +Date: Fri Dec 5 23:41:09 2014 +0800 + + moved + +commit 8160d35495568a58f2e3d757ac2ecbb5236374c6 +Author: Vic___ +Date: Fri Dec 5 23:39:50 2014 +0800 + + Translated + +commit d83bf7321b6577d9e5b9bf3e819c071ce0912ffd +Merge: c3983be 0c2eb30 +Author: geekpi +Date: Fri Dec 5 22:58:22 2014 +0800 + + Merge pull request #2067 from geekpi/master + + translated + +commit d98d2b5c2ffb579f4c87312eb71ae7b9bd24700d +Author: zhengsihua +Date: Fri Dec 5 22:57:29 2014 +0800 + + translated + +commit 0c2eb305197a2adeaa7d51313f3af2024b32ec10 +Author: geekpi +Date: Fri Dec 5 09:49:22 2014 -0500 + + translated + +commit c3983be1cd409a4589a204da1d5d5f982d694e08 +Merge: 65df647 f08ce4b +Author: geekpi +Date: Fri Dec 5 22:47:03 2014 +0800 + + Merge pull request #2066 from geekpi/master + + translating + +commit cc063420fe3107398e633f67f0182f2e925695a9 +Author: geekpi +Date: Fri Dec 5 09:45:42 2014 -0500 + + translated + +commit f08ce4b7c1e61240332ea29a0918c3f8d8295fb6 +Author: geekpi +Date: Fri Dec 5 09:40:03 2014 -0500 + + translating + +commit 65df647065b6983726e953f19d7b44add841d734 +Author: DeadFire +Date: Fri Dec 5 19:54:15 2014 +0800 + + 20141205-3 选题 + +commit e4f3b848e87ff381bd4f4721fd240a6ca3836aa2 +Author: DeadFire +Date: Fri Dec 5 19:40:19 2014 +0800 + + 20141205-2 选题 + +commit 5f026b35fd9dd9562339d08d70c02caddfe86f9a +Author: DeadFire +Date: Fri Dec 5 19:12:16 2014 +0800 + + 20141205-1 选题 + +commit 46a17ceea426244f45a1f279b5ba48e595eb8fa8 +Merge: 3ecb07a 6e5d25a +Author: joeren +Date: Fri Dec 5 10:49:23 2014 +0800 + + Merge pull request #2065 from GOLinux/master + + [Translated] 20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md + +commit 6e5d25a194f525ef306cf6edf4bb1f9128249b4b +Author: GOLinux +Date: Fri Dec 5 10:47:29 2014 +0800 + + [Translated] 20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md + +commit 3ecb07a280845f1d6dffa3467d62067b1e0d7dce +Merge: 12c7541 a5ca241 +Author: joeren +Date: Fri Dec 5 09:03:42 2014 +0800 + + Merge pull request #2064 from GOLinux/master + + [Translating] 20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md + +commit a5ca2419279dfad8e36fc29bae5c41b9f415e241 +Author: joeren +Date: Fri Dec 5 09:02:52 2014 +0800 + + Update 20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md + +commit ba9cd41f27a5eccdf19e700d86a06e78a625fdd0 +Merge: f73e76a 12c7541 +Author: joeren +Date: Fri Dec 5 09:02:06 2014 +0800 + + Merge pull request #4 from LCTT/master + + Update Repository + +commit 12c754127f99b782bd98592843b4cdab0e0bbb0a +Merge: 3f9ed17 6d67300 +Author: bazz2 +Date: Fri Dec 5 08:12:28 2014 +0800 + + Merge pull request #2063 from bazz2/master + + [translating]Linux Namespaces + +commit 6d6730077c769d13c2cb6e02bb8355ac93500e75 +Author: bazz2 +Date: Fri Dec 5 08:06:33 2014 +0800 + + [translating]Linux Namespaces + +commit 3f9ed17fd20d5761d5b8af0be4289df99454ae1b +Author: wxy +Date: Thu Dec 4 23:52:45 2014 +0800 + + PUB:20141017 How to verify the authenticity and integrity of a downloaded file on Linux + + @geekpi + +commit 38909dfa5db9c08e5d272677bf62ee42e94b80d1 +Author: wxy +Date: Thu Dec 4 23:30:09 2014 +0800 + + PUB:20141021 How to create and use Python CGI scripts + + @su-kaiyao + +commit 04a0061a25307dfa23a3258081e34b7be45e92c6 +Merge: 552ad45 ad454b0 +Author: Xingyu.Wang +Date: Thu Dec 4 23:21:28 2014 +0800 + + Merge pull request #2060 from Vic020/patch-22 + + 抢地主，好吧，地主是你的了。。。 + +commit 552ad451f447e67da5671e1e1d7e7ba0d59ec619 +Merge: 2e30c5c 63cb892 +Author: geekpi +Date: Thu Dec 4 22:33:07 2014 +0800 + + Merge pull request #2062 from geekpi/master + + translated + +commit 63cb892335c04c296f0ed28237da2357122ea5a5 +Author: zhengsihua +Date: Thu Dec 4 22:31:50 2014 +0800 + + translated + +commit 2e30c5c5ecf56c33655e3cc7c3a9092b79bb6782 +Merge: 2bcf986 d78f215 +Author: geekpi +Date: Thu Dec 4 22:19:53 2014 +0800 + + Merge pull request #2061 from geekpi/master + + translating + +commit d78f21521459eb18ddd03d0be8abdea912d030b4 +Author: zhengsihua +Date: Thu Dec 4 22:18:48 2014 +0800 + + translating + +commit ad454b0a5d6d1a1eba170d9ad187baa3499618f8 +Author: Vic___ +Date: Thu Dec 4 20:33:22 2014 +0800 + + 抢地主 + +commit 2bcf9868369fb5fa3bd7956429203513afd0fd3d +Author: DeadFire +Date: Thu Dec 4 19:27:19 2014 +0800 + + 20141204-6 选题 + +commit 34d4475dede86febccf67af697c5ef6769b5b5f5 +Author: DeadFire +Date: Thu Dec 4 19:14:11 2014 +0800 + + 20141204-5 选题 + +commit 813e4c0d00af882368e17522776c3d1c6978b09e +Author: DeadFire +Date: Thu Dec 4 19:03:12 2014 +0800 + + 20141204-4 选题 + +commit b5bb90f1388949e4e46118854656b7b9bd8119d3 +Author: DeadFire +Date: Thu Dec 4 18:46:36 2014 +0800 + + 20141204-3 选题 + +commit 62bc5546f318f0f48caab1ce347994dff03881c7 +Author: DeadFire +Date: Thu Dec 4 18:11:07 2014 +0800 + + 20141204-2 选题 + +commit c5477e1bee70871f024221f351a14c3673cc8325 +Author: carolinewuyan <309866211@qq.com> +Date: Thu Dec 4 18:08:35 2014 +0800 + + 已发布 + +commit 70ca70d0cb470f3872ff2d439613a0736792b17c +Author: ZTinoZ +Date: Thu Dec 4 17:53:39 2014 +0800 + + Translating by ZTinoZ + +commit 15a0b00dd6acd188d9469bc1f4640ae2b204cd40 +Author: carolinewuyan <309866211@qq.com> +Date: Thu Dec 4 17:50:50 2014 +0800 + + 已校对 + +commit aa0a75d014c43cc32b48cf8816abde743afa3249 +Author: DeadFire +Date: Thu Dec 4 17:40:56 2014 +0800 + + 20141204-1 选题 + +commit c7d3faffccb7fcb4a5b7d4a99f5c3b439eff5486 +Author: carolinewuyan <309866211@qq.com> +Date: Thu Dec 4 16:59:55 2014 +0800 + + 已发布 + +commit 037ed20977f9d4fe782d922ea041dc8e52fb1b63 +Author: carolinewuyan <309866211@qq.com> +Date: Thu Dec 4 16:52:32 2014 +0800 + + 已校对 + +commit f73e76a188607ebb36f62e289e617cd39cc03181 +Merge: c63694f 70e2996 +Author: joeren +Date: Thu Dec 4 12:05:42 2014 +0800 + + Merge pull request #3 from LCTT/master + + Update Repository + +commit 70e2996b27decb5ef91bf76d5404fd5ac8877099 +Author: wxy +Date: Thu Dec 4 10:12:50 2014 +0800 + + PUB:20141017 Linux ss Tool to Identify Sockets or Network Connections with Examples + + @geekpi + +commit 4a987f333ecc03fd57260d8c024bc9e27430fe7f +Author: wxy +Date: Wed Dec 3 22:17:31 2014 +0800 + + PUB:20141023 What is a good command-line calculator on Linux + + @JonathanKang + +commit 61086fad22dc6edb024c5e4a71e7fd51f9f26e97 +Author: wxy +Date: Wed Dec 3 21:59:06 2014 +0800 + + PUB:20141022 Linux FAQs with Answers--How to fix sshd error--could not load host key + + @GOLinux + +commit b8fbf78801c91f75c470398e01c61624e8877a5d +Author: wxy +Date: Wed Dec 3 21:52:07 2014 +0800 + + PUB:20140910 How to create a cloud-based encrypted file system on Linux + + @felixonmars + +commit f9b557d2f785d0fd4eba7b6b52650977438f9a69 +Author: wxy +Date: Wed Dec 3 21:30:08 2014 +0800 + + PUB:20141119 When Microsoft Went A-Courting + + @GOLinux + +commit e78500a70f3adb9fbc4a5065d5b15e08d83bd997 +Merge: 986571c 914ae20 +Author: Xingyu.Wang +Date: Wed Dec 3 21:00:02 2014 +0800 + + Merge pull request #2058 from Stevearzh/master + + ignore .DS_Store + +commit 986571ceb9d51e34f88805616ce0b402735819b9 +Merge: dcb830a 08635e0 +Author: Xingyu.Wang +Date: Wed Dec 3 20:59:35 2014 +0800 + + Merge pull request #2057 from forsil/master + + forsil transliating ... - "Undelete Files on Linux Systems" + +commit dcb830a5d09fe08daed8032491ef3403c59bf5de +Merge: de32ba5 f7a105d +Author: Xingyu.Wang +Date: Wed Dec 3 20:59:14 2014 +0800 + + Merge pull request #2056 from JonathanKang/master + + JonathanKang is translating + +commit 9756548568a382f36db1cd9991c64bc2a3109881 +Author: ZTinoZ +Date: Wed Dec 3 17:55:57 2014 +0800 + + Translating by ZTinoZ + +commit 914ae202b7e207116e7d4edd4783b51cb40b909f +Author: Stevearzh +Date: Wed Dec 3 17:38:55 2014 +0800 + + Translating by Stevearzh + +commit 5590da98619fc2754dc9bc54cb9a462a5df0d48f +Author: Stevearzh +Date: Wed Dec 3 17:32:21 2014 +0800 + + ignore .DS_Store + +commit 08635e022f0999478a30a3923c5888d5d7f67891 +Author: forsil +Date: Wed Dec 3 16:43:22 2014 +0800 + + forsil transliating ... + +commit de32ba5c778ae71ea7273e4999b1a58cd4276ebb +Author: DeadFire +Date: Wed Dec 3 15:33:41 2014 +0800 + + 20141203-1 选题 + +commit f7a105d9afd140aa4f5900b6eb6e44d361109297 +Author: Jonathan Kang +Date: Wed Dec 3 15:28:22 2014 +0800 + + JonathanKang is translating + +commit 916a8498a19700fb456ae938e6484d65f040cc3e +Merge: ef504ac 3d70b82 +Author: Xingyu.Wang +Date: Wed Dec 3 14:01:09 2014 +0800 + + Merge pull request #2055 from mdjsjdqe/master + + Update 20141127 11 Useful Utilities To Supercharge Your Ubuntu Experienc... + +commit ef504acac1ae85005bd0b3d48be2c9f64b34b02e +Merge: 540ee1f 63a6eab +Author: Xingyu.Wang +Date: Wed Dec 3 14:00:48 2014 +0800 + + Merge pull request #2054 from forsil/master + + translate finished - "How to use on-screen virtual keyboard on Linux" + +commit 3d70b82e807e1423a74989ef87138077d7e7c740 +Author: mdjsjdqe +Date: Wed Dec 3 11:10:41 2014 +0800 + + Update 20141127 11 Useful Utilities To Supercharge Your Ubuntu Experience.md + +commit 540ee1fc311cdbb83876eb18a7f37eb174063507 +Author: carolinewuyan <309866211@qq.com> +Date: Wed Dec 3 11:08:39 2014 +0800 + + 已发布 + +commit 63a6eab73dcf200b35cbc0da300b78c33fab0741 +Author: forsil +Date: Wed Dec 3 11:03:28 2014 +0800 + + translate finished + +commit 139911ff7ea18234e99ea6ae03e23c7712ee2aea +Author: carolinewuyan <309866211@qq.com> +Date: Tue Dec 2 23:35:03 2014 +0800 + + 已校对 + +commit 929fd236d48a51c476026315624a4aefba021ff3 +Author: wxy +Date: Tue Dec 2 23:09:28 2014 +0800 + + 更新成员列表 + +commit 6a95046f3d9d79390cda7cd741da558ec658f4a7 +Author: carolinewuyan <309866211@qq.com> +Date: Tue Dec 2 18:15:29 2014 +0800 + + 校对中 + +commit 48f48783210f2c6c0de58ac0c0ad73e4418174eb +Author: ZTinoZ +Date: Tue Dec 2 17:53:43 2014 +0800 + + Translating by ZTinoZ + +commit 1986af6f30e91a78506dc0d97d7e317a5570ca6d +Author: wxy +Date: Tue Dec 2 15:09:43 2014 +0800 + + PUB:20141124 15 pwd (Print Working Directory) Command Examples in Linux + + @geekpi + +commit cc40ae47a73ef47fe223eb6a14e862f3a4a721c5 +Author: wxy +Date: Tue Dec 2 14:47:09 2014 +0800 + + PUB:20141125 Linux FAQs with Answers--How to access a NAT guest from host with VirtualBox + + @geekpi + +commit 034e4ecb3ec9ebabbea35d063f7034aca5e5ab65 +Author: wxy +Date: Tue Dec 2 11:27:59 2014 +0800 + + PUB:20141119 Qshutdown--An avanced shutdown tool + + @GOLinux + +commit b7d68f825989f68a1b83d4b43f0880af1d0345f8 +Author: wxy +Date: Tue Dec 2 11:01:30 2014 +0800 + + PUB:20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu + + @DoubleShit + +commit cb91adb70f867853034a5225008bccaa75701bca +Merge: 2fc03df ac79d9b +Author: Xingyu.Wang +Date: Tue Dec 2 10:31:53 2014 +0800 + + Merge pull request #2052 from felixonmars/20141114-emoji + + [Translating] How To Use Emoji Anywhere With Twitter's Open Source Library + +commit 2fc03df34fc56cc3a8119f06820b4ffed381d4ab +Merge: 8027f1b c63694f +Author: joeren +Date: Tue Dec 2 08:43:34 2014 +0800 + + Merge pull request #2053 from GOLinux/master + + [Translated] 20141119 When Microsoft Went A-Courting.md + +commit c63694f8a1f390e81033aa2764a12413f15a19f1 +Author: GOLinux +Date: Tue Dec 2 08:41:59 2014 +0800 + + [Translated] 20141119 When Microsoft Went A-Courting.md + +commit ac79d9b0ffae29930eb5f4b79c613a340a6a479c +Author: Felix Yan +Date: Mon Dec 1 23:34:00 2014 +0800 + + [Translating] How To Use Emoji Anywhere With Twitter's Open Source Library + +commit ac5dcd7026784f873cfcf16ea2db27e68e411796 +Author: ZTinoZ +Date: Mon Dec 1 22:12:32 2014 +0800 + + Translating by ZTinoZ + +commit 8027f1b0daf235f4e2931574e37094dac4f7a202 +Merge: d08dc0b ed5987a +Author: Xingyu.Wang +Date: Mon Dec 1 21:20:29 2014 +0800 + + Merge pull request #2051 from ZTinoZ/master + + Translating by ZTinoZ + +commit ed5987a7af9acf8d0dc63db9f175c47452adc1a1 +Author: ZTinoZ +Date: Mon Dec 1 21:19:03 2014 +0800 + + Translating by ZTinoZ + +commit 2530f71c158391f719ab7f66ac3e90d1aa93f355 +Merge: bd3ce8c d08dc0b +Author: ZTinoZ +Date: Mon Dec 1 21:18:09 2014 +0800 + + Merge pull request #1 from LCTT/master + + Update Popular repositories + +commit d08dc0b89957905d29df0cd47a7694b732d0c88e +Author: wxy +Date: Mon Dec 1 21:09:33 2014 +0800 + + 回收 + +commit c40f1964980fc954fbb28e1567a492a836c34c7e +Author: wxy +Date: Mon Dec 1 21:09:23 2014 +0800 + + PUB:20141030 8 Tips to Solve Linux and Unix Systems Hard Disk Problmes Like Disk Full Or Can't Write to the Disk.md + + @ZTinoZ + +commit 487ac45d4b30348fc68aea1b7f78e53a5c522a91 +Author: wxy +Date: Mon Dec 1 20:38:20 2014 +0800 + + PUB:20140818 What are useful CLI tools for Linux system admins + + @zpl1025 + +commit 9cc94c8014c131e041a4ba8cff2881d677a780bd +Author: wxy +Date: Mon Dec 1 20:14:22 2014 +0800 + + PUB:20140826 20 Postfix Interview Questions and Answers + + @bazz2 + +commit c55d124ffbe9b26a2e853292ca4f6cc53a2c40ef +Author: wxy +Date: Mon Dec 1 10:21:44 2014 +0800 + + 归档 201411 + +commit db57f2d75508e89e50ca6c87492f58cd9be17cfd +Author: wxy +Date: Mon Dec 1 10:18:06 2014 +0800 + + PUB:20141014 How to monitor and troubleshoot a Linux server using sysdig.md + + @GOLinux + +commit 842b1db81234914e1f801e670d05ef28451fa54b +Merge: 6711373 1adfadc +Author: joeren +Date: Mon Dec 1 08:31:15 2014 +0800 + + Merge pull request #2050 from GOLinux/master + + [Translating] 20141119 When Microsoft Went A-Courting.md + +commit 1adfadc8967eb3408b1f23889fc15f3f19de55f5 +Author: joeren +Date: Mon Dec 1 08:29:25 2014 +0800 + + Update 20141119 When Microsoft Went A-Courting.md + +commit 1ef54f5f51238cf3b1dd70b30d14e9de990db63d +Merge: cbbc133 6711373 +Author: joeren +Date: Mon Dec 1 08:26:07 2014 +0800 + + Merge pull request #2 from LCTT/master + + Update Repository + +commit 671137363c8179aaea68cd95365bc112892aaeaa +Merge: 3f8ce06 a72c37d +Author: joeren +Date: Mon Dec 1 08:24:49 2014 +0800 + + Merge pull request #2049 from coloka/master + + 【翻译中】Four ways Linux is headed for no-downtime kernel patching + +commit a72c37dcaed0705132f5509fb925edf15617958e +Author: coloka +Date: Sun Nov 30 22:11:16 2014 +0800 + + 【翻译中】Four ways Linux is headed for no-downtime kernel patching + +commit 3f8ce069479dc1be41573a751a7fc55177684b91 +Author: wxy +Date: Sun Nov 30 21:10:06 2014 +0800 + + PUB:20141127 How to install Docker on CentOS 7 + + @felixonmars + +commit aa3fca6507b03db0897e0a22eec8e3e0c06b2302 +Merge: 23af494 bd3ce8c +Author: Xingyu.Wang +Date: Sun Nov 30 18:38:59 2014 +0800 + + Merge pull request #2048 from ZTinoZ/master + + Finish the translation by ZTinoZ + +commit 23af4948fe0f5bbf40806dc769639b2e89de07a6 +Merge: 5cef7cf 17d979d +Author: Xingyu.Wang +Date: Sun Nov 30 18:38:40 2014 +0800 + + Merge pull request #2045 from coloka/master + + 【翻译完成】20141117 Restricting process CPU usage using nice cpulimit and cgroups.md + +commit 5cef7cf448316f13f235eafa6ac3093ede244d29 +Merge: dcfa943 e0be268 +Author: geekpi +Date: Sun Nov 30 18:00:24 2014 +0800 + + Merge pull request #2047 from geekpi/master + + translated + +commit bd3ce8c9fdc63ccd287289e96ec66b0c3449740e +Author: ZTinoZ +Date: Sun Nov 30 17:33:29 2014 +0800 + + Finish the translation by ZTinoZ + +commit e0be26800b36696a2a62378c92f4a62fa831a718 +Author: geekpi +Date: Sun Nov 30 04:22:57 2014 -0500 + + translated + +commit dcfa943010298ae729316d8c6061b50049268041 +Merge: 25bf2ec c94225c +Author: geekpi +Date: Sun Nov 30 16:49:46 2014 +0800 + + Merge pull request #2046 from geekpi/master + + Translating + +commit c94225cdf5912dc04e9aebd2a363beedb7d75be8 +Author: geekpi +Date: Sun Nov 30 03:47:49 2014 -0500 + + Translating + +commit 17d979dfa0a1678bd9c6363d4de435e70d34c2c6 +Merge: cd27963 25bf2ec +Author: coloka +Date: Sun Nov 30 11:37:35 2014 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject.git + +commit cd27963acc8a1c4bb1907537c50fee5e48db7717 +Author: coloka +Date: Sun Nov 30 11:37:20 2014 +0800 + + 【翻译完成】20141117 Restricting process CPU usage using nice cpulimit and cgroups.md + +commit 25bf2ecd2d7edbdfbe02b8cbcf4be37b6470e8d6 +Author: wxy +Date: Sun Nov 30 10:31:33 2014 +0800 + + PUB:04 - The history of Android + + @alim0x + +commit 125ceabe71c909a489f044279d6a21b6e9a8d8d4 +Author: wxy +Date: Sun Nov 30 10:05:10 2014 +0800 + + PUB:Meet systemd, the controversial project taking over a Linux distro near you + + @SPccman + +commit 1d67907640615266fab1c25ecbb9a189869873f6 +Author: wxy +Date: Fri Nov 28 09:46:46 2014 +0800 + + PUB:20141125 Linux FAQs with Answers--How to check glibc version on Linux + + @GOLinux + +commit 4774a8c6e80384dd2fa15d71afb55e85b60550b3 +Merge: f4b3167 84eaf6e +Author: Xingyu.Wang +Date: Sat Nov 29 22:50:20 2014 +0800 + + Merge pull request #2044 from disylee/master + + [ translated] by disylee + +commit 84eaf6ed1dcb11898f8c975782affbb7e08fce70 +Author: disylee +Date: Sat Nov 29 22:34:25 2014 +0800 + + disylee translated ok + +commit f4b31670e3051756ecd3525bce205f5e241a3043 +Merge: 528ed42 f552369 +Author: Xingyu.Wang +Date: Sat Nov 29 22:05:27 2014 +0800 + + Merge pull request #2043 from a598799539/master + + [Translated by a598799539] Some Sentences about Java + 哈哈，作为你的处翻，我会好好校对的哈~~ + +commit 528ed42501a3e9edf6d5a3a409e01c14ec7bde38 +Merge: 4cd7280 03e22ba +Author: Xingyu.Wang +Date: Sat Nov 29 22:04:24 2014 +0800 + + Merge pull request #2040 from Stevearzh/master + + [translated by Stevearzh]20141108 When hackers grow old.md + 赞！据说这篇比较难翻译，等我合并了仔细拜读:> + +commit 4cd7280436984d4331cdb42a539bfa05a3de8f8e +Merge: c89d8ad 3760bdc +Author: Xingyu.Wang +Date: Sat Nov 29 22:03:29 2014 +0800 + + Merge pull request #2039 from KayGuoWhu/master + + [Translated]20141127 What Makes a Good Programmer + +commit c89d8ada43e31266d164d8c2080dbeafae8e44b6 +Merge: c9684fa 1e95d12 +Author: Xingyu.Wang +Date: Sat Nov 29 22:03:08 2014 +0800 + + Merge pull request #2036 from SPccman/master + + Meet systemd, the controversial project taking over a Linux distro near you + +commit c9684fa307fc25b32c99c0c7e1a5a76de72895d1 +Merge: e80a538 04eb460 +Author: Xingyu.Wang +Date: Sat Nov 29 22:02:40 2014 +0800 + + Merge pull request #2035 from felixonmars/20141127-docker + + [Translated] How to install Docker on CentOS 7 + +commit e80a538719348619af9337fae1bce36f57492348 +Merge: b841012 e9d5996 +Author: Xingyu.Wang +Date: Sat Nov 29 22:01:38 2014 +0800 + + Merge pull request #2034 from DoubleShit/master + + [translated] 20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu + +commit f552369682e10e6de62d6b5ec6bd01b311c0503c +Merge: 37715e5 b841012 +Author: a598799539 +Date: Sat Nov 29 21:00:38 2014 +0800 + + Merge branch 'master' of github.com:LCTT/TranslateProject + +commit 37715e5eca070baf14453a20446454281f0987f6 +Author: a598799539 +Date: Sat Nov 29 21:00:10 2014 +0800 + + translated Some Sentences about Java + +commit b8410122e9deb8b47426765f51c4a2ff6cb691f1 +Merge: e287fd8 cf40825 +Author: geekpi +Date: Sat Nov 29 19:21:56 2014 +0800 + + Merge pull request #2042 from geekpi/master + + translated + +commit cf408257c1fa3cf44239e7e032f477a680f64ed4 +Author: geekpi +Date: Sat Nov 29 06:15:26 2014 -0500 + + translated + +commit e287fd89c5a1381b5bcad0c72658772fc9ff6f15 +Merge: 592cc17 8858878 +Author: geekpi +Date: Sat Nov 29 17:05:39 2014 +0800 + + Merge pull request #2041 from geekpi/master + + [Translating] + +commit 885887800804be7948dca76ab52214eebbaf8d28 +Author: geekpi +Date: Sat Nov 29 03:18:11 2014 -0500 + + [Translating] + +commit 03e22baa0d96306b7183c857c778fb7bb731c68c +Author: Stevearzh +Date: Sat Nov 29 15:09:11 2014 +0800 + + translated by Stevearzh + +commit 50cbc2fd447c5621d0c54751b43f774415fbf41e +Author: Stevearzh +Date: Sat Nov 29 15:04:44 2014 +0800 + + translated by Stevearzh + +commit 3760bdc4603b29aa7accdb5be6efecc527b40664 +Author: KayGuoWhu +Date: Sat Nov 29 11:53:50 2014 +0800 + + translated + +commit 592cc17351b5adc64af6377d6f26e2b19079550f +Author: geekpi +Date: Fri Nov 28 22:53:55 2014 +0800 + + Update 20141125 Linux FAQs with Answers--How to access a NAT guest from host with VirtualBox.md + +commit db71d4442c3d8be3ec19b615b80608c0364469eb +Merge: 1cee614 1676f66 +Author: geekpi +Date: Fri Nov 28 22:52:11 2014 +0800 + + Merge pull request #2038 from geekpi/master + + trnalsted + +commit 1676f66d703f70f65368f3f10669138c3fb05e87 +Author: root +Date: Fri Nov 28 09:48:34 2014 -0500 + + translated + +commit 5992044cb9ee267f381784573d82eaeea3480f40 +Author: root +Date: Fri Nov 28 09:47:50 2014 -0500 + + translated + +commit 1cee61441beec17d9edcc982405342228e9ddd57 +Merge: 1a52ed9 392bd99 +Author: geekpi +Date: Fri Nov 28 22:45:22 2014 +0800 + + Merge pull request #2037 from geekpi/master + + translated + +commit 392bd99ec4570f4ac5dec6991a77e2da4f8f2861 +Author: root +Date: Fri Nov 28 09:41:00 2014 -0500 + + translated + +commit 1e95d12ee85a6fe6c554700865656748eac96b59 +Author: DoubleC <450760206@qq.com> +Date: Fri Nov 28 22:39:54 2014 +0800 + + Create Meet systemd, the controversial project taking over a Linux distro near you.md + + 翻已完成 + +commit 078ff0fc967f7893526d0abcd865121ea7de87fb +Author: DoubleC <450760206@qq.com> +Date: Fri Nov 28 22:37:46 2014 +0800 + + Delete 20141111 Meet systemd the controversial project taking over a Linux distro near you.md + + 删除原文 + +commit 014e7fdead98a360eae9a4f560cd751abffbbb55 +Merge: a49d56a 1a52ed9 +Author: DoubleC <450760206@qq.com> +Date: Fri Nov 28 22:36:38 2014 +0800 + + Merge pull request #10 from LCTT/master + + update + +commit 04eb460fb15f76a9fdf4d115c179cb5130bea98b +Author: Felix Yan +Date: Fri Nov 28 21:12:19 2014 +0800 + + [Translated] How to install Docker on CentOS 7 + +commit 04ed0501ac3e430a60c091ef0e7196fccd6bbe16 +Author: ZTinoZ +Date: Fri Nov 28 17:35:37 2014 +0800 + + Translating by ZTinoZ + +commit e9d59968c9603e851271496390879ca75881a2c2 +Author: DoubleShift +Date: Fri Nov 28 09:37:02 2014 +0200 + + Create 20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu.md + + Translate finished. + +commit 2137e75ab5208a6f694816749b1b40f6a07ea027 +Author: DoubleShift +Date: Fri Nov 28 09:33:54 2014 +0200 + + Delete 20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu.md + + finished + +commit 1a52ed9badba1087938d77e7567bc19019f3b847 +Merge: aae52f4 c8fc59b +Author: Xingyu.Wang +Date: Fri Nov 28 15:17:08 2014 +0800 + + Merge pull request #2033 from KayGuoWhu/master + + [Translating]20141127 What Makes a Good Programmer + +commit 4887c41da25d71e846fcb2ffbe54e02ea9c5d6f4 +Author: DoubleShift +Date: Fri Nov 28 08:44:07 2014 +0200 + + Update 20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu.md + + begin + +commit c8fc59b10c73bbef12fddaa52caac0ffb7491388 +Author: KayGuoWhu +Date: Fri Nov 28 11:31:15 2014 +0800 + + translating + +commit aae52f4fbfdae91d7442d3470f167b36635c5f4b +Author: carolinewuyan <309866211@qq.com> +Date: Fri Nov 28 09:49:55 2014 +0800 + + 已发布 + +commit 7f804823350d78083179d6e110f874eb02e48ee4 +Merge: cc49b47 4dc9efa +Author: Xingyu.Wang +Date: Fri Nov 28 09:37:35 2014 +0800 + + Merge pull request #2028 from felixonmars/20141127-docker + + [Translating] How to install Docker on CentOS 7 + +commit cc49b47b9f25325d41ac4c7b9f09f7bb804c3f2e +Merge: beb3a86 09517d9 +Author: Xingyu.Wang +Date: Fri Nov 28 09:37:16 2014 +0800 + + Merge pull request #2032 from LCTT/revert-2029-master + + Revert "[Translating]20141127 How to install Docker on CentOS 7" + +commit 09517d99ad04bb1c503984a461ddee9401faec56 +Author: Xingyu.Wang +Date: Fri Nov 28 09:36:39 2014 +0800 + + Revert "[Translating]20141127 How to install Docker on CentOS 7" + +commit cbbc1333fb1d420dab930a6965757e5e03e6dcc3 +Merge: 5651cf8 beb3a86 +Author: joeren +Date: Fri Nov 28 08:39:05 2014 +0800 + + Merge pull request #1 from LCTT/master + + Update Repository + +commit beb3a867e6bdbf0819041ee601b8b3c54c1b668f +Merge: 67c573e 5eae2f8 +Author: joeren +Date: Fri Nov 28 08:37:54 2014 +0800 + + Merge pull request #2027 from felixonmars/20141127-systemd-nspawn + + 选题: Quick systemd-nspawn guide + +commit 67c573e226d879e6d3866880708e14f4f142649e +Merge: bcee8eb 4e82237 +Author: joeren +Date: Fri Nov 28 08:37:05 2014 +0800 + + Merge pull request #2029 from KayGuoWhu/master + + [Translating]20141127 How to install Docker on CentOS 7 + +commit bcee8ebc95d1bddb7f21866c728a01af5a5c73ee +Merge: 6b7af44 db7184f +Author: joeren +Date: Fri Nov 28 08:36:55 2014 +0800 + + Merge pull request #2030 from a598799539/master + + [a598799539 Translating] Some Sentences about Java + +commit 6b7af4483a2e4e686a9cb6d2ad7d8b2f50a81c10 +Merge: 5819b92 6a9b807 +Author: joeren +Date: Fri Nov 28 08:36:42 2014 +0800 + + Merge pull request #2031 from forsil/master + + forsil translating ... + +commit 6a9b8071939047158a54c7e8015aa93eaaab63be +Author: forsil +Date: Thu Nov 27 21:29:11 2014 +0800 + + forsil translating ... + +commit 5819b928297f5cec8ed715a70b57f511565417d1 +Author: wxy +Date: Thu Nov 27 21:22:31 2014 +0800 + + PUB:20140905 Linux TCP or IP networking--net-tools vs. iproute2 + + @KayGuoWhu + +commit db7184f092ac3442614b4d40246e55571404b098 +Author: a598799539 +Date: Thu Nov 27 20:29:45 2014 +0800 + + [Translating] Some Sentences about Java + +commit 3b056857e3945ec823d58e45b27421f5f4e1116c +Author: DeadFire +Date: Thu Nov 27 19:20:59 2014 +0800 + + 20141127-6 选题 带一朵云去远行a598799539 推荐 + +commit 4e82237a0bfbc8a3e97cc533d1afb8c666d0e700 +Author: KayGuoWhu +Date: Thu Nov 27 19:17:27 2014 +0800 + + translating + +commit 85f53161391d52f1bd49b81a1f183536398f3979 +Author: DeadFire +Date: Thu Nov 27 19:06:39 2014 +0800 + + 20141127-5 选题 + +commit ea9fa87ebf012b610aae9406b4bd28a5afbe7316 +Author: ZTinoZ +Date: Thu Nov 27 18:01:21 2014 +0800 + + Translating by ZTinoZ + +commit 454f2c7c54dbd751cb012a23f6b820428bdb965b +Author: DeadFire +Date: Thu Nov 27 17:02:20 2014 +0800 + + 20141127-4 选题 + +commit 5ee99b55b407b09bd9a929eeb00ba9155d63fc13 +Author: carolinewuyan <309866211@qq.com> +Date: Thu Nov 27 17:00:52 2014 +0800 + + 已校对 + +commit bf803aed01b9759a6941fa5dcead90effa458889 +Author: DeadFire +Date: Thu Nov 27 15:22:35 2014 +0800 + + 20141127-3 选题 + +commit 161875b7ca164238201458f26b85ff8d832296cc +Author: DeadFire +Date: Thu Nov 27 15:06:22 2014 +0800 + + 20141127-2 选题 + +commit 4dc9efa9139a9f0b55aea28deec0cbe3456f2355 +Author: Felix Yan +Date: Thu Nov 27 14:20:59 2014 +0800 + + [Translating] How to install Docker on CentOS 7 + +commit 94fb2afe8488a2c415e3141afbf2cc06fe988938 +Author: DeadFire +Date: Thu Nov 27 14:15:44 2014 +0800 + + 20141127-1 选题 + +commit 5eae2f830b77108ded370822de86eb957bdc6867 +Author: Felix Yan +Date: Thu Nov 27 14:06:03 2014 +0800 + + fix a typo + +commit 6ccb1dbc8d77ec78c635b4739cca055dda5b1af7 +Author: Felix Yan +Date: Thu Nov 27 14:00:06 2014 +0800 + + 选题: Quick systemd-nspawn guide + +commit 62d43d894b178b7b4869209233d2b69c14ffa204 +Author: wxy +Date: Thu Nov 27 13:39:14 2014 +0800 + + PUB:20141108 How to Record Your Desktop Video and Audio Using 'Avconv' Tool in Ubuntu + + @ggaaooppeenngg + +commit 9e84442dcedb5b4e5b2dc532bf0aab00a38b8c4d +Author: carolinewuyan <309866211@qq.com> +Date: Thu Nov 27 13:31:42 2014 +0800 + + 已发布 + +commit 3cdfb5927ff234cecda1c2ada70af1f3170e2f75 +Author: wxy +Date: Thu Nov 27 13:04:12 2014 +0800 + + PUB:20141112 [Quick Tip] How To Fix Docky Compositing Error In Lubuntu + + @Vic020 + +commit 5651cf80d86e5232957ef3154bde7998fb0b2f10 +Merge: 3ed12bf d679d35 +Author: joeren +Date: Thu Nov 27 10:10:47 2014 +0800 + + Merge pull request #2025 from felixonmars/20141124-blkid + + [Translated] Linux blkid Command to Find Block Devices Details + +commit 3ed12bf71e7c73b844ec847c15913db1e0cd70cd +Author: wxy +Date: Wed Nov 26 23:35:03 2014 +0800 + + PUB:20141029 How to install LEMP stack nginx MariaDB or MySQL and php on CentOS + + @runningwater + +commit d679d351abd57688a6746a47bfda1a0f3d3e3a3b +Author: Felix Yan +Date: Wed Nov 26 23:09:04 2014 +0800 + + [Translated] Linux blkid Command to Find Block Devices Details + +commit c9b07707f9d9787dc3b0d505dad88d533f082be2 +Author: wxy +Date: Wed Nov 26 23:01:56 2014 +0800 + + PUB:20141029 How to create and manage LXC containers on Ubuntu + + @bazz2 + +commit 0ba87ce9233df4b8f3499e52f9bac12c793e45d1 +Author: wxy +Date: Wed Nov 26 22:47:43 2014 +0800 + + PUB:20141105 Linux FAQs with Answers--How to disable HTTP redirect in wget + + @geekpi + +commit 27d7992eee62f7ccaae99ee6c9ca1a4de064dc31 +Merge: 9a97823 7c1375c +Author: Xingyu.Wang +Date: Wed Nov 26 22:34:05 2014 +0800 + + Merge pull request #2024 from felixonmars/20141124-blkid + + Translating: Linux blkid Command to Find Block Devices Details + +commit 9a97823c5a7dfc856a80c9e0110a978cb0100282 +Merge: ad8ba0f fb74cc0 +Author: Xingyu.Wang +Date: Wed Nov 26 22:33:19 2014 +0800 + + Merge pull request #2023 from johnhoow/master + + Translating by johnhoow + +commit 7c1375cccd21403169ef71c3a9df97243b4676b5 +Author: Felix Yan +Date: Wed Nov 26 21:17:47 2014 +0800 + + Translating: Linux blkid Command to Find Block Devices Details + +commit b6b6d65891534befa4180054ee82720b065ca022 +Author: ZTinoZ +Date: Wed Nov 26 17:39:50 2014 +0800 + + Translating by ZTinoZ + +commit fb74cc08d50b8ccb9c3ae49f227b41494fd93b5f +Merge: a92cdfc ad8ba0f +Author: johnhoow +Date: Wed Nov 26 14:14:46 2014 +0800 + + johnhoow translating + +commit f5cc73c3f3cfc9da0f4e89e8da4470aa31792874 +Author: ZTinoZ +Date: Wed Nov 26 10:40:16 2014 +0800 + + Translating by ZTinoZ + +commit ad8ba0fe6218909c09a1250d1461894127e67662 +Merge: 1fde8e5 78d7bd2 +Author: joeren +Date: Wed Nov 26 09:28:52 2014 +0800 + + Merge pull request #2022 from GOLinux/master + + [Translated] Two Questions with Answers + +commit 78d7bd287e5a3c56d26b0e2023b74234c2283799 +Author: GOLinux +Date: Wed Nov 26 09:26:27 2014 +0800 + + [Translated] Two Questions with Answers + +commit 1fde8e52a8a9d1aa275e26a2898cde632f937a3f +Merge: 791ec3c e928d55 +Author: joeren +Date: Wed Nov 26 08:54:29 2014 +0800 + + Merge pull request #2021 from GOLinux/master + + [Translating] 20141125 Linux FAQs with Answers--How to check glibc version on Linux.md + +commit e928d55e38e7724008754548f922031266890836 +Author: joeren +Date: Wed Nov 26 08:53:57 2014 +0800 + + Update 20141125 Linux FAQs with Answers--How to check glibc version on Linux.md + +commit 791ec3c46a3a139d9289d2a74f1d9bd68d0d1b4f +Merge: 8b77845 10165c8 +Author: joeren +Date: Wed Nov 26 08:53:26 2014 +0800 + + Merge pull request #2020 from GOLinux/master + + [Translating] 20141125 Linux FAQs with Answers--How to fix ImportError--No module named scapy.all.md + +commit 10165c83041e87a7f1bd00d02a48c5beb2835151 +Author: joeren +Date: Wed Nov 26 08:52:46 2014 +0800 + + Update 20141125 Linux FAQs with Answers--How to fix ImportError--No module named scapy.all.md + +commit d12778e9e89e363ea45de81e18c0a4db6e0c2573 +Merge: 25e95b8 8b77845 +Author: joeren +Date: Wed Nov 26 08:51:56 2014 +0800 + + Merge pull request #51 from LCTT/master + + Update Repository + +commit 8b77845ed43e85c462816b6613f42e4176d92b13 +Merge: 6855a65 cd350b0 +Author: joeren +Date: Wed Nov 26 08:51:05 2014 +0800 + + Merge pull request #2018 from alim0x/master + + 09-the history of Android complete + +commit 6855a6597cede9ba9f993f16acd4dbf40967cf7b +Merge: 834ba47 64d08b7 +Author: joeren +Date: Wed Nov 26 08:50:56 2014 +0800 + + Merge pull request #2019 from Stevearzh/master + + Translating by Stevearzh + +commit 64d08b7b04c01ad104ed718dfc1f82c77e8922dd +Author: Stevearzh +Date: Wed Nov 26 00:12:01 2014 +0800 + + Translating by Stevearzh + +commit 834ba47dae70f87ce1fbebe7982aac0cde738965 +Author: wxy +Date: Tue Nov 25 23:38:36 2014 +0800 + + PUB:20141029 Linux FAQs with Answers--How to fix hda-duplex not supported in this QEMU binary + + @geekpi + +commit cd350b09ee20c1c2a7ef465125ec1a8c27c5352d +Author: alim0x +Date: Tue Nov 25 23:01:29 2014 +0800 + + 09-the history of Android complete + +commit 2edcc8b31f4139f3cdacdfe958ea3b0f3548b28c +Author: wxy +Date: Tue Nov 25 22:21:13 2014 +0800 + + PUB:20141024 How To Upgrade Ubuntu 14.04 Trusty To Ubuntu 14.10 Utopic + + @johnhoow 只发布了服务器小节。 + +commit 88408ef3e43b827164affecbe2099e91b6404b8a +Author: wxy +Date: Tue Nov 25 21:51:15 2014 +0800 + + PUB:How-to-debug-a-C or C++ program with GDB command-line debugger + + @SPccman + +commit 21286943d4b86c74f195bba55833ab697c9ba35e +Author: carolinewuyan <309866211@qq.com> +Date: Tue Nov 25 16:44:05 2014 +0800 + + 已校对 + +commit db81f42bb9b0e92d8e7db3fa5a9ada7a6f192899 +Author: wxy +Date: Tue Nov 25 16:40:55 2014 +0800 + + PUB:20140926 How to manage configurations in Linux with Puppet and Augeas + + @geekpi + +commit e794d67ce65ab4665518a0cdf28991a794391145 +Author: DeadFire +Date: Tue Nov 25 15:43:47 2014 +0800 + + 20141125-2 选题 + +commit 3e3d66eecfc53b8c3668215efadb7a02a99e7737 +Author: DeadFire +Date: Tue Nov 25 09:46:48 2014 +0800 + + 20141125-1 选题 + +commit f5a26d4b4a1bec283c88670d828bfa9cfda7cbee +Author: wxy +Date: Mon Nov 24 16:26:00 2014 +0800 + + PUB:20141012 Simple guide to forks in github and git + + @su-kaiyao @FingerLiu + +commit 5d4b860a47bc7e7fe6a621d923bcbd0023ca2f31 +Author: wxy +Date: Mon Nov 24 15:44:56 2014 +0800 + + PUB:20141023 6 Minesweeper Clones for Linux + + @GOLinux + +commit af83c76e78af061b4bf26356d8565751d8fdfd33 +Author: wxy +Date: Mon Nov 24 15:31:28 2014 +0800 + + PUB:20141008 The Why and How of Ansible and Docker + + @bazz2 很流畅！ + +commit 59ecbb93ed9489e789e3ae3555b5b3c9cd455c2b +Author: DeadFire +Date: Mon Nov 24 16:06:52 2014 +0800 + + 20141124-2 选题 + +commit ea6654f3e1029f4da193d4a2c305539a2edea5a3 +Author: DeadFire +Date: Mon Nov 24 15:41:26 2014 +0800 + + 20141124-1 选题 + +commit 43079a4446d561f03a6de9d2ad8028a23634c38b +Merge: 9458bcc f3fe68f +Author: Xingyu.Wang +Date: Mon Nov 24 15:19:24 2014 +0800 + + Merge pull request #2015 from KayGuoWhu/master + + [Translating]20141108 When hackers grow old + 哈哈，没关系，这篇是挺难翻译的。。。 + +commit 9458bccfb6ef04f416637871fe452c58b25ae8ca +Merge: 3cf077c 25e95b8 +Author: joeren +Date: Mon Nov 24 09:28:00 2014 +0800 + + Merge pull request #2017 from GOLinux/master + + [Translated] 20141119 Qshutdown--An avanced shutdown tool.md + +commit 25e95b86cc5261b66455beab757dd694f6dc06c1 +Author: GOLinux +Date: Mon Nov 24 09:26:35 2014 +0800 + + [Translated] 20141119 Qshutdown--An avanced shutdown tool.md + +commit 3cf077c4e80282a6ed4edf513883a9224ede3ea3 +Merge: 3473507 efde8a2 +Author: joeren +Date: Mon Nov 24 09:23:58 2014 +0800 + + Merge pull request #2016 from GOLinux/master + + [Translated] 20141023 6 Minesweeper Clones for Linux.md + +commit efde8a206259eb8b4ee2fbe575e8205c588eb328 +Author: GOLinux +Date: Mon Nov 24 09:21:36 2014 +0800 + + [Translated] 20141023 6 Minesweeper Clones for Linux.md + +commit f3fe68f680eaa44fe2313450c46e756fa77ea60d +Author: KayGuoWhu +Date: Mon Nov 24 09:20:07 2014 +0800 + + stop translating + +commit 3473507b3eed42c8a7cb75918758d0bbcb009c49 +Merge: 6accdf1 76971a6 +Author: joeren +Date: Mon Nov 24 08:40:10 2014 +0800 + + Merge pull request #2014 from GOLinux/master + + [Translating] 20141023 6 Minesweeper Clones for Linux.md + +commit 76971a672c148636524c9f08584428a101e0e46c +Author: joeren +Date: Mon Nov 24 08:39:51 2014 +0800 + + Update 20141023 6 Minesweeper Clones for Linux.md + +commit 6accdf11b44eaa75d3e69ca3150f6f44e89ffe67 +Merge: ee7cef3 09c2778 +Author: joeren +Date: Mon Nov 24 08:38:36 2014 +0800 + + Merge pull request #2013 from GOLinux/master + + [Translating] 20141119 Qshutdown--An avanced shutdown tool.md + +commit 09c2778e955ea03754bf8c864f3e558edda770bc +Author: joeren +Date: Mon Nov 24 08:38:09 2014 +0800 + + Update 20141119 Qshutdown--An avanced shutdown tool.md + +commit f7e2ffda4fd2efcf418614331b31213822665df1 +Merge: 8d4ebf9 ee7cef3 +Author: joeren +Date: Mon Nov 24 08:36:38 2014 +0800 + + Merge pull request #50 from LCTT/master + + Update Repository + +commit ee7cef30c35a2f99fa20f26b5e06006ae6f4b021 +Merge: 68a784d 8ee9eb4 +Author: joeren +Date: Mon Nov 24 08:35:52 2014 +0800 + + Merge pull request #2012 from coloka/master + + 翻译完成：20141120 How to visualize memory usage on Linux.md + +commit 8ee9eb4893ad35de2e1f87c22de6ccaf3f38bb77 +Author: coloka +Date: Sun Nov 23 21:13:25 2014 +0800 + + 翻译完成：20141120 How to visualize memory usage on Linux.md + 翻译中：20141117 Restricting process CPU usage using nice cpulimit and cgroups.md + +commit 68a784d630ca20ae2523029edb45c9cf37f2c8d7 +Author: wxy +Date: Sun Nov 23 12:13:54 2014 +0800 + + PUB:20140901 How to install and configure ownCloud on Debian + + @geekpi + +commit 01f749ff651d08c33e77563a987098f7b510f573 +Author: wxy +Date: Sun Nov 23 11:51:55 2014 +0800 + + PUB:20140828 Setup Thin Provisioning Volumes in Logical Volume Management (LVM)--Part IV + + @GOLinux + +commit e95ffded0019d13d8478d520f801ad2c6a29f0a9 +Author: wxy +Date: Sun Nov 23 11:09:06 2014 +0800 + + PUB:20141027 Handy Disk Image Tools + + @barney-ro + +commit df66dcc31549c0db544e9fa96d4ffe342b0cd333 +Author: wxy +Date: Sat Nov 22 22:01:18 2014 +0800 + + PUB:20141115 LibreOffice 4.3.4 Released With 60 Bug Fixes v4.4 Shaping Up Nicely + + @ZTinoZ + +commit 891a533eeca72373fdff2c160427fcdd00d16347 +Merge: 424da1b d0cd7a6 +Author: Xingyu.Wang +Date: Sat Nov 22 21:09:41 2014 +0800 + + Merge pull request #2011 from ZTinoZ/master + + Translating by ZTinoZ + +commit d0cd7a648fde3e6cc7b4b320064c2db3868ca7ca +Author: ZTinoZ +Date: Sat Nov 22 20:57:33 2014 +0800 + + Translating by ZTinoZ + +commit 424da1b9fb8be94af487639d6347524668d00cd2 +Merge: 4436961 52bff59 +Author: Xingyu.Wang +Date: Sat Nov 22 20:22:31 2014 +0800 + + Merge pull request #2008 from coloka/master + + 【翻译完成】20141112 How to Debug CPU Regressions Using Flame Graphs.md + +commit a92cdfc2e86628214e4b3eeeaa0b89f8f4f2cf8b +Author: johnhoow +Date: Sat Nov 22 17:02:40 2014 +0800 + + johnhoow translating + +commit 4436961b4842bae7d02e404568ac56c74efde07a +Author: wxy +Date: Fri Nov 21 14:53:58 2014 +0800 + + PUB:03 - The history of Android + + @alim0x + +commit a5562536e3e4c08474f2911fc03f5d91077e0c62 +Author: wxy +Date: Thu Nov 20 14:40:51 2014 +0800 + + PUB:20141027 How to download an ISO image with BitTorrent fast and safely from the command line + + @wangjiezhe + +commit c75a469c338c91aab8d0ffc95f2ab1739a8a01de +Author: wxy +Date: Thu Nov 20 13:08:02 2014 +0800 + + PUB:20141106 timedatectl--Control Linux System Time and Date in Systemd + + @su-kaiyao + +commit 6dd41fdc522dc5b213c2621358b4cec6bd8a96b5 +Author: wxy +Date: Thu Nov 20 12:44:04 2014 +0800 + + PUB:20141106 Quick Tip Allow Services Through Firewall In openSUSE + + @Vic020 + +commit 2bd2708f9b16bc0e96a389f6bd28aabfc8145779 +Author: wxy +Date: Wed Nov 19 22:20:23 2014 +0800 + + PUB:20141017 pidstat - Monitor and Find Statistics for Linux Procesess + + @johnhoow + +commit 5aa9736f371d7d32ef5c68fdfa12a121c9f6bef6 +Merge: a1b4767 f87f093 +Author: geekpi +Date: Sat Nov 22 10:59:18 2014 +0800 + + Merge pull request #2006 from runningwater/master + + 【翻译中 by runningwater】10 SCP Commands to Transfer Files/Folders in Linux + +commit a1b47670bcadb3b1b185cb0c8f4851072a33fd4d +Merge: 1e413d3 0dc9479 +Author: geekpi +Date: Sat Nov 22 10:58:20 2014 +0800 + + Merge pull request #2007 from SPccman/patch-8 + + Update 20141111 Meet systemd the controversial project taking over a Lin... + +commit 1e413d3232d252cc9f9fe158fd6725d9965f6fb4 +Merge: ddaa80e 2db322f +Author: geekpi +Date: Sat Nov 22 10:57:22 2014 +0800 + + Merge pull request #2009 from geekpi/master + + [Translating] How To Make Raspberry Pi Boot In To GUI By Default + +commit 2db322fa4bf48dfa63610cffc8edc1b974779afd +Author: zhengsihua +Date: Sat Nov 22 10:56:06 2014 +0800 + + translated + +commit a813b7d0c4fe2e68bd66e49ca7152ca0ce7d8c11 +Author: zhengsihua +Date: Sat Nov 22 10:17:19 2014 +0800 + + [Translating] How To Make Raspberry Pi Boot In To GUI By Default + +commit 52bff59cacfd5110fff61f7eb8f97d0bbb2964fc +Author: coloka +Date: Fri Nov 21 23:23:22 2014 +0800 + + 修改文件夹 source -> translated + +commit 8fa646f2f4d7cd52183ea4a7bdd82c58f5557cab +Author: coloka +Date: Fri Nov 21 22:39:52 2014 +0800 + + 【翻译中】20141120 How to visualize memory usage on Linux.md + +commit 988a3f81572a1dbfa0db12b8943784200ae236b7 +Author: coloka +Date: Fri Nov 21 22:34:37 2014 +0800 + + 翻译完成 by coloka + +commit 3b25910a0976d572ac091fe34ec4972eddc6b7b3 +Merge: 4bbc010 ddaa80e +Author: coloka +Date: Fri Nov 21 22:32:35 2014 +0800 + + Merge branch 'master' of https://github.com/LCTT/TranslateProject.git + +commit 4bbc01058ce83f30ac78147092c63401c6e2aec8 +Author: coloka +Date: Fri Nov 21 22:32 \ No newline at end of file diff --git a/gihua b/gihua new file mode 100644 index 0000000000..e4cbf7acae --- /dev/null +++ b/gihua @@ -0,0 +1,232 @@ + + SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS + + Commands marked with * may be preceded by a number, _N. + Notes in parentheses indicate the behavior if _N is given. + A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K. + + h H Display this help. + q :q Q :Q ZZ Exit. + --------------------------------------------------------------------------- + + MMOOVVIINNGG + + e ^E j ^N CR * Forward one line (or _N lines). + y ^Y k ^K ^P * Backward one line (or _N lines). + f ^F ^V SPACE * Forward one window (or _N lines). + b ^B ESC-v * Backward one window (or _N lines). + z * Forward one window (and set window to _N). + w * Backward one window (and set window to _N). + ESC-SPACE * Forward one window, but don't stop at end-of-file. + d ^D * Forward one half-window (and set half-window to _N). + u ^U * Backward one half-window (and set half-window to _N). + ESC-) RightArrow * Left one half screen width (or _N positions). + ESC-( LeftArrow * Right one half screen width (or _N positions). + F Forward forever; like "tail -f". + r ^R ^L Repaint screen. + R Repaint screen, discarding buffered input. + --------------------------------------------------- + Default "window" is the screen height. + Default "half-window" is half of the screen height. + --------------------------------------------------------------------------- + + SSEEAARRCCHHIINNGG + + /_p_a_t_t_e_r_n * Search forward for (_N-th) matching line. + ?_p_a_t_t_e_r_n * Search backward for (_N-th) matching line. + n * Repeat previous search (for _N-th occurrence). + N * Repeat previous search in reverse direction. + ESC-n * Repeat previous search, spanning files. + ESC-N * Repeat previous search, reverse dir. & spanning files. + ESC-u Undo (toggle) search highlighting. + &_p_a_t_t_e_r_n * Display only matching lines + --------------------------------------------------- + A search pattern may be preceded by one or more of: + ^N or ! Search for NON-matching lines. + ^E or * Search multiple files (pass thru END OF FILE). + ^F or @ Start search at FIRST file (for /) or last file (for ?). + ^K Highlight matches, but don't move (KEEP position). + ^R Don't use REGULAR EXPRESSIONS. + --------------------------------------------------------------------------- + + JJUUMMPPIINNGG + + g < ESC-< * Go to first line in file (or line _N). + G > ESC-> * Go to last line in file (or line _N). + p % * Go to beginning of file (or _N percent into file). + t * Go to the (_N-th) next tag. + T * Go to the (_N-th) previous tag. + { ( [ * Find close bracket } ) ]. + } ) ] * Find open bracket { ( [. + ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>. + ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_> + --------------------------------------------------- + Each "find close bracket" command goes forward to the close bracket + matching the (_N-th) open bracket in the top line. + Each "find open bracket" command goes backward to the open bracket + matching the (_N-th) close bracket in the bottom line. + + m_<_l_e_t_t_e_r_> Mark the current position with . + '_<_l_e_t_t_e_r_> Go to a previously marked position. + '' Go to the previous position. + ^X^X Same as '. + --------------------------------------------------- + A mark is any upper-case or lower-case letter. + Certain marks are predefined: + ^ means beginning of the file + $ means end of the file + --------------------------------------------------------------------------- + + CCHHAANNGGIINNGG FFIILLEESS + + :e [_f_i_l_e] Examine a new file. + ^X^V Same as :e. + :n * Examine the (_N-th) next file from the command line. + :p * Examine the (_N-th) previous file from the command line. + :x * Examine the first (or _N-th) file from the command line. + :d Delete the current file from the command line list. + = ^G :f Print current file name. + --------------------------------------------------------------------------- + + MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS + + -_<_f_l_a_g_> Toggle a command line option [see OPTIONS below]. + --_<_n_a_m_e_> Toggle a command line option, by name. + __<_f_l_a_g_> Display the setting of a command line option. + ___<_n_a_m_e_> Display the setting of an option, by name. + +_c_m_d Execute the less cmd each time a new file is examined. + + !_c_o_m_m_a_n_d Execute the shell command with $SHELL. + |XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command. + v Edit the current file with $VISUAL or $EDITOR. + V Print version number of "less". + --------------------------------------------------------------------------- + + OOPPTTIIOONNSS + + Most options may be changed either on the command line, + or from within less by using the - or -- command. + Options may be given in one of two forms: either a single + character preceded by a -, or a name preceded by --. + + -? ........ --help + Display help (from command line). + -a ........ --search-skip-screen + Search skips current screen. + -A ........ --SEARCH-SKIP-SCREEN + Search starts just after target line. + -b [_N] .... --buffers=[_N] + Number of buffers. + -B ........ --auto-buffers + Don't automatically allocate buffers for pipes. + -c ........ --clear-screen + Repaint by clearing rather than scrolling. + -d ........ --dumb + Dumb terminal. + -D [_x_n_._n] . --color=_x_n_._n + Set screen colors. (MS-DOS only) + -e -E .... --quit-at-eof --QUIT-AT-EOF + Quit at end of file. + -f ........ --force + Force open non-regular files. + -F ........ --quit-if-one-screen + Quit if entire file fits on first screen. + -g ........ --hilite-search + Highlight only last match for searches. + -G ........ --HILITE-SEARCH + Don't highlight any matches for searches. + -h [_N] .... --max-back-scroll=[_N] + Backward scroll limit. + -i ........ --ignore-case + Ignore case in searches that do not contain uppercase. + -I ........ --IGNORE-CASE + Ignore case in all searches. + -j [_N] .... --jump-target=[_N] + Screen position of target lines. + -J ........ --status-column + Display a status column at left edge of screen. + -k [_f_i_l_e] . --lesskey-file=[_f_i_l_e] + Use a lesskey file. + -K --quit-on-intr + Exit less in response to ctrl-C. + -L ........ --no-lessopen + Ignore the LESSOPEN environment variable. + -m -M .... --long-prompt --LONG-PROMPT + Set prompt style. + -n -N .... --line-numbers --LINE-NUMBERS + Don't use line numbers. + -o [_f_i_l_e] . --log-file=[_f_i_l_e] + Copy to log file (standard input only). + -O [_f_i_l_e] . --LOG-FILE=[_f_i_l_e] + Copy to log file (unconditionally overwrite). + -p [_p_a_t_t_e_r_n] --pattern=[_p_a_t_t_e_r_n] + Start at pattern (from command line). + -P [_p_r_o_m_p_t] --prompt=[_p_r_o_m_p_t] + Define new prompt. + -q -Q .... --quiet --QUIET --silent --SILENT + Quiet the terminal bell. + -r -R .... --raw-control-chars --RAW-CONTROL-CHARS + Output "raw" control characters. + -s ........ --squeeze-blank-lines + Squeeze multiple blank lines. + -S ........ --chop-long-lines + Chop (truncate) long lines rather than wrapping. + -t [_t_a_g] .. --tag=[_t_a_g] + Find a tag. + -T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e] + Use an alternate tags file. + -u -U .... --underline-special --UNDERLINE-SPECIAL + Change handling of backspaces. + -V ........ --version + Display the version number of "less". + -w ........ --hilite-unread + Highlight first new line after forward-screen. + -W ........ --HILITE-UNREAD + Highlight first new line after any forward movement. + -x [_N[,...]] --tabs=[_N[,...]] + Set tab stops. + -X ........ --no-init + Don't use termcap init/deinit strings. + -y [_N] .... --max-forw-scroll=[_N] + Forward scroll limit. + -z [_N] .... --window=[_N] + Set size of window. + -" [_c[_c]] . --quotes=[_c[_c]] + Set shell quote characters. + -~ ........ --tilde + Don't display tildes after end of file. + -# [_N] .... --shift=[_N] + Horizontal scroll amount (0 = one half screen width) + ........ --no-keypad + Don't send termcap keypad init/deinit strings. + ........ --follow-name + The F command changes files if the input file is renamed. + ........ --use-backslash + Subsequent options use backslash as escape char. + + + --------------------------------------------------------------------------- + + LLIINNEE EEDDIITTIINNGG + + These keys can be used to edit text being entered + on the "command line" at the bottom of the screen. + + RightArrow ..................... ESC-l ... Move cursor right one character. + LeftArrow ...................... ESC-h ... Move cursor left one character. + ctrl-RightArrow ESC-RightArrow ESC-w ... Move cursor right one word. + ctrl-LeftArrow ESC-LeftArrow ESC-b ... Move cursor left one word. + HOME ........................... ESC-0 ... Move cursor to start of line. + END ............................ ESC-$ ... Move cursor to end of line. + BACKSPACE ................................ Delete char to left of cursor. + DELETE ......................... ESC-x ... Delete char under cursor. + ctrl-BACKSPACE ESC-BACKSPACE ........... Delete word to left of cursor. + ctrl-DELETE .... ESC-DELETE .... ESC-X ... Delete word under cursor. + ctrl-U ......... ESC (MS-DOS only) ....... Delete entire line. + UpArrow ........................ ESC-k ... Retrieve previous command line. + DownArrow ...................... ESC-j ... Retrieve next command line. + TAB ...................................... Complete filename & cycle. + SHIFT-TAB ...................... ESC-TAB Complete filename & reverse cycle. + ctrl-L ................................... Complete filename, list all. + + diff --git a/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md b/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md new file mode 100644 index 0000000000..b4ddb4497c --- /dev/null +++ b/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md @@ -0,0 +1,144 @@ +Linux 有问必答： 如何在Ubuntu或者Debian中下载和安装ixgbe驱动 +================================================================================ +> **提问**： 我想为我的Intel 10G网卡下载安装最新的ixgbe。我该如何在Ubuntu（或者Debian）中安装ixgbe驱动？ + +Intel的10G网卡（比如，82598、 82599、 x540）由ixgbe驱动支持。现代的Linux发版已经将ixgbe作为一个可加载模块。然而，有些情况你不想要你机器上的已经编译和安装的ixgbe驱动。比如，你想要体验ixbge驱动的最新特性。同样，自带内核中的ixgbe中的一个默认问题是不允许你自定义旭东内核参数。如果你想要完全自动一ixgbe驱动（比如 RSS、多队列、中断阈值等等），你需要手动从源码编译ixgbe驱动。 + +这里是如何在Ubuntu、Debian或者它们的衍生版中下载安装ixgbe驱动。 + +### 第一步： 安装前提 ### + +安装之前，需要安装匹配的内核头文件和开发工具包。 + + $ sudo apt-get install linux-headers-$(uname -r) + $ sudo apt-get install gcc make + +### 第二步： 编译Ixgbe驱动 ### + +从[最新的ixgbe驱动][1]中下载源码。 + + $ wget http://sourceforge.net/projects/e1000/files/ixgbe%20stable/3.23.2/ixgbe-3.23.2.tar.gz + +如下编译ixgbe驱动。 + + $ tar xvfvz ixgbe-3.23.2.tar.gz + $ cd ixgbe-3.23.2/src + $ make + +### 第三步： 检查Ixgbe驱动 ### + +编译之后，你会看到在ixgbe-3.23.2/src目录下创建了**ixgbe.ko**。这就是会加载到内核之中的ixgbe驱动。 + +用modinfo命令检查内核模块的信息。注意你需要指定模块的绝对路径（比如 ./ixgbe.ko 或者 /home/xmodulo/ixgbe/ixgbe-3.23.2/src/ixgbe.ko）。输出中会显示ixgbe内核的版本。 + + $ modinfo ./ixgbe.ko + +---------- + + filename: /home/xmodulo/ixgbe/ixgbe-3.23.2/src/ixgbe.ko + version: 3.23.2 + license: GPL + description: Intel(R) 10 Gigabit PCI Express Network Driver + author: Intel Corporation, + srcversion: 2ADA5E537923E983FA9DAE2 + alias: pci:v00008086d00001560sv*sd*bc*sc*i* + alias: pci:v00008086d00001558sv*sd*bc*sc*i* + alias: pci:v00008086d0000154Asv*sd*bc*sc*i* + alias: pci:v00008086d00001557sv*sd*bc*sc*i* + alias: pci:v00008086d0000154Fsv*sd*bc*sc*i* + alias: pci:v00008086d0000154Dsv*sd*bc*sc*i* + alias: pci:v00008086d00001528sv*sd*bc*sc*i* + alias: pci:v00008086d000010F8sv*sd*bc*sc*i* + alias: pci:v00008086d0000151Csv*sd*bc*sc*i* + alias: pci:v00008086d00001529sv*sd*bc*sc*i* + alias: pci:v00008086d0000152Asv*sd*bc*sc*i* + alias: pci:v00008086d000010F9sv*sd*bc*sc*i* + alias: pci:v00008086d00001514sv*sd*bc*sc*i* + alias: pci:v00008086d00001507sv*sd*bc*sc*i* + alias: pci:v00008086d000010FBsv*sd*bc*sc*i* + alias: pci:v00008086d00001517sv*sd*bc*sc*i* + alias: pci:v00008086d000010FCsv*sd*bc*sc*i* + alias: pci:v00008086d000010F7sv*sd*bc*sc*i* + alias: pci:v00008086d00001508sv*sd*bc*sc*i* + alias: pci:v00008086d000010DBsv*sd*bc*sc*i* + alias: pci:v00008086d000010F4sv*sd*bc*sc*i* + alias: pci:v00008086d000010E1sv*sd*bc*sc*i* + alias: pci:v00008086d000010F1sv*sd*bc*sc*i* + alias: pci:v00008086d000010ECsv*sd*bc*sc*i* + alias: pci:v00008086d000010DDsv*sd*bc*sc*i* + alias: pci:v00008086d0000150Bsv*sd*bc*sc*i* + alias: pci:v00008086d000010C8sv*sd*bc*sc*i* + alias: pci:v00008086d000010C7sv*sd*bc*sc*i* + alias: pci:v00008086d000010C6sv*sd*bc*sc*i* + alias: pci:v00008086d000010B6sv*sd*bc*sc*i* + depends: ptp,dca + vermagic: 3.11.0-19-generic SMP mod_unload modversions + parm: InterruptType:Change Interrupt Mode (0=Legacy, 1=MSI, 2=MSI-X), default IntMode (deprecated) (array of int) + parm: IntMode:Change Interrupt Mode (0=Legacy, 1=MSI, 2=MSI-X), default 2 (array of int) + parm: MQ:Disable or enable Multiple Queues, default 1 (array of int) + parm: DCA:Disable or enable Direct Cache Access, 0=disabled, 1=descriptor only, 2=descriptor and data (array of int) + parm: RSS:Number of Receive-Side Scaling Descriptor Queues, default 0=number of cpus (array of int) + parm: VMDQ:Number of Virtual Machine Device Queues: 0/1 = disable, 2-16 enable (default=8) (array of int) + parm: max_vfs:Number of Virtual Functions: 0 = disable (default), 1-63 = enable this many VFs (array of int) + parm: VEPA:VEPA Bridge Mode: 0 = VEB (default), 1 = VEPA (array of int) + parm: InterruptThrottleRate:Maximum interrupts per second, per vector, (0,1,956-488281), default 1 (array of int) + parm: LLIPort:Low Latency Interrupt TCP Port (0-65535) (array of int) + parm: LLIPush:Low Latency Interrupt on TCP Push flag (0,1) (array of int) + parm: LLISize:Low Latency Interrupt on Packet Size (0-1500) (array of int) + parm: LLIEType:Low Latency Interrupt Ethernet Protocol Type (array of int) + parm: LLIVLANP:Low Latency Interrupt on VLAN priority threshold (array of int) + parm: FdirPballoc:Flow Director packet buffer allocation level: + 1 = 8k hash filters or 2k perfect filters + 2 = 16k hash filters or 4k perfect filters + 3 = 32k hash filters or 8k perfect filters (array of int) + parm: AtrSampleRate:Software ATR Tx packet sample rate (array of int) + parm: FCoE:Disable or enable FCoE Offload, default 1 (array of int) + parm: LRO:Large Receive Offload (0,1), default 1 = on (array of int) + parm: allow_unsupported_sfp:Allow unsupported and untested SFP+ modules on 82599 based adapters, default 0 = Disable (array of int) + +### 第四步： 测试Ixgbe驱动 ### + +在测试新的模块之前，如果你内核中已存在旧版本ixgbe模块的话你需要先移除它。 + + $ sudo rmmod ixgbe + +接着使用insmod命令插入新编译的ixgbe模块。确保指定一个模块的绝对路径。 + + $ sudo insmod ./ixgbe.ko + +如果上面的命令成功运行，就不会显示任何的信息。 + +如果你需要，你可以尝试加入额外的参数。比如，设置RSS的队列数量为16： + + $ sudo insmod ./ixgbe.ko RSS=16 + +检查**/var/log/kern.log**来查看ixgbe驱动是否成功激活。查看日志中的“Intel(R) 10 Gigabit PCI Express Network Driver”。ixgbe的版本信息应该和之前的modinfo的显示应该相同。 + + Sep 18 14:48:52 spongebob kernel: [684717.906254] Intel(R) 10 Gigabit PCI Express Network Driver - version 3.22.3 + +![](https://farm8.staticflickr.com/7583/16056721867_f06e152076_c.jpg) + +### 第五步： 安装Ixgbe驱动 ### + +一旦你验证新的ixgbe驱动已经成功家在，最后一步是在你的系统中安装驱动。 + + $ sudo make install + +**ixgbe.ko** 接着会安装在/lib/modules//kernel/drivers/net/ethernet/intel/ixgbe 下。 + +这一步起，你可以用下面的modprobe命令加载ixgbe驱动了。注意你不必再指定绝对路径。 + + $ sudo modprobe ixgbe + +如果你希望在启动时家在ixgbe驱动，你可以在/etc/modules的最后加入“ixgbe”。 + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/download-install-ixgbe-driver-ubuntu-debian.html + +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://sourceforge.net/projects/e1000/files/ixgbe%20stable/ \ No newline at end of file From bc7ce33625855335719065818a808d5a54e2e1b1 Mon Sep 17 00:00:00 2001 From: "Xingyu.Wang" Date: Sun, 25 Jan 2015 19:54:36 +0800 Subject: [PATCH 021/207] Revert "translated" --- ated]12 - The history of Android.md | 7113 ----------------- gihua | 232 - ...nstall ixgbe driver on Ubuntu or Debian.md | 144 - 3 files changed, 7489 deletions(-) delete mode 100644 ated]12 - The history of Android.md delete mode 100644 gihua delete mode 100644 translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md diff --git a/ated]12 - The history of Android.md b/ated]12 - The history of Android.md deleted file mode 100644 index 346158bb9f..0000000000 --- a/ated]12 - The history of Android.md +++ /dev/null @@ -1,7113 +0,0 @@ -commit bf5b9619d554c254c9c07ee8bbe37d99a370db3e -Author: zhengsihua -Date: Sun Jan 25 13:23:45 2015 +0800 - - translating - -commit 68e5ad658a4c3497449c31a7eadbb0516baa76ff -Author: zhengsihua -Date: Sat Jan 24 13:58:59 2015 +0800 - - translated - -commit 126d103bec40f9338a28caf048d87980e7ff81e6 -Author: zhengsihua -Date: Sat Jan 24 13:12:58 2015 +0800 - - translating - -commit 55b5a17d77b048219177e1f237b552265c8735c9 -Merge: b90b0e6 cadf2b8 -Author: geekpi -Date: Sat Jan 24 13:03:24 2015 +0800 - - Merge pull request #2284 from alim0x/master - - [translated]12 - The history of Android.md - -commit cadf2b8e6082cb045322d6e5be11a90507971255 -Author: alim0x -Date: Sat Jan 24 12:34:03 2015 +0800 - - [translated]12 - The history of Android.md - -commit b90b0e6f2ffeeb15b474ef6852be052e0d0e9500 -Author: wxy -Date: Sat Jan 24 12:05:53 2015 +0800 - - PUB:20150106 2015--Open Source Has Won, But It Isn't Finished - - @runningwater - -commit 50d77b9f32e77cbba25eeb2e45e8da67007edfb6 -Merge: 4a3d1c2 289fc1d -Author: Xingyu.Wang -Date: Sat Jan 24 11:07:54 2015 +0800 - - Merge pull request #2283 from H-mudcup/master - - Translated by H-mudcup - -commit 289fc1d826a678fedff1560206892285acc0ebfb -Author: H-mudcup -Date: Fri Jan 23 18:36:05 2015 +0800 - - Create 20140819 Top 4 Linux download managers.md - -commit bf37e3ff9f772207e81c6fc068cdf208c895f087 -Author: H-mudcup -Date: Fri Jan 23 18:32:47 2015 +0800 - - Delete 20140819 Top 4 Linux download managers.md - -commit 9c944371295fcb6a457e83aafe05661aaf478c2b -Merge: fa817df 4a3d1c2 -Author: H-mudcup -Date: Fri Jan 23 18:32:18 2015 +0800 - - Merge pull request #10 from LCTT/master - - 同步2015/1/23 - -commit 4a3d1c216ff31c3a9c3321b8c6c7e8aa16408192 -Author: DeadFire -Date: Fri Jan 23 16:42:05 2015 +0800 - - 20150123-1 选题 - -commit 9af2bba9121ad68f25bda387a5f724455726096b -Merge: b4b4c28 c77b9e2 -Author: Xingyu.Wang -Date: Fri Jan 23 16:20:22 2015 +0800 - - Merge pull request #2280 from Vic020/master - - Translated:20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04 - -commit b4b4c28b2c6f349a3b072b8e75d149b38ca6aba9 -Merge: 97cda34 cbf2f00 -Author: Xingyu.Wang -Date: Fri Jan 23 16:19:45 2015 +0800 - - Merge pull request #2279 from 2q1w2007/master - - 选题 - 格式中建议采用 H3标题，如果嵌套层次多，可增加 H2标题；层次非常多，可以使用 H1,H4。 - -commit 97cda347ce7856d5c47961c0ef406753f8611746 -Merge: 6852399 50ee769 -Author: geekpi -Date: Fri Jan 23 10:35:05 2015 +0800 - - Merge pull request #2282 from geekpi/master - - translated - -commit 50ee769861dc59c053936d466ad6d6e8e0c28713 -Author: zhengsihua -Date: Fri Jan 23 10:34:07 2015 +0800 - - translated - -commit 685239920ac7ac540f3d706414bbcaff333c800e -Merge: fa6a21a 955219b -Author: geekpi -Date: Fri Jan 23 10:00:57 2015 +0800 - - Merge pull request #2281 from geekpi/master - - translating - -commit 955219b1a8180109f20917d4bcb122afe8383be1 -Author: zhengsihua -Date: Fri Jan 23 09:55:35 2015 +0800 - - translating - -commit c77b9e2e2cebef2f195f95d8e2c8137b258ea123 -Author: Vic___ -Date: Fri Jan 23 00:01:05 2015 +0800 - - Moved - -commit 81fb54a565cfe5452c7e03f8667d3a5ea77340db -Author: Vic___ -Date: Fri Jan 23 00:00:02 2015 +0800 - - translated - -commit cbf2f006fb4063cce55ca4e0bdc3e59fb0aa0d27 -Author: 2q1w2007 <2q1w2007@163.com> -Date: Thu Jan 22 23:07:38 2015 +0800 - - 选题 - How are C data types “supported directly by most computers”? - -commit 50c09bde87772124167a544d1062ee55c661ad44 -Merge: d54627b fa6a21a -Author: Junkai <2q1w2007@users.noreply.github.com> -Date: Thu Jan 22 23:02:20 2015 +0800 - - Merge pull request #2 from LCTT/master - - 2015/01/22 - -commit fa6a21a32f211a2533ea17b3bb3aeee287bc40c5 -Author: wxy -Date: Thu Jan 22 21:47:59 2015 +0800 - - PUB:How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS - - @SPccman - -commit 7e2774538792356566132b26dc0c1241707c59e7 -Author: wxy -Date: Thu Jan 22 21:22:49 2015 +0800 - - PUB:20141124 Linux blkid Command to Find Block Devices Details - - @felixonmars - -commit 704555fa869bc59295b3b7f2dfd8bc5403dd5b99 -Author: wxy -Date: Thu Jan 22 21:11:33 2015 +0800 - - PUB:20141120 How to install an Opensource VPN Server on Linux - - @geekpi - -commit 7c7ee6a171373f47c53b08cb1cbb174c2695402d -Author: wxy -Date: Thu Jan 22 21:01:22 2015 +0800 - - PUB:20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10 - - @geekpi - -commit 29e887d2951454e8f8ef77d9fb68cf96e0de83ed -Author: wxy -Date: Thu Jan 22 20:54:46 2015 +0800 - - PUB:20141009 How to convert image audio and video formats on Ubuntu - - @mr-ping - -commit f52763aec00abc33afabb57c5cf06887ce5aad5d -Merge: b9039a4 ae6e08a -Author: Xingyu.Wang -Date: Thu Jan 22 20:45:31 2015 +0800 - - Merge pull request #2278 from Stevearzh/master - - Translating by Stevearzh - -commit ae6e08a3757da9deb6542a843556418df4bd1ae0 -Author: Stevearzh -Date: Thu Jan 22 20:04:55 2015 +0800 - - Translating by Stevearzh - -commit b9039a42d65b5e87e7f91c08d49a8ff8d0381a1e -Author: carolinewuyan <309866211@qq.com> -Date: Thu Jan 22 17:14:43 2015 +0800 - - 已校对 - -commit 68c1b1d6aca07856abfe3e68dcfcac413bb4fd64 -Author: DeadFire -Date: Thu Jan 22 16:48:43 2015 +0800 - - 20150122-2 选题 - -commit a64d6616b4c5ef11593682528386abf99efd8a66 -Merge: 4e1caae 88c2152 -Author: Xingyu.Wang -Date: Thu Jan 22 13:53:46 2015 +0800 - - Merge pull request #2277 from Medusar/master - - Rename How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps to How... - -commit 88c2152c5884ebced13ddcd7b2b3a06482f1fe0d -Author: Medusar <939958749@qq.com> -Date: Thu Jan 22 12:10:50 2015 +0800 - - Rename How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps to How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md - - 命名错误，重新命名 - -commit 4e1caae562f96bbc3f88a3349209c78e44d04829 -Author: DeadFire -Date: Thu Jan 22 10:39:22 2015 +0800 - - 20150122-1 选题 - -commit a2a9ed6eeaeecdc934bb08d52039d73aaba93fee -Merge: d368819 933c579 -Author: Xingyu.Wang -Date: Thu Jan 22 10:38:28 2015 +0800 - - Merge pull request #2276 from Medusar/master - - How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps 翻译完毕 - good job - -commit d368819a59fe09269cebdbb670493ebb9c7b8046 -Author: carolinewuyan <309866211@qq.com> -Date: Thu Jan 22 10:15:59 2015 +0800 - - 已校对 - -commit 933c579852d81f20024416a4047a179ccbe3a148 -Author: Medusar <939958749@qq.com> -Date: Wed Jan 21 23:36:16 2015 +0800 - - Create How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps - -commit 287baade1a07d54bcc2fdcc13af8666331fb9782 -Author: Medusar <939958749@qq.com> -Date: Wed Jan 21 23:29:30 2015 +0800 - - Delete 20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md - -commit 8a9bb7c9dd9b275eb4ef0dcbe75c21b7a5cf5c96 -Merge: 041dec3 8254598 -Author: Xingyu.Wang -Date: Wed Jan 21 21:47:09 2015 +0800 - - Merge pull request #2274 from Medusar/master - - Update 20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Ste... - 干得漂亮~ - -commit 041dec383262af6053d677e30e60ee749dc2c3b9 -Merge: 16991e9 f8f56a5 -Author: geekpi -Date: Wed Jan 21 21:26:35 2015 +0800 - - Merge pull request #2275 from geekpi/master - - translated - -commit f8f56a5a5be134027114a52d07053e4c52e3153a -Author: zhengsihua -Date: Wed Jan 21 21:25:40 2015 +0800 - - translated - -commit 82545984d3934ade4d1d5c7faa0bf35e0e9c7415 -Author: Medusar <939958749@qq.com> -Date: Wed Jan 21 21:15:58 2015 +0800 - - Update 20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md - - start translating - -commit 16991e9f47c0c1416533c96be9b01d821a41c5e0 -Merge: 99cbe50 3469c61 -Author: geekpi -Date: Wed Jan 21 20:39:10 2015 +0800 - - Merge pull request #2273 from geekpi/master - - translating - -commit 3469c614d6bf530b78f812acaefbf52c34b6ec92 -Author: zhengsihua -Date: Wed Jan 21 20:37:30 2015 +0800 - - translating - -commit 99cbe5088a5eeda2188c7eb147da6b16ab5a6749 -Merge: 1ce5287 d54627b -Author: Xingyu.Wang -Date: Wed Jan 21 20:12:08 2015 +0800 - - Merge pull request #2271 from 2q1w2007/master - - 两个选题 - 很好~~ - -commit d54627b5f41ec9ec86ecf348c9aa8338b3554e4c -Merge: 1c9a86b 4885bae -Author: 2q1w2007 <2q1w2007@163.com> -Date: Wed Jan 21 20:09:59 2015 +0800 - - Merge branch 'master' of github.com:2q1w2007/TranslateProject - - Conflicts: - sources/talk/20150121 Did this JavaScript break the console.md - sources/talk/20150121 If a 32-bit integer overflows.md - -commit 1c9a86bf197214b3b0fb9ec92e811b4a59d9a557 -Author: 2q1w2007 <2q1w2007@163.com> -Date: Wed Jan 21 20:03:31 2015 +0800 - - 格式修正 - -commit 4885bae1f7c284ec27cdbfbc827b44b9214b20bd -Author: 2q1w2007 <2q1w2007@163.com> -Date: Wed Jan 21 20:03:31 2015 +0800 - - 格式修正 - -commit 1ce52879ddbb05f398ad22a6f819975fbd3d0122 -Merge: 74bd960 489b22b -Author: Xingyu.Wang -Date: Wed Jan 21 19:57:24 2015 +0800 - - Merge pull request #2272 from mtunique/patch-2 - - Translating Linux FAQs with Answers--How to check disk space on Linux wi... - -commit 74bd9601b6b7ab260cb320c96c76af595fffd1ec -Merge: 55f0d49 a9683a8 -Author: Xingyu.Wang -Date: Wed Jan 21 19:54:33 2015 +0800 - - Merge pull request #2270 from ZhouJ-sh/master - - translated 20150119 3 Ways To Create A Lightweight And Persistent Xub… - -commit 489b22badd6f189969741b530d99e3d9bb807ad9 -Author: Tao Meng -Date: Wed Jan 21 19:50:56 2015 +0800 - - Translating Linux FAQs with Answers--How to check disk space on Linux with df command by mtunique - - Translating Linux FAQs with Answers--How to check disk space on Linux with df command by mtunique - -commit 3f513acb8a34415513fe5db053d8de89ffcbdfba -Author: 2q1w2007 <2q1w2007@163.com> -Date: Wed Jan 21 18:59:46 2015 +0800 - - 。。。 - -commit 3679969319489cd184b9150bf6272c00869fd64f -Author: 2q1w2007 <2q1w2007@163.com> -Date: Wed Jan 21 18:58:45 2015 +0800 - - 选题 - Did this JavaScript break the console? - -commit a2894417c911445cca786083971bc23aaa55706b -Author: 2q1w2007 <2q1w2007@163.com> -Date: Wed Jan 21 18:44:31 2015 +0800 - - 选题 - If a 32-bit integer overflows, can we use a 40-bit structure instead of a 64-bit long one? - -commit a9683a8267858fa2ef06528f500897f3de4a1ea3 -Author: ZhouJ-sh <32321321@qq.com> -Date: Wed Jan 21 18:16:51 2015 +0800 - - 修改链接 - -commit 19aa9bc619e1668987695e831f1fd4a99a7903c3 -Author: ZhouJ-sh <32321321@qq.com> -Date: Wed Jan 21 18:10:28 2015 +0800 - - translate complete , delete sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md - -commit d91316c19c6668b82cfabf9f89e4ad07c7193202 -Author: ZhouJ-sh <32321321@qq.com> -Date: Wed Jan 21 18:09:27 2015 +0800 - - translated 20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md - -commit 5cda43ed6cad1dad66f2cdc5ec590650c0d38f3c -Merge: d3bcd51 55f0d49 -Author: Junkai <2q1w2007@users.noreply.github.com> -Date: Wed Jan 21 17:54:40 2015 +0800 - - Merge pull request #1 from LCTT/master - - 2015/01/21 - -commit 55f0d498d452142ec6eee955a3e5ff05905c341e -Author: DeadFire -Date: Wed Jan 21 16:51:17 2015 +0800 - - 20150121-3 选题 - -commit 4fc1280f935e85a2a830e75faed1dd7b72a83291 -Author: DeadFire -Date: Wed Jan 21 16:30:21 2015 +0800 - - 20150121-2 选题 - -commit 9922596791a0c4222418c2c0edbfe8e947100123 -Author: DeadFire -Date: Wed Jan 21 16:18:33 2015 +0800 - - 20150121-1 选题 - -commit f9028e3ece7d2f387e07de5e28cbc589b5ce8fad -Merge: 2b77206 c4526a6 -Author: runningwater -Date: Tue Jan 20 14:47:47 2015 +0800 - - Merge pull request #2269 from runningwater/master - - 翻译中 by runningwater - -commit c4526a6717a525da0030a0f01e9533d1663c9f57 -Author: runningwater -Date: Tue Jan 20 14:47:16 2015 +0800 - - 翻译中 by runningwater - -commit fba1ddb312e304d8e38e3f3e6ad1695e68af14e3 -Merge: 110ad52 2b77206 -Author: ZhouJ-sh <32321321@qq.com> -Date: Tue Jan 20 11:05:36 2015 +0800 - - Merge pull request #5 from LCTT/master - - Merge from base - -commit 2b772067f3624d4b78915f3472754a6305e60c9b -Merge: 7c1edfc 0aac3e8 -Author: geekpi -Date: Tue Jan 20 11:00:03 2015 +0800 - - Merge pull request #2268 from geekpi/master - - translated - -commit 0aac3e8dafbcda297145ba6625e7cee42d099ced -Author: zhengsihua -Date: Tue Jan 20 10:57:34 2015 +0800 - - translated - -commit 7c1edfc305892eb6ed1f32bc9ccee9f53652cfce -Merge: c09a40b ca2eb1e -Author: runningwater -Date: Tue Jan 20 10:53:30 2015 +0800 - - Merge pull request #2267 from runningwater/master - - 翻译完成 - -commit c09a40bf52ce7d567329f185d12e872fd6f4ff1e -Merge: 1338477 fa817df -Author: runningwater -Date: Tue Jan 20 10:53:09 2015 +0800 - - Merge pull request #2264 from H-mudcup/master - - Translating By H-mudcup - -commit 1338477db8be3a3c754fa4a479ba20d14d1e5cbe -Merge: 37805f4 110ad52 -Author: runningwater -Date: Tue Jan 20 10:52:40 2015 +0800 - - Merge pull request #2263 from ZhouJ-sh/master - - translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md & delete source - -commit 37805f4777e6242b34c5db36a4ed6aa77819cd29 -Merge: 1182827 7423976 -Author: runningwater -Date: Tue Jan 20 10:51:54 2015 +0800 - - Merge pull request #2262 from alim0x/master - - [translaing]the haistory of android - 12 - -commit ca2eb1e0b8a4d06d4522b5c04a6b93fcf43fa9dc -Author: runningwater -Date: Tue Jan 20 10:50:16 2015 +0800 - - 翻译完成 - -commit 11828279c7b3667a1f8fe17b669857557ebc17db -Merge: dab09ae f155e6d -Author: geekpi -Date: Tue Jan 20 09:56:17 2015 +0800 - - Merge pull request #2266 from geekpi/master - - translating - -commit f155e6d8fa0ae090b51e4df91296cca3923dbe45 -Author: zhengsihua -Date: Tue Jan 20 09:55:27 2015 +0800 - - translating - -commit dab09aefe73cc5aa80320c6740702faa7e4990df -Merge: 7248f82 06dedac -Author: geekpi -Date: Tue Jan 20 09:54:23 2015 +0800 - - Merge pull request #2265 from geekpi/master - - translated - -commit 06dedaca1de4aeb018a4d81b5d6cf5046b43e6d6 -Author: zhengsihua -Date: Tue Jan 20 09:53:28 2015 +0800 - - translated - -commit 637598d6a8bcf23692ca448412c14e1867add9cf -Author: zhengsihua -Date: Tue Jan 20 09:43:03 2015 +0800 - - translating - -commit 7248f8228ce3303fc78518d2cc2c538ba4b4614d -Author: DeadFire -Date: Mon Jan 19 22:48:00 2015 +0800 - - 20150119-4 选题 - -commit fa817dfe19628deb9fc32f06c8edc71b844fe52a -Author: H-mudcup -Date: Mon Jan 19 22:47:42 2015 +0800 - - Update 20140819 Top 4 Linux download managers.md - -commit 93a9c1690ac23f6a67c875dbc9eac42486071341 -Merge: 01a0a41 77c1b7b -Author: H-mudcup -Date: Mon Jan 19 22:45:28 2015 +0800 - - Merge pull request #9 from LCTT/master - - 同步2015/1/19 - -commit 77c1b7baf03cedf96e0cf245ab74f7097f255db9 -Author: DeadFire -Date: Mon Jan 19 22:44:19 2015 +0800 - - 20150119-3 选题 - -commit 2d08d1cdd3663bb88c20de5b86c520c50b4dab47 -Author: DeadFire -Date: Mon Jan 19 22:32:09 2015 +0800 - - 20150119-2 选题 - -commit 8dd8c387bd862de9f683fadf99cea96bb38b13c6 -Author: DeadFire -Date: Mon Jan 19 22:22:41 2015 +0800 - - 20150119-1 选题 - -commit 110ad520ff023e1204aa6192bda34821254ef9d8 -Author: ZhouJ-sh <32321321@qq.com> -Date: Mon Jan 19 18:39:31 2015 +0800 - - 调整部分细节 - -commit a75a14f9fa77c5e1f666976a5bfb352fe38495be -Author: ZhouJ-sh <32321321@qq.com> -Date: Mon Jan 19 18:03:58 2015 +0800 - - translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md - -commit 8bae3c1a249e51dd003a2b2ce507fef4ce802874 -Author: ZhouJ-sh <32321321@qq.com> -Date: Mon Jan 19 17:51:07 2015 +0800 - - translate complete. delete sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md - -commit f1336ab9e6b9d601737220a06b08c4e90a610408 -Author: ZhouJ-sh <32321321@qq.com> -Date: Mon Jan 19 17:50:28 2015 +0800 - - translating sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md - -commit e0d0557fa4b4945487ae3a4d8363e430bb125b35 -Author: ZhouJ-sh <32321321@qq.com> -Date: Mon Jan 19 16:10:28 2015 +0800 - - translating by zhouj-sh - -commit 79a6d05c27969d5bdf0d8d7139faf65c30b5187e -Author: ZhouJ-sh <32321321@qq.com> -Date: Mon Jan 19 14:36:42 2015 +0800 - - add sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md - -commit 814f81b13d9b64295235211ddeab00da9d9d4fa0 -Author: ZhouJ-sh <32321321@qq.com> -Date: Mon Jan 19 13:56:53 2015 +0800 - - delete sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md - -commit 74239768b1e788c60e78bc226ea01631d5c42f1b -Author: alim0x -Date: Mon Jan 19 13:45:03 2015 +0800 - - [translaing]the haistory of android - 12 - -commit b84066519448846da033ddb2ddb5450e91e23aeb -Merge: 0bed6db b56f724 -Author: joeren -Date: Mon Jan 19 13:43:06 2015 +0800 - - Merge pull request #2261 from ly0/patch-1 - - [Translating]What is good audio editing software on Linux - -commit b56f724ca227d0ba74c86283513b746ef89c19f4 -Author: latyas(懒) -Date: Mon Jan 19 13:42:23 2015 +0800 - - [Translating]What is good audio editing software on Linux - -commit 0c4ad0bc8e79e28c1f7f8ccf805708829baa8ea9 -Author: ZhouJ-sh <32321321@qq.com> -Date: Mon Jan 19 12:05:39 2015 +0800 - - translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md - -commit 0bed6db0157ef60fe4873130f79106558b9a48be -Author: wxy -Date: Mon Jan 19 10:42:09 2015 +0800 - - PUB:20150104 Docker Image Insecurity - - @tinyeyeser - -commit 7e84dad563b118543cb724b2adffdd471b1dfd2d -Author: wxy -Date: Mon Jan 19 10:22:17 2015 +0800 - - PUB:20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem - - @geekpi - -commit a01b43d76a35dc3584bbfc268ebb5d64101c00aa -Author: wxy -Date: Mon Jan 19 10:09:17 2015 +0800 - - PUB:20141120 How to configure and secure your Postfix email server - - @GOLinux - -commit a881635bda06eae899f39ffebdd452db3077bf5f -Author: wxy -Date: Sun Jan 18 23:33:24 2015 +0800 - - PUB:20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X - - @runningwater - -commit 2432f8ac8c5add7f23e13a846cd7157872763c45 -Author: wxy -Date: Sun Jan 18 23:16:40 2015 +0800 - - PUB:20141204 How To Delete Oracle 11g Database Manually - - @geekpi - -commit 61a511d27f039dc97cdfa2be05d4f4808f3b1d7c -Author: wxy -Date: Sun Jan 18 23:08:36 2015 +0800 - - PUB:20141127 Five Magnificent Linux Music Streaming Clients - - @Stevearzh - -commit d952637700af776b9ed1687aa3c6d782b7cd579e -Author: wxy -Date: Sun Jan 18 22:57:21 2015 +0800 - - PUB:20141224 Calife--A lightweight alternative to sudo - - @GOLinux - -commit 0e5f7070dec047ef4ce04d5a0dadd776383dc683 -Merge: 1023fcc 208bdf9 -Author: Xingyu.Wang -Date: Sun Jan 18 22:39:33 2015 +0800 - - Merge pull request #2259 from SPccman/master - - How to Manage Network using nmcli Tool in RedHat / CentOS 7.x - 下回文件名前面的日期不要去掉哦~ - -commit 208bdf9f160225edb96062352f7fe826e3c42ac9 -Author: DoubleC <450760206@qq.com> -Date: Sun Jan 18 21:00:20 2015 +0800 - - 翻译完成 - - 翻译完成 - -commit 86f317ce86abb9ffa8b4977f2606a081e95b315d -Author: DoubleC <450760206@qq.com> -Date: Sun Jan 18 20:49:03 2015 +0800 - - delete source file - - delete source file - -commit 58620a3f1867fe11bf150d09bd3905693f4e2900 -Merge: 6e31b7e 1023fcc -Author: DoubleC <450760206@qq.com> -Date: Sun Jan 18 20:44:31 2015 +0800 - - Merge pull request #14 from LCTT/master - - update - -commit 1023fcc74db9a67fb49c05db1e03fe46d0ae35d7 -Merge: a76be45 923230a -Author: geekpi -Date: Sun Jan 18 15:29:18 2015 +0800 - - Merge pull request #2258 from geekpi/master - - translated - -commit 923230af5674e243a2d2168d5c6634c5c17db3c5 -Author: zhengsihua -Date: Sun Jan 18 15:27:49 2015 +0800 - - translated - -commit a76be45006eda702f23a0667dd243cac1262d53b -Merge: a7d2226 d3017c1 -Author: geekpi -Date: Sun Jan 18 15:24:59 2015 +0800 - - Merge pull request #2257 from geekpi/master - - translated - -commit d3017c1855d2b0fae4ecb8bae59243c442843530 -Merge: 45126b5 a7d2226 -Author: zhengsihua -Date: Sun Jan 18 15:20:49 2015 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit a7d222693082f1e586c6189398d1bcb1a38f8f81 -Author: geekpi -Date: Sun Jan 18 14:42:22 2015 +0800 - - Update 20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md - -commit 46b43e0ba81c5262d58afb42b4b2aa7d8385e4a1 -Author: wxy -Date: Sun Jan 18 12:59:52 2015 +0800 - - PUB:20140701 Easy File Comparisons With These Great Free Diff Tools - - @H-mudcup - -commit 1610b8f56b0f5ef07e25681a73ad32c9ea00f52b -Author: wxy -Date: Sun Jan 18 12:15:46 2015 +0800 - - 清除过期文章 - -commit 8e154021a807b16cabbcf9bc015899d7b3fa1421 -Merge: 275ab86 279ea5f -Author: Xingyu.Wang -Date: Sun Jan 18 12:08:18 2015 +0800 - - Merge pull request #2256 from Vic020/patch-27 - - Vic020 - -commit 279ea5f48922cfad3caaeaae719b50a4b9057cac -Author: Vic___ -Date: Sat Jan 17 22:44:53 2015 +0800 - - Vic020 - -commit 275ab86f82e3082f2f288dd312eef9dff35baa27 -Merge: 4fc4bf9 efc8353 -Author: Xingyu.Wang -Date: Sat Jan 17 22:20:50 2015 +0800 - - Merge pull request #2251 from ZhouJ-sh/master - - 选题 20150116 A Step By Step Guide To Installing Xubuntu Linux.md - -commit 45126b50e27e224f0b4a04865c14c4bdc3c84c70 -Author: zhengsihua -Date: Sat Jan 17 14:39:14 2015 +0800 - - translated - -commit 4fc4bf9a34b606450158714ea64f95710dca0bea -Merge: c4991f8 4d9c0d7 -Author: geekpi -Date: Sat Jan 17 14:27:39 2015 +0800 - - Merge pull request #2255 from geekpi/master - - translating - -commit 4d9c0d7c9994a7663c87c8a165ed1dd89339f5f4 -Author: zhengsihua -Date: Sat Jan 17 14:26:02 2015 +0800 - - translating - -commit c4991f839164ffa5e4ad59ca794255d780d8a933 -Merge: 0bdc527 1b6d810 -Author: geekpi -Date: Sat Jan 17 14:21:04 2015 +0800 - - Merge pull request #2254 from SPccman/patch-14 - - SPccman translating - -commit 1b6d81032f650e86354b8c20aa84af3afc5918df -Author: DoubleC <450760206@qq.com> -Date: Sat Jan 17 11:14:26 2015 +0800 - - SPccman translating - - 申领文章 - -commit 0bdc52765db5225d49f26c334af7c6a7842f8f3e -Merge: 0d6eba4 474941f -Author: geekpi -Date: Fri Jan 16 21:21:20 2015 +0800 - - Merge pull request #2253 from geekpi/master - - translating - -commit 474941fb36cc81b21c9aee9ee40b705a189d935e -Author: zhengsihua -Date: Fri Jan 16 21:20:02 2015 +0800 - - translating - -commit 0d6eba4dabb9c23edadac78b1df52a763244e4cc -Merge: 125d5e4 c9b90bf -Author: geekpi -Date: Fri Jan 16 21:10:13 2015 +0800 - - Merge pull request #2252 from geekpi/master - - translating - -commit c9b90bfdf16fc793ff45e05416fcf1d98b3b0096 -Author: zhengsihua -Date: Fri Jan 16 21:09:31 2015 +0800 - - translating - -commit efc83533565aef0b678a44f1cd5c64822567535e -Author: ZhouJ-sh <32321321@qq.com> -Date: Fri Jan 16 16:58:18 2015 +0800 - - 选题 20150116 A Step By Step Guide To Installing Xubuntu Linux.md - -commit 125d5e4481d54242560df88db01e188fcdd700ba -Author: wxy -Date: Fri Jan 16 16:51:03 2015 +0800 - - PUB:20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server - - @liaoishere - -commit e5f83b245af974340cd1337043f2bfdf474735c3 -Author: wxy -Date: Fri Jan 16 16:22:30 2015 +0800 - - PUB:20141119 Smartctl--Monitoring & Analysis tool for Hard drive - - @GOLinux - -commit 8317c05e54f688d8eb1c6517506a69fbd99738ad -Author: wxy -Date: Fri Jan 16 15:28:06 2015 +0800 - - 补充删除 - - @ZhouJ-sh - -commit 71de35194d0a09652f9af2492fa4259eb90ad8b0 -Merge: e7664c4 1c661ba -Author: Xingyu.Wang -Date: Fri Jan 16 15:23:09 2015 +0800 - - Merge pull request #2248 from ZhouJ-sh/master - - 选题&翻译 20150115 How To Run Linux Applications From The Terminal In Background Mode.md - - 您好，非常感谢您的翻译和选题。有一点小问题，请您下次稍微注意下： - 您这个翻译，是一次性提交了选题和译文，为了保持原文参考，您没有删除原文，但是这样您的原文就没人删除了。 - 所以，建议您，选题单独一个 PR，翻译的译文（包括删除选题的原文）再来一个 PR，并拉开时间差比较好。 - - 此外，您这里把上一个翻译的原文给删除了，其实应该在上次提交译文时候删除——这个也是我疏忽了，我当时应该给补充删除的。 - 这次的这个 PR 的原文，我稍后会帮您删除。 - - 再次，感谢您的参与和奉献~ - -commit e7664c48501fbbc6ba71385c15745d60239b7026 -Merge: d751ace e84846c -Author: geekpi -Date: Fri Jan 16 11:47:10 2015 +0800 - - Merge pull request #2250 from geekpi/master - - translated - -commit e84846cf7b1eef7028fb5330650bc94565b9382d -Author: zhengsihua -Date: Fri Jan 16 11:45:10 2015 +0800 - - translated - -commit d751ace8baabd7be1740a3b4334f0bf709570e56 -Merge: 0e24355 a1d3bd8 -Author: geekpi -Date: Fri Jan 16 10:10:43 2015 +0800 - - Merge pull request #2249 from geekpi/master - - translating - -commit a1d3bd813f5aedb9eab5e3f5427ebb0f38700358 -Author: zhengsihua -Date: Fri Jan 16 10:09:49 2015 +0800 - - translating - -commit 0e2435557d47ab8d7449bf4b4a19afe02e2ccc8c -Author: DeadFire -Date: Thu Jan 15 23:24:02 2015 +0800 - - 20150115-5 更新前面-3过长的文件名 - -commit 585da02c61dcdb83345110ae2f181f1240536fb6 -Author: DeadFire -Date: Thu Jan 15 23:21:52 2015 +0800 - - 20150115-4 更新前面文件名后缀。为何-3选题显示不了？ - -commit 0a1a2a86d11cc620cc88574c7ef8b8b400882610 -Author: wxy -Date: Thu Jan 15 23:14:01 2015 +0800 - - PUB:Quick systemd-nspawn guide - - @SPccman 翻译的不错 - -commit 38178327ae8a2aa6705257358070d45999f4eb19 -Author: DeadFire -Date: Thu Jan 15 23:11:41 2015 +0800 - - 20150115-3 选题 - -commit 85feb3e7d5facfa3bb3fb712274b5813678bcec6 -Author: wxy -Date: Thu Jan 15 22:47:39 2015 +0800 - - PUB:20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x - - @ZTinoZ - -commit 476e61555682f5ae304239cdb351cbe8dd5bea36 -Author: wxy -Date: Thu Jan 15 22:31:18 2015 +0800 - - PUB:20141224 Linux FAQs with Answers--How to install 7zip on Linux - - @runningwater - -commit 7959c6367d4b491f5ebfa1c31654cc0ccae23a9f -Author: wxy -Date: Thu Jan 15 22:31:02 2015 +0800 - - PUB:20141118 How to boot on an ISO image from Grub - - @GOLinux - -commit ff129b92f9be3eae1ba9bd71bcf84c7c15935d04 -Author: DeadFire -Date: Thu Jan 15 22:26:14 2015 +0800 - - 20150115-2 选题 - -commit d7d9009a1a9b3aab54573b7b09408c766a072a3c -Author: DeadFire -Date: Thu Jan 15 22:08:23 2015 +0800 - - 20150115-1 选题 - -commit 1c661ba3c22ed1b372f547c91990cf8f2dbb37d9 -Author: ZhouJ-sh <32321321@qq.com> -Date: Thu Jan 15 16:05:12 2015 +0800 - - 已出版，删除原文 - -commit 736eaa9596317e6ab526c07d46d9eb70cc0353ad -Author: ZhouJ-sh <32321321@qq.com> -Date: Thu Jan 15 15:46:39 2015 +0800 - - 修改格式错误 - -commit ebf0c22f67fe7cdd325b2ef0a37159b28470c0b9 -Author: ZhouJ-sh <32321321@qq.com> -Date: Thu Jan 15 15:42:50 2015 +0800 - - 翻译 20150115 How To Run Linux Applications From The Terminal In Background Mode.md - -commit 47b4c22a570d836cd1393f3212018ad5d6dd9fde -Author: ZhouJ-sh <32321321@qq.com> -Date: Thu Jan 15 15:42:04 2015 +0800 - - 选题 20150115 How To Run Linux Programs From The Terminal In Background Mode - -commit 46aa7dccbb4c15109c330579ec2e85185fcb65f5 -Merge: 3074417 df75566 -Author: ZhouJ-sh <32321321@qq.com> -Date: Thu Jan 15 11:54:12 2015 +0800 - - Merge pull request #4 from LCTT/master - - Merge from base - -commit df75566eaf80f5e9649245c11eb609c162bdcaaf -Merge: ce45b34 3b0362d -Author: geekpi -Date: Thu Jan 15 10:08:24 2015 +0800 - - Merge pull request #2247 from geekpi/master - - translated - -commit 3b0362d7042c4b18b7459f72afb5b7897c1fa331 -Author: zhengsihua -Date: Thu Jan 15 10:07:42 2015 +0800 - - translated - -commit ce45b341542dd9fa1a07f0b2245748d0b7e2dcfc -Merge: 33250c4 24ce934 -Author: geekpi -Date: Thu Jan 15 09:47:45 2015 +0800 - - Merge pull request #2246 from geekpi/master - - translating - -commit 24ce934e9e8266b0c7fc232cf15095078eccdd8b -Author: zhengsihua -Date: Thu Jan 15 09:47:00 2015 +0800 - - translating - -commit 33250c43af33a8beffcbb7d0cfbadc8e2b2d0282 -Merge: 568a923 fe4a3f1 -Author: geekpi -Date: Thu Jan 15 09:45:40 2015 +0800 - - Merge pull request #2245 from geekpi/master - - translated - -commit fe4a3f1b052d4424982c012f33e709fbe03602f3 -Author: zhengsihua -Date: Thu Jan 15 09:44:59 2015 +0800 - - translated - -commit 568a9237c8afc2ed6627cc6809810b062cd8efb5 -Merge: 8ec8782 449e095 -Author: geekpi -Date: Thu Jan 15 09:32:47 2015 +0800 - - Merge pull request #2244 from geekpi/master - - translating - -commit 449e095f1a9e3d83dd0680cf27bda51db1733e28 -Author: zhengsihua -Date: Thu Jan 15 09:31:29 2015 +0800 - - translating - -commit 8ec87824af266f95c5992d0cc4281d9ac47c580b -Merge: 9c33a4a 63d09ac -Author: geekpi -Date: Thu Jan 15 09:29:41 2015 +0800 - - Merge pull request #2243 from geekpi/master - - translated - -commit 63d09acaf0aecae25cb9746fa010aaa757c77e29 -Author: zhengsihua -Date: Thu Jan 15 09:28:29 2015 +0800 - - translated - -commit 13b29eddae52e3ab264fc4cf8b015beb17c7e899 -Author: zhengsihua -Date: Thu Jan 15 09:27:25 2015 +0800 - - translated - -commit 9c33a4a75d7ccd3d1755b7f0fcb366f27f613b72 -Merge: e0b61b5 d3de17c -Author: geekpi -Date: Thu Jan 15 09:09:02 2015 +0800 - - Merge pull request #2242 from geekpi/master - - translating - -commit d3de17c1c683c527eebdaa0f3e711efddb55dc38 -Author: zhengsihua -Date: Thu Jan 15 09:07:36 2015 +0800 - - translating - -commit e0b61b555a77eb137f776b2af3a18d5d76a1cc2f -Author: wxy -Date: Wed Jan 14 22:57:42 2015 +0800 - - PUB:20141112 How to Debug CPU Regressions Using Flame Graphs - - @coloka 好专业的文章·~ - -commit 1f234cad69e1c1afb009c6a0a7b72e3e7e4eaf46 -Author: DeadFire -Date: Wed Jan 14 22:43:16 2015 +0800 - - 20150114-3 选题 - -commit dcbacad5cf47dcdb36e252a509d6c6c2be4048f9 -Author: DeadFire -Date: Wed Jan 14 22:34:53 2015 +0800 - - 20150114-2 选题 - -commit 84a61c70ff887e54906d84e1d57833d53cc28c98 -Author: wxy -Date: Wed Jan 14 22:34:33 2015 +0800 - - PUB:20141115 What are some obscure but useful Vim commands - - @wangjiezhe 译者注加的非常棒！ - -commit 735b0d58e5f1b99a4f77debfa90f0a4c2aa5c0db -Author: DeadFire -Date: Wed Jan 14 22:18:49 2015 +0800 - - 20150114-1 选题 - -commit 03d18259520456c08d2ee72b3fd42d8ec13ac5a3 -Author: wxy -Date: Wed Jan 14 21:42:54 2015 +0800 - - PUB:20141211 NetHack - - @Stevearzh 翻译的很不错！游戏也很给力！ - -commit 60cfb46909cc8e962163d5bfc0f60aaf75a4a60e -Author: wxy -Date: Wed Jan 14 21:03:28 2015 +0800 - - 该文已有一样的发布了 - - 所以不发布了。 - -commit 6b0663b4fad108e3a6b15ceca4a4817a1435c9da -Author: wxy -Date: Wed Jan 14 21:00:50 2015 +0800 - - PUB:20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu - - @zhouj-sh - -commit c0851408e476a013e233f5f23d3c4dff944b4c42 -Merge: fd7ef3b e043349 -Author: Xingyu.Wang -Date: Wed Jan 14 20:11:28 2015 +0800 - - Merge pull request #2241 from mr-ping/master - - translated by ping - -commit e0433490251776767d7422f51524bd0cbabe6059 -Author: Ping -Date: Wed Jan 14 14:37:27 2015 +0800 - - translated by ping - -commit fd7ef3bc8f6215c69acbefa89261a541cc66b210 -Author: wxy -Date: Wed Jan 14 14:11:38 2015 +0800 - - PUB:20141027 ntpq -p output - - @liaoishere 这篇好专业啊，翻译的很不错！ - -commit 34182d3ae5bf0fcecf5157076704b0c5187bdce1 -Author: wxy -Date: Wed Jan 14 13:41:15 2015 +0800 - - PUB:20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu - - @Vic020 - -commit c0c13b1452365a8c73b6509ff9890586ea381929 -Merge: 42d8398 b59c18c -Author: joeren -Date: Wed Jan 14 10:26:15 2015 +0800 - - Merge pull request #2240 from GOLinux/master - - [Translated]20150106 Managing Linux server configs with the SaltStack.md - -commit b59c18cbfc1269109b3600a8285ec852d44a52e8 -Author: GOLinux -Date: Wed Jan 14 10:24:56 2015 +0800 - - [Translated]20150106 Managing Linux server configs with the SaltStack.md - -commit 42d83980ab03cd446c7d1063c05f49a92bbe31eb -Merge: de44a41 bf6fbe0 -Author: joeren -Date: Wed Jan 14 08:53:47 2015 +0800 - - Merge pull request #2239 from GOLinux/master - - [Translating] 20150106 Managing Linux server configs with the SaltStack.md - -commit bf6fbe01792ce408e3f56e2497b3560fd5461161 -Author: joeren -Date: Wed Jan 14 08:52:41 2015 +0800 - - Update 20150106 Managing Linux server configs with the SaltStack.md - -commit 926f32990429b01bcb5f9326a1ba30484ad8ec12 -Merge: a330de1 de44a41 -Author: joeren -Date: Wed Jan 14 08:50:42 2015 +0800 - - Merge pull request #25 from LCTT/master - - Update Repo - -commit de44a418fa88660941932f66a740879b72c6aea1 -Merge: 543ce85 bd1d995 -Author: joeren -Date: Wed Jan 14 08:49:38 2015 +0800 - - Merge pull request #2238 from mr-ping/master - - [translating]20141009 How to convert image audio and video formats on Ubuntu - -commit bd1d9952167cabd2a4141b70ca590dbe54cf4259 -Merge: e6e93f5 543ce85 -Author: Ping -Date: Wed Jan 14 07:53:01 2015 +0800 - - Merge branch 'master' of github.com:LCTT/TranslateProject into newbranch - -commit e6e93f56b1a7c2253686078fbd5d6c9025ef2d8a -Author: Ping -Date: Wed Jan 14 07:51:53 2015 +0800 - - Translating - -commit 543ce858290e062a755739b17d29a86bec1a4d9b -Author: wxy -Date: Tue Jan 13 22:19:21 2015 +0800 - - PUB:20141226 The Good The Bad And The Ugly Of Linux In 2014 - - @H-mudcup - -commit 71e8d589ccdee219afe87a61bbd0583d09e864bc -Author: wxy -Date: Tue Jan 13 22:01:09 2015 +0800 - - PUB:20140929 What Linux Users Should Know About Open Hardware - - @zpl1025 - -commit 9886fdd41521b85eb3915e84c0ddee58f854fa25 -Author: wxy -Date: Tue Jan 13 20:30:17 2015 +0800 - - PUB:20140928 What is a good subtitle editor on Linux - - @barney-ro - -commit 59a96f897169497efeb57452cb4aacf83fa23582 -Author: wxy -Date: Tue Jan 13 20:22:59 2015 +0800 - - PUB:20141125 Four ways Linux is headed for no-downtime kernel patching - - @coloka - -commit f3196a73ff7b8299d80c00a2c8507c50e0515463 -Author: wxy -Date: Tue Jan 13 20:18:30 2015 +0800 - - 过期，未发布 - - @kingname ，这篇已经远超新闻期限，所以没有发布。抱歉。 - -commit e1cca21879783bb58327368c11f744a51ed3887e -Author: tinyeyeser -Date: Tue Jan 13 15:27:41 2015 +0800 - - 已校对 by小眼儿 - -commit 34219f472beffe97fcd002af3260c2156a37cdf7 -Author: tinyeyeser -Date: Tue Jan 13 15:25:58 2015 +0800 - - 已校对 by小眼儿 - -commit a76e2d7405c677332abe0496425648b9c3ef08af -Author: carolinewuyan <309866211@qq.com> -Date: Tue Jan 13 14:06:57 2015 +0800 - - 已校对 - -commit d1c1f8794ac89086c17b9e43a2d7fd867032db35 -Merge: c3cb2a5 6dcb07d -Author: geekpi -Date: Tue Jan 13 11:59:21 2015 +0800 - - Merge pull request #2237 from geekpi/master - - translated - -commit 6dcb07d9209b867b8e73ded0ef15e3fe7f216a73 -Author: zhengsihua -Date: Tue Jan 13 11:57:38 2015 +0800 - - translated - -commit c3cb2a5dc57b7ae84f206845f8b576eec806f265 -Merge: fed4f09 4b5c782 -Author: geekpi -Date: Tue Jan 13 11:28:47 2015 +0800 - - Merge pull request #2236 from geekpi/master - - translating - -commit 4b5c782737d159ad6694bdbc77b7629f8f658ef3 -Author: zhengsihua -Date: Tue Jan 13 11:27:50 2015 +0800 - - translating - -commit a330de140d606e0c7b316e42d59f384a56e81525 -Merge: ff7a2b0 fed4f09 -Author: joeren -Date: Tue Jan 13 08:20:49 2015 +0800 - - Merge pull request #24 from LCTT/master - - Update Repo - -commit fed4f0962c7a7e6e0c9cf644faa7705e9f1c111c -Merge: baa5806 906b925 -Author: geekpi -Date: Mon Jan 12 22:22:38 2015 +0800 - - Merge pull request #2235 from geekpi/master - - translated - -commit 906b9250f68b24cede6a0ef1c15d73e6f149e301 -Author: zhengsihua -Date: Mon Jan 12 22:21:29 2015 +0800 - - translated - -commit baa58061afeee738e990a0b4a4bc155d11196ba5 -Merge: e4ab9d2 fa37f1d -Author: geekpi -Date: Mon Jan 12 21:31:42 2015 +0800 - - Merge pull request #2234 from geekpi/master - - translating - -commit fa37f1d36d87feac22d7cf7d329c89c4bb337271 -Author: zhengsihua -Date: Mon Jan 12 21:28:33 2015 +0800 - - translating - -commit e4ab9d2c783c25c1823da7c78fb49b1b66c16f7c -Author: DeadFire -Date: Mon Jan 12 16:28:48 2015 +0800 - - 20150112-5 选题 - -commit 084da04255f655f28e59880c705bfec6f061d7a7 -Author: DeadFire -Date: Mon Jan 12 16:16:14 2015 +0800 - - 20150112-4 选题 - -commit 25d2d99051e2c5d7d5dc4cf32b3ecf73573e2923 -Author: wxy -Date: Mon Jan 12 15:57:42 2015 +0800 - - PUB:20141108 When hackers grow old - - @Stevearzh - -commit be147eb7fe0cb9e50940aa4b49618a280245db3e -Author: tinyeyeser -Date: Mon Jan 12 15:08:12 2015 +0800 - - 已校对 by小眼儿 - - 原文真的很硬很难！译者已经翻译的很不错了~ 只是某些语句稍有逻辑上的语义错误。 - 我硬着头皮死啃半天，已尽量校对改正。 - -commit a4c26041aae6254ee0d68d35386bf867788b5e56 -Merge: 83f4ddf a66e60e -Author: joeren -Date: Mon Jan 12 13:43:04 2015 +0800 - - Merge pull request #2233 from kingname/patch-3 - - Delete 20141219 Git 2.2.1 Released To Fix Critical Security Issue.md - -commit 83f4ddfc142743e401cbeb5d8b2f73337f9e71e5 -Merge: 9d07f03 43154bb -Author: joeren -Date: Mon Jan 12 13:42:53 2015 +0800 - - Merge pull request #2232 from kingname/patch-2 - - Git 发布2.2.1版，修复严重安全问题 - -commit a66e60edaa77feb4feaa829983c6cd504912281d -Author: kingname -Date: Mon Jan 12 13:35:01 2015 +0800 - - Delete 20141219 Git 2.2.1 Released To Fix Critical Security Issue.md - -commit 43154bbb52f9557f840fecfe5fd25f9b3a70321b -Author: kingname -Date: Mon Jan 12 13:33:14 2015 +0800 - - Git 发布2.2.1版，修复严重安全问题 - -commit 9d07f03b9a71640b5adcc5cfca4ab7b303a0e8d9 -Merge: 33564c2 c1602f7 -Author: Xingyu.Wang -Date: Mon Jan 12 13:30:23 2015 +0800 - - Merge pull request #2231 from kingname/patch-1 - - Translating by kingname - -commit 33564c2a24d5e7f35e230b13d239e0ae4b900142 -Author: DeadFire -Date: Mon Jan 12 13:28:37 2015 +0800 - - 20150112-3 选题 - -commit c1602f7bf85928b05a4cf416092196f4938d27ae -Author: kingname -Date: Mon Jan 12 13:06:55 2015 +0800 - - Translating by kingname - -commit 841036a33cad9b4583230a9d3531009153f8fb6d -Author: DeadFire -Date: Mon Jan 12 11:48:07 2015 +0800 - - 20150112-2 选题 - -commit a2b404a7114eadbb3ff8f8a454c4b54ca923db9c -Author: DeadFire -Date: Mon Jan 12 11:25:39 2015 +0800 - - 20150112-1 选题 - -commit 3fd5e8c64d4125c63919df9c8cd5905197b66da7 -Author: tinyeyeser -Date: Mon Jan 12 11:15:33 2015 +0800 - - 已校对 by小眼儿 - -commit 9f93f9c428c575afc3c7f749d2b93297666c22a1 -Merge: 706954d 1897f32 -Author: runningwater -Date: Mon Jan 12 10:54:02 2015 +0800 - - Merge pull request #2230 from ZTinoZ/master - - Translating by ZTinoZ - -commit 1897f32f1f26b60ce05a793837c2afe7670d378a -Author: ZTinoZ -Date: Mon Jan 12 10:37:45 2015 +0800 - - Translating by ZTinoZ - -commit 3751162fe320fc9593cec8fcb4bdc730e00a150c -Merge: aff39ed 706954d -Author: ZTinoZ -Date: Mon Jan 12 09:21:04 2015 +0800 - - Merge pull request #6 from LCTT/master - - Update the repository - -commit 01a0a41f573d44a10f126ea9f46170d2e001c185 -Merge: 8aa5fbd 706954d -Author: H-mudcup -Date: Mon Jan 12 07:29:24 2015 +0800 - - Merge pull request #8 from LCTT/master - - 同步2015/1/12 - -commit 706954dc8bc544116e9b379e1f2e37c5c2d5beff -Author: wxy -Date: Mon Jan 12 00:11:21 2015 +0800 - - PUB:20140926 ChromeOS vs Linux--The Good, the Bad and the Ugly - - @barney-ro - -commit 5c464d67b5065e6de76d90cef23a3d4d2728bd0c -Author: runningwater -Date: Sun Jan 11 22:31:53 2015 +0800 - - 翻译中 by runningwater - -commit d4d5127026f488a9ba82e2996bd3daccf716fd64 -Author: wxy -Date: Sun Jan 11 19:45:59 2015 +0800 - - 补充删除 - - @H-mudcup - -commit 567016231eff53d2193d456870fb7a642ebc85ce -Merge: c4c3ac6 2743887 -Author: Xingyu.Wang -Date: Sun Jan 11 19:45:29 2015 +0800 - - Merge pull request #2229 from disylee/patch-1 - - Update 20150104 How to debug a C or C++ program with Nemiver debugger.md - -commit c4c3ac64b7b06e7c0e173bc12937c2a8cfbc4974 -Merge: 17e6f0a 8aa5fbd -Author: Xingyu.Wang -Date: Sun Jan 11 19:44:46 2015 +0800 - - Merge pull request #2228 from H-mudcup/master - - [Translated] Easy File Comparisons With These Great Free Diff Tools.md - 忘记删除原文了，这次我替你删除了吧~~ - -commit 2743887a274c1c4b22e69840979881e904a34d7e -Author: disylee -Date: Sun Jan 11 14:20:31 2015 +0800 - - Update 20150104 How to debug a C or C++ program with Nemiver debugger.md - - disylee - -commit 8aa5fbd9eebd00092a8e6ce2cdb683b846e2cb1d -Author: H-mudcup -Date: Sun Jan 11 11:55:37 2015 +0800 - - Create 20140701 Easy File Comparisons With These Great Free Diff Tools.md - -commit 1da6d877ce7cdc636773f017e69d14f4728ad9e8 -Merge: bab7c60 17e6f0a -Author: H-mudcup -Date: Sun Jan 11 11:47:09 2015 +0800 - - Merge pull request #7 from LCTT/master - - 同步2015/1/11 - -commit 17e6f0a763677207825c43f1550351ae767841ed -Merge: a755aa8 75d72b2 -Author: geekpi -Date: Sun Jan 11 11:15:35 2015 +0800 - - Merge pull request #2227 from geekpi/master - - translated - -commit 75d72b252bb612a033fcd8886006e69cc809832b -Author: zhengsihua -Date: Sun Jan 11 11:13:08 2015 +0800 - - translated - -commit a755aa873972fe7badb240ec4912ddc342791c43 -Merge: 3ee3fd1 f1d8732 -Author: geekpi -Date: Sun Jan 11 10:19:31 2015 +0800 - - Merge pull request #2226 from geekpi/master - - translating - -commit f1d8732a27eab2ba86bdda588d57a012170cdbe1 -Author: zhengsihua -Date: Sun Jan 11 10:18:16 2015 +0800 - - translating - -commit 3ee3fd1d1e2060131bdd6d1cc88b77224899b1ed -Merge: 4b19d23 ea4e2b4 -Author: geekpi -Date: Sat Jan 10 11:49:36 2015 +0800 - - Merge pull request #2225 from geekpi/master - - translated - -commit ea4e2b4d84a1c5f39531a740dbb267f677eaeddd -Author: zhengsihua -Date: Sat Jan 10 11:48:04 2015 +0800 - - translated - -commit 4b19d2371c7ae940aab60491e71f5701ff359c18 -Merge: cafe6c2 c552514 -Author: geekpi -Date: Sat Jan 10 11:19:19 2015 +0800 - - Merge pull request #2224 from geekpi/master - - translating - -commit c552514a3bff82c23fa3e5deaed6eda0d5cdbdf0 -Author: zhengsihua -Date: Sat Jan 10 11:18:39 2015 +0800 - - translating - -commit cafe6c2434a9af8b7f2780da5534b0eed8b4ad8e -Merge: 0deaef8 fd1beb5 -Author: geekpi -Date: Fri Jan 9 21:28:23 2015 +0800 - - Merge pull request #2223 from geekpi/master - - translated - -commit fd1beb516ebefbec2df49c615b19941eb032ece6 -Author: zhengsihua -Date: Fri Jan 9 21:27:45 2015 +0800 - - translated - -commit 0deaef86375677123a9d12c7a93fab49a2a31185 -Merge: 403c9a8 9a926e4 -Author: geekpi -Date: Fri Jan 9 20:55:53 2015 +0800 - - Merge pull request #2222 from geekpi/master - - translating - -commit 9a926e435a1463a006d7db5936b3b785405038b6 -Author: zhengsihua -Date: Fri Jan 9 20:54:17 2015 +0800 - - translating - -commit 403c9a8ec460040914eb444f3d20fc9c277e71ad -Merge: c516ab1 47acced -Author: runningwater -Date: Fri Jan 9 18:44:36 2015 +0800 - - Merge pull request #2221 from runningwater/master - - 翻译完成 - -commit 47acced1a2928abc7f260a21365ccc1354cc7ba5 -Author: runningwater -Date: Fri Jan 9 18:43:49 2015 +0800 - - 翻译完成 - -commit c516ab10b54aece8aa48461f1338fb6c12a2b9c3 -Merge: 7609f46 516c0fc -Author: tinyeyeser -Date: Fri Jan 9 15:39:20 2015 +0800 - - Merge pull request #2220 from mr-ping/master - - Translated by Ping - -commit 7609f4637113f8ec730e937cfc4d56aa411c16fe -Author: tinyeyeser -Date: Fri Jan 9 15:26:36 2015 +0800 - - 已校对 by小眼儿 - - 翻译句式通顺，断句合理，符合中文阅读习惯。难得！ - 但个别地方翻译有错误，甚至与原意相悖，校对后已修改。 - -commit 516c0fcd53f0668d261c749607640100d80e805d -Merge: 47fb6bd 490830d -Author: Ping -Date: Fri Jan 9 13:56:10 2015 +0800 - - Merge remote-tracking branch 'upstream/master' into newbranch - -commit 47fb6bd76b8684cda6dd94f72109d3004be17cfd -Author: Ping -Date: Fri Jan 9 13:43:28 2015 +0800 - - [Translated]20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md - -commit 490830d01b0001b0e3a596ea9d22c3b34ac32b07 -Author: tinyeyeser -Date: Fri Jan 9 13:45:04 2015 +0800 - - 已校对 by小眼儿 - -commit 6093990d8f97f8af0c3eaded93132ad5783bd739 -Author: wxy -Date: Fri Jan 9 09:32:12 2015 +0800 - - PUB:20141224 Linux FAQs with Answers--How to install kernel headers on Linux - - @geekpi - -commit aff39edee1e7f31bf00190ceee4dbfb7badc7972 -Merge: 8df9d8a 7156c3b -Author: ZTinoZ -Date: Fri Jan 9 09:25:31 2015 +0800 - - Merge pull request #5 from LCTT/master - - Update the repository - -commit 7156c3bbdff04a2d22e371f20ef187dfb2ef9073 -Merge: 328b4d8 f0e9447 -Author: tinyeyeser -Date: Fri Jan 9 09:23:46 2015 +0800 - - Merge pull request #2219 from mr-ping/master - - Mr-Ping 翻译中 - -commit 328b4d883844d6526a0f662fb8737e3ed99355c7 -Author: wxy -Date: Fri Jan 9 09:21:52 2015 +0800 - - PUB:20140910 With Apple Watch Unveiled, Could an Ubuntu Smartwatch Be Next - - @su-kaiyao - -commit 1ea6efba941e0c4417534e76ad29425d7dd3d5e9 -Merge: 4a2c74a bdeba77 -Author: tinyeyeser -Date: Fri Jan 9 09:20:57 2015 +0800 - - Merge pull request #2218 from tinyeyeser/master - - 已翻译 by小眼儿 - -commit bdeba77fdcdd6c31a2e6fcece0eb33d4ce288138 -Author: tinyeyeser -Date: Fri Jan 9 09:19:45 2015 +0800 - - 已翻译 by小眼儿 - -commit f0e9447450c639f7153c6ae2713d75585f43eb0e -Author: Ping -Date: Fri Jan 9 09:12:04 2015 +0800 - - Mr-Ping 翻译中 - -commit ff7a2b0b757c3797821bbd0bae1b6d1e687c95bf -Merge: c5c2288 4a2c74a -Author: joeren -Date: Fri Jan 9 09:02:49 2015 +0800 - - Merge pull request #23 from LCTT/master - - Update Repo - -commit 4a2c74afc0c31df78f725983d25621d1456a0edd -Merge: f884444 bab7c60 -Author: runningwater -Date: Fri Jan 9 08:30:19 2015 +0800 - - Merge pull request #2217 from H-mudcup/master - - Translating by H-mudcup - -commit bab7c60dc29de34894dc8336a25dc8177f53325b -Author: H-mudcup -Date: Fri Jan 9 08:14:24 2015 +0800 - - Update 20140701 Easy File Comparisons With These Great Free Diff Tools.md - -commit 5a66c383bab7627c6f00c5c604924651b95e39ca -Merge: 2b8eb8c f884444 -Author: H-mudcup -Date: Fri Jan 9 08:11:47 2015 +0800 - - Merge pull request #6 from LCTT/master - - 同步2015/1/9 - -commit f884444180e09d3ee4f873feaadda9e04cb67e25 -Author: wxy -Date: Fri Jan 9 08:04:22 2015 +0800 - - PUB:20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems - - @barney-ro - -commit b1e81109cad9d00c26855322048727331e312139 -Author: wxy -Date: Fri Jan 9 07:21:07 2015 +0800 - - PUB:20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux - - @H-mudcup - -commit 05b53a429694eec76678c824ff04f8f28a3d807a -Author: wxy -Date: Fri Jan 9 07:17:09 2015 +0800 - - PUB:20141211 Yes, This Trojan Infects Linux. No, It' s Not The Tuxpocalypse - - @tinyeyeser - -commit 882339520a85cece044d3e76d3000f14b06ffe71 -Merge: 46b8923 8df9d8a -Author: Xingyu.Wang -Date: Fri Jan 9 00:59:11 2015 +0800 - - Merge pull request #2215 from ZTinoZ/master - - Finish the translation by ZTinoZ - -commit 46b8923973a94df66cee2e9f3e7b882c0010f27a -Merge: 17f7eec 8f5aeea -Author: geekpi -Date: Thu Jan 8 17:32:09 2015 +0800 - - Merge pull request #2216 from geekpi/master - - translated - -commit 8f5aeea25de604283b3ecf0829f585b0a8d242e2 -Author: zhengsihua -Date: Thu Jan 8 17:30:26 2015 +0800 - - translated - -commit 17f7eec130b27cd579214230cdbd3fd3aea6462f -Merge: 10ef4a2 01a9f16 -Author: geekpi -Date: Thu Jan 8 17:02:48 2015 +0800 - - Merge pull request #2214 from geekpi/master - - translating - -commit 01a9f16c46f0a72f7cb5e7e576145cba21d26bc5 -Author: zhengsihua -Date: Thu Jan 8 17:00:31 2015 +0800 - - translating - -commit 8df9d8a2dbfc036e85dba927202510c59771491a -Author: ZTinoZ -Date: Thu Jan 8 16:57:31 2015 +0800 - - Finish the Translation by ZTinoZ - -commit 10ef4a215aaf2ead4a30fe0c229c505a2aa8cd16 -Author: DeadFire -Date: Thu Jan 8 15:51:34 2015 +0800 - - 20150108-1 选题 - -commit d65f445403de978e969867d7dcb7cbf1617e2899 -Merge: e20c944 17e3b27 -Author: tinyeyeser -Date: Thu Jan 8 14:56:47 2015 +0800 - - Merge pull request #2213 from Vic020/master - - Translated:How To Install Kodi 14 - -commit 17e3b272063e391216076ea44feb24aea202d860 -Author: Vic___ -Date: Thu Jan 8 12:48:30 2015 +0800 - - Moved - -commit d30d88da63f0824cfd15a1d034b504ec63a1951c -Author: Vic___ -Date: Thu Jan 8 12:48:01 2015 +0800 - - Translated - -commit 2b8eb8c2e20945d9381e0decb6080c62aa2df241 -Merge: 12f4d5b e20c944 -Author: H-mudcup -Date: Thu Jan 8 11:25:46 2015 +0800 - - Merge pull request #5 from LCTT/master - - 同步2015/1/8 - -commit e20c94422d61f5fa95e09421fd5340a8a20da450 -Merge: 2311517 38338a7 -Author: Xingyu.Wang -Date: Thu Jan 8 10:35:13 2015 +0800 - - Merge pull request #2210 from Stevearzh/master - - [Translated by Stevearzh]20141226 How to Download Music from Grooveshark with a Linux OS.md - -commit 2311517f595be9c1af546521a6a5d5bd7083b8fc -Merge: 791a907 12f4d5b -Author: Xingyu.Wang -Date: Thu Jan 8 10:34:55 2015 +0800 - - Merge pull request #2209 from H-mudcup/master - - Translated by H-mudcup - -commit 791a907b4faf2ecdaec1cd650bff3cb70d8205a2 -Merge: c7a5bd8 6e3f25f -Author: geekpi -Date: Wed Jan 7 21:07:42 2015 +0800 - - Merge pull request #2212 from geekpi/master - - translated - -commit 6e3f25fa050fbaa807452518f28be29e949ea62f -Author: zhengsihua -Date: Wed Jan 7 21:06:47 2015 +0800 - - translated - -commit c7a5bd899ab013895adfbf83563e7fa7ed25f869 -Merge: 0bc39b1 03a283a -Author: geekpi -Date: Wed Jan 7 20:54:24 2015 +0800 - - Merge pull request #2211 from geekpi/master - - translating - -commit 03a283aaff319da1b5522347b1ab20e30db78798 -Author: zhengsihua -Date: Wed Jan 7 20:47:32 2015 +0800 - - translating - -commit 38338a75969021460b8edfb8d6bed9a108137279 -Author: Stevearzh -Date: Wed Jan 7 16:31:08 2015 +0800 - - Translated by Stevearzh - -commit 0bc39b1f100b4d93f35c6d796a9f1ab3b2388946 -Author: tinyeyeser -Date: Wed Jan 7 16:00:11 2015 +0800 - - 已校对 by小眼儿 - -commit 51c42753fcaabce184d2e242bdae05b4ec1f46ce -Author: wxy -Date: Wed Jan 7 15:50:03 2015 +0800 - - PUB:20141023 How to turn your CentOS box into a BGP router using Quagga - - @disylee - -commit 83003afecac7532b1d564244233e53f0a73a8690 -Author: ZTinoZ -Date: Wed Jan 7 14:21:38 2015 +0800 - - Translating by ZTinoZ - -commit 13ad0b8f4402599a2b3dce71913a7be17d0d071e -Author: wxy -Date: Wed Jan 7 14:01:23 2015 +0800 - - PUB:20141013 How to configure peer-to-peer VPN on Linux - - @felixonmars - -commit 145b91641fd1acb24b73905d4ae6e3202c359209 -Author: wxy -Date: Wed Jan 7 13:45:45 2015 +0800 - - PUB:20140912 What' s wrong with IPv4 and Why we are moving to IPv6 - - @bazz2 - -commit 75e55d791c62439fc0b5fdc3d723a8b086830059 -Author: tinyeyeser -Date: Wed Jan 7 10:23:43 2015 +0800 - - 已校对 by小眼儿 - -commit 12f4d5b9990adc190dcc68bfd6cff4a5b544ed86 -Author: H-mudcup -Date: Wed Jan 7 10:17:51 2015 +0800 - - Create 20141106 Tomahawk Music Player Returns With New Look, Features.md - -commit d6a5e14d67ff33806c3b10edef5a6af6d710f996 -Author: H-mudcup -Date: Wed Jan 7 10:16:16 2015 +0800 - - Delete 20141106 Tomahawk Music Player Returns With New Look, Features.md - -commit 8037854bae15996a4d79fa11cb6f346d36a93fd2 -Author: tinyeyeser -Date: Wed Jan 7 09:37:18 2015 +0800 - - 翻译中 by小眼儿 - -commit 6b8ab98e8c40ba846a9f0608a325c02c395366a2 -Merge: 2819923 16e313d -Author: geekpi -Date: Tue Jan 6 19:12:20 2015 +0800 - - Merge pull request #2206 from H-mudcup/master - - Translating by H-mudcup - -commit 2819923c91c230f43a29a1a2ed60d7b4602649b0 -Merge: 78aab17 21b9f1d -Author: geekpi -Date: Tue Jan 6 19:11:41 2015 +0800 - - Merge pull request #2208 from geekpi/master - - translated - -commit 21b9f1dbc216fc0cc667b0ac7e4cb2cf789e2c92 -Author: zhengsihua -Date: Tue Jan 6 18:56:05 2015 +0800 - - translated - -commit 068036a530a4aab7233c4ee5e7a27fbfab0bde66 -Author: zhengsihua -Date: Tue Jan 6 18:48:32 2015 +0800 - - deleted - -commit 78aab177aca431de3aea0c53d1113a50c30889d7 -Author: geekpi -Date: Tue Jan 6 17:54:21 2015 +0800 - - Update 20150105 Ubuntu apt-get and apt-cache commands with practical examples.md - -commit a2c2f6726eb6f3c87d8f26bc80cad4c85759989f -Author: ZTinoZ -Date: Tue Jan 6 17:38:16 2015 +0800 - - Translating by ZTinoZ - -commit a950929cddcbcd85e51b6dc0af62387c3f041d43 -Author: tinyeyeser -Date: Tue Jan 6 17:22:28 2015 +0800 - - 已翻译 by小眼儿 - -commit 91902126c4086880b256b06c215f4759a81c23b7 -Merge: ee0e950 f604661 -Author: tinyeyeser -Date: Tue Jan 6 17:15:23 2015 +0800 - - Merge pull request #2207 from tinyeyeser/master - - 已翻译 by小眼儿 - -commit f604661fa17704504c240b043f7d960daf7f46e0 -Author: tinyeyeser -Date: Tue Jan 6 17:11:37 2015 +0800 - - 已翻译 by小眼儿 - - Signed-off-by: tinyeyeser - -commit ee0e9502558cd774095f3b467bf9af40621a1c60 -Author: DeadFire -Date: Tue Jan 6 16:37:55 2015 +0800 - - 20150106-1 选题 - -commit 16e313d6a5a09b8879fc75a185d9d30b207f3b62 -Author: H-mudcup -Date: Tue Jan 6 12:37:04 2015 +0800 - - Update 20141106 Tomahawk Music Player Returns With New Look, Features.md - -commit 780113f8e666b2d652772347e5a033fa1c5e1ab0 -Merge: 3ff479d 9b4d773 -Author: H-mudcup -Date: Tue Jan 6 12:13:16 2015 +0800 - - Merge pull request #4 from LCTT/master - - 同步2015/1/6 - -commit 9b4d773824b01aa2e184e43bf7a654b8c12659ad -Merge: 1dff8e3 cd31073 -Author: Xingyu.Wang -Date: Mon Jan 5 21:56:25 2015 +0800 - - Merge pull request #2205 from Vic020/patch-26 - - 抢地主 - -commit 1dff8e3db67e54b23ff6fc36615fe60aec3c6e4e -Merge: 17bccaf 6e31b7e -Author: Xingyu.Wang -Date: Mon Jan 5 21:56:04 2015 +0800 - - Merge pull request #2204 from SPccman/master - - Quick systemd-nspawn guide - -commit cd31073929e78be980c951231883606c0f8d82b0 -Author: Vic___ -Date: Mon Jan 5 20:17:49 2015 +0800 - - Update 20150105 How To Install Kodi 14 (XBMC) In Ubuntu 14.04 and Linux Mint 17.md - -commit 6e31b7ec439db2e50c644f59db754c04ad0b2c03 -Author: DoubleC <450760206@qq.com> -Date: Mon Jan 5 20:16:30 2015 +0800 - - Create Quick systemd-nspawn guide.md - - complete - -commit 06eb045b2855d3e2a722853b5b48b80e9b7d9fd7 -Author: DoubleC <450760206@qq.com> -Date: Mon Jan 5 20:13:07 2015 +0800 - - delete source file - - delete source file - -commit 52717946a7c72f42effb1af5f638f2407b32a627 -Merge: 49fbafb 17bccaf -Author: DoubleC <450760206@qq.com> -Date: Mon Jan 5 20:12:07 2015 +0800 - - Merge pull request #13 from LCTT/master - - Update - -commit 17bccaf9afd68897a1199dac07fec68db36b3d13 -Author: DeadFire -Date: Mon Jan 5 16:19:42 2015 +0800 - - 20150105-1 选题 - -commit df83a70203c28d382cbc2f7468fc47c3fc06e82e -Merge: ed63571 04de393 -Author: Xingyu.Wang -Date: Mon Jan 5 16:16:54 2015 +0800 - - Merge pull request #2203 from liaoishere/master - - [translated] 20141008 How to configure HTTP load balancer with HAProxy on Linux - -commit ed6357105ac697156ad373e0b57ffaff82dbab58 -Merge: 35b3139 e8b1750 -Author: Xingyu.Wang -Date: Mon Jan 5 16:16:27 2015 +0800 - - Merge pull request #2202 from barney-ro/master - - [translating]20141219 2015 will be the year Linux takes over the enterprise and other predictions - -commit 35b3139674e7705cd6b42c405807a3cd50d10621 -Author: tinyeyeser -Date: Mon Jan 5 16:13:28 2015 +0800 - - 翻译中 by小眼儿 - -commit 04de393fe77aa70f894a58b887e893d968948a51 -Author: liaoishere -Date: Mon Jan 5 13:48:11 2015 +0800 - - [translated] 20141008 How to configure HTTP load balancer with HAProxy on Linux - -commit d18ac9bd28a84786b144452cb159a24726655c7d -Author: ZTinoZ -Date: Mon Jan 5 13:30:10 2015 +0800 - - Translating by ZTinoZ - -commit e8b1750f68ab640023024fab3b9ffbe888e2d359 -Author: barney-ro -Date: Mon Jan 5 13:11:49 2015 +0800 - - [translating]20141219 2015 will be the year Linux takes over the enterprise and other predictions - -commit 460698dbc42fcf31992878e2fac57c6236d8c8c1 -Merge: ca03351 8f3fb80 -Author: Xingyu.Wang -Date: Mon Jan 5 12:47:57 2015 +0800 - - Merge pull request #2201 from liaoishere/master - - liaoishere is translating - -commit 8f3fb80c7f5fad2e8a047aa4ff28cf8b515ba6cd -Author: liaoishere -Date: Mon Jan 5 11:19:19 2015 +0800 - - liaoishere is translating - - translating 20141008 How to configure HTTP load balancer with HAProxy on Linux.md - -commit ca03351d4daf0e787cdbf451291cbec5a6c67041 -Merge: 5934485 c5c2288 -Author: joeren -Date: Mon Jan 5 10:13:30 2015 +0800 - - Merge pull request #2200 from GOLinux/master - - [Translated]20150104 How To Install Websvn In CentOS 7.md - -commit c5c22882993fc28a1b56309342905fd82e9ba326 -Author: GOLinux -Date: Mon Jan 5 10:12:16 2015 +0800 - - [Translated]20150104 How To Install Websvn In CentOS 7.md - -commit 593448563867c1d4de9a6f63487199d9566158a7 -Merge: 78eea5e b471789 -Author: joeren -Date: Mon Jan 5 09:51:05 2015 +0800 - - Merge pull request #2199 from GOLinux/master - - [Translating]20150104 How To Install Websvn In CentOS 7.md - -commit b47178940451cbb41697405138a2be9e9fe1e1e0 -Author: joeren -Date: Mon Jan 5 09:50:40 2015 +0800 - - Update 20150104 How To Install Websvn In CentOS 7.md - -commit 4b7691b3549f7745ef1001349865d8e0d0a9e11c -Merge: 5566a97 78eea5e -Author: joeren -Date: Mon Jan 5 09:49:17 2015 +0800 - - Merge pull request #22 from LCTT/master - - Update Repository - -commit 78eea5edfed41854db51cc6e5b1f738256d30b45 -Merge: a2c7dad 3ff479d -Author: joeren -Date: Mon Jan 5 09:48:23 2015 +0800 - - Merge pull request #2198 from H-mudcup/master - - Translated Flow ‘N Play Movie Player Has a Stylish Interface [Ubuntu Installation] - -commit a2c7dad8dff050496a23388832390478a6203caa -Merge: bd187e3 7c761d0 -Author: joeren -Date: Mon Jan 5 09:47:59 2015 +0800 - - Merge pull request #2197 from KayGuoWhu/master - - [translating] 20141222 A brief history of Linux malware - -commit bd187e3aea48f8cd6757ad0dde09dbc47b71ce62 -Merge: 1da8f35 031955c -Author: joeren -Date: Mon Jan 5 09:47:52 2015 +0800 - - Merge pull request #2196 from liaoishere/master - - translating 20141027 ntpq -p output - -commit 3ff479dae6f3a2a3c7f5edf6a084ef39492b26f1 -Author: H-mudcup -Date: Sun Jan 4 19:37:56 2015 +0800 - - Create 20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md - - Translated by H-mudcup - -commit c2be7bf490f560ec3f67626a892be1a22a7425ae -Author: H-mudcup -Date: Sun Jan 4 18:47:24 2015 +0800 - - Delete 20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md - -commit fc13165571778d6a6e535d7e2a381cb890917755 -Merge: 104d8c7 1da8f35 -Author: H-mudcup -Date: Sun Jan 4 18:46:01 2015 +0800 - - Merge pull request #3 from LCTT/master - - 同步 - -commit 031955c2a3eaaec352009c570de154d3a380a211 -Merge: acf066d 1da8f35 -Author: liaoishere -Date: Sun Jan 4 17:39:16 2015 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit acf066d9638e6dc9d31eb3fdb30a713ce1d3aa0b -Author: liaoishere -Date: Sun Jan 4 17:36:56 2015 +0800 - - [translated] 20141027 ntpq -p output - -commit 4b24d172b1e9994e18bc1668e76fd22fb55e8d45 -Author: ZTinoZ -Date: Sun Jan 4 17:00:07 2015 +0800 - - Translating by ZTinoZ - -commit 1da8f3500df779e2a01189bc9c43bb15c9d1b191 -Author: DeadFire -Date: Sun Jan 4 16:17:47 2015 +0800 - - 20150104-4 选题 - -commit 104d8c71df1e2819bda99abe74927a2a90efff90 -Merge: 5ea7de0 d3b1336 -Author: H-mudcup -Date: Sun Jan 4 15:28:06 2015 +0800 - - Merge pull request #2 from LCTT/master - - update 2015/1/4 - -commit d3b13366378e8e27bcb2a6c253144a4d9d62546a -Author: DeadFire -Date: Sun Jan 4 14:55:03 2015 +0800 - - 20150104-3 选题 - -commit 68819fccd8af60ca60c8077252ed7e1938df8ecd -Author: DeadFire -Date: Sun Jan 4 14:54:47 2015 +0800 - - 20150104-2 选题 - -commit 7c761d02f8c2caad2f9decb5ae794caa22bdcdab -Author: KayGuoWhu -Date: Sun Jan 4 14:40:38 2015 +0800 - - the first translating of 2015 - -commit fc1ec72d1e923ff3a1517fcf458cd79fd0521fef -Author: liaoishere -Date: Sun Jan 4 14:34:07 2015 +0800 - - liaoishere is translating 20141027 ntpq -p output - -commit ca450ff5f3f9e55e3b1a59d8ec54da7696b722b6 -Merge: 27ce29b 8d16e0b -Author: liaoishere -Date: Sun Jan 4 14:32:59 2015 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit 8d16e0b5be7332ad146f7fe0484f320ef4ad582c -Merge: 0425cc7 5ea7de0 -Author: Xingyu.Wang -Date: Sun Jan 4 11:20:34 2015 +0800 - - Merge pull request #2195 from H-mudcup/master - - Translating Flow ‘N Play Movie Player Has a Stylish Interface [Ubuntu Installation] - -commit 5ea7de03ae065dcf3f1583d3af4a76737b15d8c3 -Author: H-mudcup -Date: Sun Jan 4 11:15:17 2015 +0800 - - Update 20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md - -commit 17326e0e9c01181d316cca26a5a9dbe4559c77dd -Merge: d495db5 0425cc7 -Author: H-mudcup -Date: Sun Jan 4 11:01:59 2015 +0800 - - Merge pull request #1 from LCTT/master - - update 2015/1/4 - -commit 307441701b1037f680ed4b9b94aff0cc6508c0c3 -Merge: ddb74b9 0425cc7 -Author: ZhouJ-sh <32321321@qq.com> -Date: Sun Jan 4 10:46:18 2015 +0800 - - Merge pull request #3 from LCTT/master - - Merge from base - -commit 0425cc77cdd817b37854fd933e5f86969b733be8 -Author: DeadFire -Date: Sun Jan 4 10:36:31 2015 +0800 - - 20150104-1 选题 - -commit ae286d51cb46a4dfedc96ecca494d91e6ccc3032 -Merge: 4ea7103 d495db5 -Author: Xingyu.Wang -Date: Sun Jan 4 10:28:01 2015 +0800 - - Merge pull request #2194 from H-mudcup/master - - U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux - -commit d495db54a008d9b31019090081508c07ab49c03c -Author: H-mudcup -Date: Sun Jan 4 10:19:40 2015 +0800 - - Delete 20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md - -commit 70796857b7093a2b655a98f99c80e577de50edcf -Author: H-mudcup -Date: Sun Jan 4 10:12:49 2015 +0800 - - Create 20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md - -commit 5566a971b2c51d163f97a15422401550c358cd55 -Merge: 3b192a8 4ea7103 -Author: joeren -Date: Sun Jan 4 07:51:15 2015 +0800 - - Merge pull request #21 from LCTT/master - - Update Repository - -commit 27ce29b5199e53310cfd11896a48cdc984a3b6fe -Merge: f481c29 4ea7103 -Author: liaoishere -Date: Sun Jan 4 01:31:45 2015 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit 4ea710321c428240d68aa7e54649d3d8006f4342 -Merge: 3315e3d f98c9a1 -Author: Xingyu.Wang -Date: Sat Jan 3 20:51:09 2015 +0800 - - Merge pull request #2189 from liaoishere/master - - [translated] 20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server - -commit f481c2995db787c978a6fcdd59978229063470c0 -Merge: f98c9a1 3315e3d -Author: liaoishere -Date: Sat Jan 3 14:25:11 2015 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit 3315e3ddcbb5517761dba9c4bde97f0905cf04de -Merge: 54bff27 8081292 -Author: geekpi -Date: Sat Jan 3 14:06:49 2015 +0800 - - Merge pull request #2193 from geekpi/master - - translated - -commit 8081292d0890dfccaf8869c648584cb81fa6f512 -Author: zhengsihua -Date: Sat Jan 3 14:02:14 2015 +0800 - - delete source file - -commit 773311b89d928498f20076360be67e8a9df135c7 -Merge: 3813262 d4431f3 -Author: zhengsihua -Date: Sat Jan 3 13:57:33 2015 +0800 - - Merge branch 'master' of https://github.com/geekpi/TranslateProject - -commit 54bff2750b9e95db880631d4b5bbb4f80e9012f1 -Merge: 349e04c d4431f3 -Author: geekpi -Date: Sat Jan 3 13:56:28 2015 +0800 - - Merge pull request #2192 from geekpi/master - - translating - -commit 381326294179b5860f84233cf8043f6143dac628 -Author: zhengsihua -Date: Sat Jan 3 13:55:32 2015 +0800 - - translated - -commit d4431f3774ea0b5b7f6bf733b78af7290574041c -Author: geekpi -Date: Sat Jan 3 00:04:12 2015 -0500 - - translating - -commit f98c9a1c08b0e04949badb72387522ab24be4e75 -Author: liaoishere -Date: Sat Jan 3 00:19:03 2015 +0800 - - [translated] 20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server - -commit 349e04c3139cd17fca89f754784e890f3e6066b6 -Merge: 2195e0e daf91ce -Author: runningwater -Date: Sat Jan 3 00:01:18 2015 +0800 - - Merge pull request #2188 from liaoishere/master - - liaoishere is translating 20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server - -commit daf91ce773096eb7b2b5a324dfa4ca49b95fc75a -Author: liaoishere -Date: Fri Jan 2 23:13:56 2015 +0800 - - liaoishere is translating 20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server - -commit 2195e0e84e2bb2a43da1a146ee6d990ff609a7f0 -Author: wxy -Date: Fri Jan 2 23:02:10 2015 +0800 - - PUB:20141115 How to perform system backup with backup-manager on Linux - - @GOLinux - -commit 656458d0777f210f84f978eda233a5b14e284f2f -Author: wxy -Date: Fri Jan 2 22:53:45 2015 +0800 - - 补充删除 - -commit e69e4f48de6fce460adb003ab4920a4e5e1ca117 -Author: wxy -Date: Fri Jan 2 22:41:11 2015 +0800 - - PUB:20141023 What are useful Bash aliases and functions - - @luoyutiantang - -commit 2ee23919969daed6097991c13964cf6cf1c46f3c -Merge: d7ca250 1609916 -Author: runningwater -Date: Fri Jan 2 19:59:10 2015 +0800 - - Merge pull request #2185 from H-mudcup/patch-1 - - Translating by H-mudcup - -commit d7ca25005bcbe76fdd6bd7a6388019714dcb247a -Merge: 0101a84 fa96853 -Author: geekpi -Date: Fri Jan 2 18:18:27 2015 +0800 - - Merge pull request #2187 from geekpi/master - - translated - -commit fa96853c90cdcf4404a1ba9bdd91e6494e6829f8 -Author: zhengsihua -Date: Fri Jan 2 18:15:46 2015 +0800 - - translated - -commit 0101a8408b7a4231a0cb9cfe068449c8a553d065 -Merge: becb5c0 aea12ba -Author: geekpi -Date: Fri Jan 2 17:03:26 2015 +0800 - - Merge pull request #2186 from geekpi/master - - translating - -commit aea12ba42b531f214ec02e3294ee91649add0ba1 -Author: zhengsihua -Date: Fri Jan 2 17:01:28 2015 +0800 - - translating - -commit becb5c029511647667aeede5566836e4362ad190 -Author: wxy -Date: Fri Jan 2 13:33:16 2015 +0800 - - PUB:20140915 10 Open Source Cloning Software For Linux Users - - @felixonmars - -commit f925f5db94bf83ba8a1b3958a8de354bf1136639 -Author: wxy -Date: Fri Jan 2 13:15:09 2015 +0800 - - PUB:20141224 Linux FAQs with Answers--How to check SSH protocol version on Linux - - @geekpi - -commit 16de73e52f860bd33e6017ab2ca1d5dc3bb1f988 -Author: wxy -Date: Fri Jan 2 13:04:15 2015 +0800 - - 错误的放在了根下 - -commit 1609916663ad1fe0b4cc59715900d727141a43eb -Author: H-mudcup -Date: Fri Jan 2 12:41:58 2015 +0800 - - Translating by H-mudcup - - U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux - -commit f42e58092f7ceafd7f4340ddf03338f1fd426169 -Merge: e41ff61 7429dad -Author: Xingyu.Wang -Date: Thu Jan 1 23:14:19 2015 +0800 - - Merge pull request #2184 from SPccman/patch-13 - - SPccman - 下回请用所申领的文章标题作为 PR的标题哈。 - -commit 7429dad38ec3d3ec85defc572e565d26b2489d0a -Author: DoubleC <450760206@qq.com> -Date: Thu Jan 1 18:02:45 2015 +0800 - - SPccman - - 申领 - -commit e41ff61df76a302c9a085532bd323212b1baa39b -Merge: 7a0f9d6 189d460 -Author: Xingyu.Wang -Date: Thu Jan 1 16:29:55 2015 +0800 - - Merge pull request #2183 from geekpi/master - - translated - -commit 189d460a74588d3408caa9ad354414391028636f -Author: zhengsihua -Date: Thu Jan 1 11:45:53 2015 +0800 - - translated - -commit 7a0f9d6a49c6d0b9300900b9f7ad9529d7b448b7 -Merge: 7245158 682f441 -Author: geekpi -Date: Thu Jan 1 10:08:51 2015 +0800 - - Merge pull request #2182 from geekpi/master - - translating - -commit 682f441674eee44bd8bad38533e3ae18b79535de -Author: zhengsihua -Date: Thu Jan 1 10:06:48 2015 +0800 - - translating - -commit 7245158ee184d70b7dae84ac5208c37a43a9b5d3 -Merge: 7d05480 2fa94b2 -Author: runningwater -Date: Thu Jan 1 00:59:11 2015 +0800 - - Merge pull request #2181 from liaoishere/master - - [translated] 20141120 How to install Xen hypervisor on unused old hardwa... - -commit 2fa94b20bf7e9ada3a9ddbbfba5b9298cf79dab9 -Author: liaoishere -Date: Thu Jan 1 00:41:31 2015 +0800 - - [translated] 20141120 How to install Xen hypervisor on unused old hardware - -commit 7d05480104815f4abf0578fe37686ebc18d4065e -Author: wxy -Date: Thu Jan 1 00:17:50 2015 +0800 - - 归档201412，告别2014，谢谢各位 LCTTer！ - -commit 36bb57baf207e100a27b060cd685c28e59f395b1 -Merge: 6f071e9 9f2e09e -Author: Xingyu.Wang -Date: Wed Dec 31 23:42:59 2014 +0800 - - Merge pull request #2180 from alim0x/master - - [translated]11 - The history of Android.md - 新年快乐~~ - -commit 6f071e9b3cb98c55ca9e5e80ccd62739c799e186 -Author: wxy -Date: Wed Dec 31 23:08:50 2014 +0800 - - PUB:20141222 Linus Torvalds Launches Linux Kernel 3.19 RC1, One of the Biggest So Far - - @geekpi - -commit e138c32c0d0c6275b1e2db0e9d541f12f8f9bb5b -Author: wxy -Date: Wed Dec 31 22:54:06 2014 +0800 - - PUB:20141230 Second Edition of Ubuntu Manual 14.04 LTS Is Ou - - @zhouj-sh 明天就能见到了： http://linux.cn/article-4570-1.html - -commit a4b2d54341072ddf12590e2beeb30ce6f2c47b8f -Author: wxy -Date: Wed Dec 31 22:51:03 2014 +0800 - - 放错位置。。 - -commit 9f2e09ea39a5c6d1481f9570ed6c487d872a31da -Author: alim0x -Date: Wed Dec 31 22:41:43 2014 +0800 - - [translated]11 - The history of Android.md - -commit 4b20fc8ccbfffe9f9b4567ea098bb72d1550c3cc -Author: wxy -Date: Wed Dec 31 22:31:39 2014 +0800 - - 处理不完美的 PR - -commit 94a35875ac6c4471dcb9df5564d537f71afe31da -Merge: 7054d70 ef8c7bf -Author: Xingyu.Wang -Date: Wed Dec 31 22:26:47 2014 +0800 - - Merge pull request #2179 from barney-ro/master - - [translated]20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems - - 是的，是因为你给丢失了扩展名。 - -commit 7054d70600dbcf203a9d82af0fcb9ab4b71f5e73 -Merge: 36da19b ed7e244 -Author: Xingyu.Wang -Date: Wed Dec 31 22:26:05 2014 +0800 - - Merge pull request #2178 from H-mudcup/master - - 翻译完成20141226 The Good The Bad And The Ugly Of Linux In 2014.md - -commit 36da19b260e83120e17889cafe44856157265046 -Merge: 7354f5d a96dfa1 -Author: Xingyu.Wang -Date: Wed Dec 31 22:25:34 2014 +0800 - - Merge pull request #2177 from liaoishere/master - - liaosihere is translating - -commit 7354f5d8d248d6beed2ead7c6aabf0bf5a0bf9e3 -Merge: bea9184 ddb74b9 -Author: Xingyu.Wang -Date: Wed Dec 31 22:24:12 2014 +0800 - - Merge pull request #2176 from ZhouJ-sh/master - - 选题&翻译 Second Edition of Ubuntu Manual 14.04 LTS Is Out - - 谢谢您的首次参与，辛苦啦。不过建议您以后可以将您要推荐的选题给LCTT 的选题，由其添加，你可以自行认领。这样流程比较一致。不过您的这个选题的格式制作也很好。作为鼓励，新人的翻译会尽快发布~~ - -commit ef8c7bfa6c9c2899d26a12dd1a6df7007bf5ef05 -Author: Zhili.Yang -Date: Wed Dec 31 22:14:44 2014 +0800 - - Delete 20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems.md - -commit 7633fec9a5470014aca38f8d8065f7e72dfa6eb8 -Author: Zhili.Yang -Date: Wed Dec 31 22:13:02 2014 +0800 - - [translated]20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems - -commit ed7e2448b27175274ae3de46f11413dd519083d6 -Author: H-mudcup -Date: Wed Dec 31 18:30:32 2014 +0800 - - Create 20141226 The Good The Bad And The Ugly Of Linux In 2014.md - -commit 59e014701d68362b7c6f0bb1053a7256ddee93c9 -Author: H-mudcup -Date: Wed Dec 31 18:29:16 2014 +0800 - - Delete 20141226 The Good The Bad And The Ugly Of Linux In 2014.md - -commit a96dfa15d6a07733d8d02406578bf4768e454637 -Author: liaoishere -Date: Wed Dec 31 17:59:21 2014 +0800 - - liaosihere is translating - -commit ddb74b91fa9bdaef9d22b47243e454c207470562 -Author: ZhouJ-sh <32321321@qq.com> -Date: Wed Dec 31 17:45:52 2014 +0800 - - 选题 sources/news/20141230 Second Edition of Ubuntu Manual 14.04 LTS Is Out - -commit af3bd6bf260ef52fa4ef1cb4754829bc7d70c9ba -Author: ZTinoZ -Date: Wed Dec 31 17:43:19 2014 +0800 - - Translating by ZTinoZ - -commit 3a97aad992ee78b3815f59d82890311602ec6d47 -Author: ZhouJ-sh <32321321@qq.com> -Date: Wed Dec 31 17:43:19 2014 +0800 - - translat /news/20141230 Second Edition of Ubuntu Manual 14.04 LTS Is Out - -commit bea9184de731cd3d9cdaed11508319366a0cde62 -Merge: 2bcc32d 90e3fc4 -Author: Xingyu.Wang -Date: Wed Dec 31 13:25:48 2014 +0800 - - Merge pull request #2175 from ideas4u/patch-3 - - Update 20141229 4 Steps to Setup Local Repository in Ubuntu using APT-mi... - -commit 90e3fc481bbc755f49f19bda36183cfe7add044b -Author: ideas4u -Date: Wed Dec 31 13:09:48 2014 +0800 - - Update 20141229 4 Steps to Setup Local Repository in Ubuntu using APT-mirror.md - - translating req - -commit 2bcc32daec5f69a9bce752bd3e7f00b643b82db0 -Merge: cb2ce57 3a03323 -Author: Xingyu.Wang -Date: Wed Dec 31 12:58:25 2014 +0800 - - Merge pull request #2173 from ideas4u/patch-2 - - Create 20141211 How to use matplotlib for scientific plotting on Linux 已完成 - -commit cb2ce57b43cd89c2898a620e61635f6b861691e0 -Merge: 38fb9e5 587f865 -Author: Xingyu.Wang -Date: Wed Dec 31 12:58:09 2014 +0800 - - Merge pull request #2174 from ideas4u/patch-1 - - Delete 20141211 How to use matplotlib for scientific plotting on Linux.m... - -commit 587f865cb2bd27bdbb4090f6db9fc4f3538b3af2 -Author: ideas4u -Date: Wed Dec 31 12:55:26 2014 +0800 - - Delete 20141211 How to use matplotlib for scientific plotting on Linux.md - -commit 38fb9e504ca5a7edb42b7b033f37764b06d2d53e -Merge: 64d596e 7c5acd7 -Author: Xingyu.Wang -Date: Wed Dec 31 12:23:02 2014 +0800 - - Merge pull request #2171 from mtunique/master - - 【翻译完成】20141229 5 User Space Debugging Tools in Linux - -commit 7c5acd73f20bdea81542bf04c515fd0832fc08c1 -Author: mtunique -Date: Wed Dec 31 12:06:31 2014 +0800 - - 【翻译完成】20141229 5 User Space Debugging Tools in Linux - -commit 62ec8144152a046ca473fdd795285fb0d23e376d -Author: ZhouJ-sh <32321321@qq.com> -Date: Wed Dec 31 12:03:11 2014 +0800 - - 选题 20141230 Second Edition of Ubuntu Manual 14.04 LTS Is Out - -commit 909f645bf5b5a815391f4fade5a0a9f03d337b6d -Author: ZTinoZ -Date: Wed Dec 31 11:48:54 2014 +0800 - - Translating by ZTinoZ - -commit e9213927c5e39e29d3cab3032cd7abb3228fd176 -Author: mtunique -Date: Wed Dec 31 11:47:24 2014 +0800 - - 【翻译完成】20141229 5 User Space Debugging Tools in Linux - -commit 8b0e478477e0e4d6a9bef7d7809604868cbbef0b -Author: mtunique -Date: Wed Dec 31 11:45:24 2014 +0800 - - delete 20141229 5 User Space Debugging Tools in Linux.md - -commit a3b61d46f93527db1538238d376caaab06a0dad9 -Merge: 2bd8a0d 64d596e -Author: mtunique -Date: Wed Dec 31 11:44:07 2014 +0800 - - Merge remote-tracking branch 'lctt/master' - -commit 64d596e703116c1ece818626d98cfddada2b1da2 -Merge: e84fc42 c8c5ad2 -Author: Xingyu.Wang -Date: Wed Dec 31 11:04:37 2014 +0800 - - Merge pull request #2170 from H-mudcup/master - - update 2014/12/31 - -commit c8c5ad2a21321caa97514360dcad50eb42db48e2 -Author: H-mudcup -Date: Wed Dec 31 10:43:45 2014 +0800 - - Update 20141226 The Good The Bad And The Ugly Of Linux In 2014.md - - Translating by H-mudcup - -commit 146f514cb19f0e6ecd0524da62a0bec917a60c2a -Merge: 2daff13 e84fc42 -Author: ZhouJ-sh <32321321@qq.com> -Date: Wed Dec 31 10:39:52 2014 +0800 - - Merge pull request #2 from LCTT/master - - Merge from base - -commit ed7385ad7bce215f6f068da196a4c5556b6290d0 -Merge: 3923955 e84fc42 -Author: H-mudcup -Date: Wed Dec 31 10:36:24 2014 +0800 - - Merge pull request #3 from LCTT/master - - 更新2014年12月30日 - -commit e84fc42b9c8972831ed5d8d78ee9a58607dbafd8 -Merge: cd6228b 3b192a8 -Author: joeren -Date: Wed Dec 31 08:29:51 2014 +0800 - - Merge pull request #2169 from GOLinux/master - - [Translated] 20141224 Calife--A lightweight alternative to sudo.md - -commit 3b192a8aed6bd8c77da5f692b6d60f68e478eea9 -Author: GOLinux -Date: Wed Dec 31 08:27:07 2014 +0800 - - [Translated] 20141224 Calife--A lightweight alternative to sudo.md - -commit cd6228bc7810646208e22a01708b9b3f782cb9f6 -Merge: 70174be 82ac18e -Author: joeren -Date: Wed Dec 31 07:52:55 2014 +0800 - - Merge pull request #2168 from GOLinux/master - - [Translating]20141224 Calife--A lightweight alternative to sudo.md - -commit 82ac18e7e6a8f9a3109911533dcd4c3a2edc54dc -Author: joeren -Date: Wed Dec 31 07:52:28 2014 +0800 - - Update 20141224 Calife--A lightweight alternative to sudo.md - -commit dc8fc5d8a09e76b10f6effe7e609e36d75dea410 -Merge: b3d9bb7 70174be -Author: joeren -Date: Wed Dec 31 07:51:10 2014 +0800 - - Merge pull request #20 from LCTT/master - - Update Repository - -commit 70174bed6dbd5ccc51ab4dd7215923026ac1a48f -Merge: 95d5ce4 55be8f9 -Author: joeren -Date: Wed Dec 31 07:50:39 2014 +0800 - - Merge pull request #2167 from Vic020/master - - Translated: Linux FAQs with Answers--How to install Kingsoft Office on Linux - -commit 95d5ce4eb0dfa27a48013a8e020615b9a898e507 -Merge: acb74fb 2daff13 -Author: joeren -Date: Wed Dec 31 07:50:28 2014 +0800 - - Merge pull request #2166 from ZhouJ-sh/master - - 20141229 选题 2 Ways To Fix The UEFI Bootloader When Dual Booting Windo… - -commit acb74fb709c5faacadef795575b06e046abdd87a -Merge: 2ea4597 5cab529 -Author: joeren -Date: Wed Dec 31 07:50:14 2014 +0800 - - Merge pull request #2165 from Stevearzh/master - - Translating by Stevearzh - -commit 55be8f979ef92bcd893995ca0ed746b720c1ff62 -Author: Vic___ -Date: Tue Dec 30 22:49:59 2014 +0800 - - Moved - -commit 8bb194413564b652cb212b5143acb8e1f880fd90 -Author: Vic___ -Date: Tue Dec 30 22:48:53 2014 +0800 - - Translated - -commit 2daff130f975f6b6c566e3ca030f3e7e77d1b515 -Author: ZhouJ-sh <32321321@qq.com> -Date: Tue Dec 30 18:05:32 2014 +0800 - - translated 20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md - -commit 06c94466acd9089ff9f641666dbbb695d93900ce -Author: ZhouJ-sh <32321321@qq.com> -Date: Tue Dec 30 16:42:44 2014 +0800 - - 20141229 选题 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md - -commit 5cab52953e40e4dff4763a672888c53beb9d6b97 -Author: Stevearzh -Date: Tue Dec 30 14:43:41 2014 +0800 - - Translating by Stevearzh - -commit 2bd8a0dcaaf73a3b1686ae671704404baeac0dde -Merge: cea1528 2ea4597 -Author: mtunique -Date: Tue Dec 30 12:59:28 2014 +0800 - - Merge remote-tracking branch 'lctt/master' - -commit 2ea4597c9b7318eafbfac34e6674b41956110553 -Merge: 74b278b 0a3f390 -Author: Xingyu.Wang -Date: Tue Dec 30 12:23:45 2014 +0800 - - Merge pull request #2164 from ZTinoZ/master - - Translating by ZTinoZ - -commit 0a3f3906f5d07fc78c2d824665d6b4eb347fa45c -Author: ZTinoZ -Date: Tue Dec 30 11:50:33 2014 +0800 - - Translating by ZTinoZ - -commit e3991b36a9bc66dfc8f94bb5f718c7229ac3d6dc -Merge: 81f30fa 74b278b -Author: ZTinoZ -Date: Tue Dec 30 11:46:31 2014 +0800 - - Merge pull request #4 from LCTT/master - - Update the Repository - -commit 74b278b27b571bff6ddfdca295062f44ee6dcd0e -Merge: af1c4b6 81f30fa -Author: Xingyu.Wang -Date: Tue Dec 30 11:17:42 2014 +0800 - - Merge pull request #2163 from ZTinoZ/master - - Finish the translation by ZTinoZ - -commit af1c4b6b29ec0f87d747408546f3c34982a4e31b -Merge: 94fa3a1 6128f69 -Author: Xingyu.Wang -Date: Tue Dec 30 11:14:42 2014 +0800 - - Merge pull request #2162 from mtunique/patch-2 - - 【翻译中】5 User Space Debugging Tools in Linux - -commit 81f30fa2cabfe5cfa8b41d257538bba1f9657970 -Author: ZTinoZ -Date: Tue Dec 30 11:01:10 2014 +0800 - - Finish the translation by ZTinoZ - -commit cea15280546af2d1f5a47c33af6d775bb2bac6d2 -Merge: bf26401 94fa3a1 -Author: Tao Meng -Date: Tue Dec 30 10:57:00 2014 +0800 - - Merge pull request #1 from LCTT/master - - update - -commit 6128f6946fd72e0960a9145a972bc47b8f9ba602 -Author: Tao Meng -Date: Tue Dec 30 10:49:45 2014 +0800 - - 【翻译中】5 User Space Debugging Tools in Linux - - 【翻译中】5 User Space Debugging Tools in Linux - -commit 94fa3a1be59451035da2d1acf84844b2a89de3c6 -Merge: de39e53 b3d9bb7 -Author: joeren -Date: Tue Dec 30 10:18:00 2014 +0800 - - Merge pull request #2161 from GOLinux/master - - [Translated] 20141229 How to Create Btrfs Filesystem in Linux and its Features.md - -commit b3d9bb7ff393570fc9762f505134cd6dc983f309 -Author: GOLinux -Date: Tue Dec 30 10:16:14 2014 +0800 - - [Translated] 20141229 How to Create Btrfs Filesystem in Linux and its Features.md - -commit de39e5312bbc0b73e1367aae5d7cb99c0c70f763 -Merge: ab2f5a9 a183dfa -Author: joeren -Date: Tue Dec 30 09:07:32 2014 +0800 - - Merge pull request #2160 from GOLinux/master - - [Translating]20141229 How to Create Btrfs Filesystem in Linux and its Features.md - -commit a183dfaec77312c8a3f0baadc7077e068a439bed -Author: joeren -Date: Tue Dec 30 09:07:00 2014 +0800 - - Update 20141229 How to Create Btrfs Filesystem in Linux and its Features.md - -commit d6aa783d443a35125c9278bc93baabae9a8e3a82 -Merge: ddd7606 ab2f5a9 -Author: joeren -Date: Tue Dec 30 09:04:56 2014 +0800 - - Merge pull request #19 from LCTT/master - - Update Repository - -commit ab2f5a9d58613bf63651cd52b6873598f22e3d5b -Author: wxy -Date: Mon Dec 29 22:33:00 2014 +0800 - - PUB:20141219 Attic--Deduplicating backup program - - @GOLinux - -commit 79880065e17ad1248a7f97de8833404eb42f175c -Author: wxy -Date: Mon Dec 29 22:24:42 2014 +0800 - - PUB:20141211 Was 2014 The Year of Linux Desktop - - @ZTinoZ - -commit c1cb502768f3fd3944809571b7d7522c0a34a470 -Author: wxy -Date: Mon Dec 29 22:16:17 2014 +0800 - - PUB:20140818 Will Linux ever be able to give consumers what they want - - @zpl1025 - -commit c97974d2a66eaa8ff487b50c7efb2a00e70a0987 -Author: wxy -Date: Mon Dec 29 22:08:11 2014 +0800 - - PUB:20141224 Linux FAQs with Answers--How to install non-free packages on Debian - - @mtunique 翻译的不错！ - -commit ae8643533bbac80f49d9f4543877f602180fa2c0 -Merge: c175bbf cc87adf -Author: geekpi -Date: Mon Dec 29 21:43:34 2014 +0800 - - Merge pull request #2159 from geekpi/master - - translated - -commit cc87adfebb04b01a06df2dbf39fa1c073005a68d -Author: zhengsihua -Date: Mon Dec 29 21:41:24 2014 +0800 - - translated - -commit c175bbf0d37c2fc38ccf865894a8325be94e1235 -Author: wxy -Date: Mon Dec 29 21:37:22 2014 +0800 - - PUB:20141008 How To Use Steam Music Player on Ubuntu Desktop - - @H-mudcup 翻译的不错~加油~ - -commit 3ff9ad2ebc41360bd34892e73db4bec6e07aee09 -Author: wxy -Date: Mon Dec 29 21:24:41 2014 +0800 - - PUB:20141219 The 'grinch' isn't a Linux vulnerability, Red Hat says - - @yupmoon 翻译的不错，我一字未易。 - -commit de1dee6f001eec52984b944f764474d6300a9a63 -Merge: 56bad99 8556494 -Author: geekpi -Date: Mon Dec 29 21:01:03 2014 +0800 - - Merge pull request #2158 from geekpi/master - - translating - -commit 8556494c08c8087450e152ffafe77960b6925109 -Author: zhengsihua -Date: Mon Dec 29 20:44:38 2014 +0800 - - translating - -commit 932c6512f6cdda6b8be86214b4399c2bdac0f120 -Author: ZTinoZ -Date: Mon Dec 29 18:14:40 2014 +0800 - - Translating by ZTinoZ - -commit 56bad99e5415123255791fcaecbc94574d53f981 -Author: DeadFire -Date: Mon Dec 29 15:27:10 2014 +0800 - - 20141229-1 选题 - -commit ddd760648cd26206e9c23503526054464432c5c2 -Merge: 6213d88 bf911bd -Author: joeren -Date: Mon Dec 29 09:13:59 2014 +0800 - - Merge pull request #18 from LCTT/master - - Update Repository - -commit 3923955df081bd2e934fff3a71f275f093473eaf -Merge: 8b08356 bf911bd -Author: H-mudcup -Date: Mon Dec 29 08:07:38 2014 +0800 - - Merge pull request #2 from LCTT/master - - 更新2014年12月29日 - -commit bf911bde6cff67b9d626c74911f781c833d38eb5 -Merge: b5ef4a3 bf26401 -Author: Xingyu.Wang -Date: Sun Dec 28 22:54:25 2014 +0800 - - Merge pull request #2155 from mtunique/master - - 【翻译中】20141224 Linux FAQs with Answers--How to install non-free packages on Debian - -commit b5ef4a3d2148495af4821926f2ec869792cf0596 -Merge: 6d421e2 8b08356 -Author: Xingyu.Wang -Date: Sun Dec 28 22:53:17 2014 +0800 - - Merge pull request #2154 from H-mudcup/master - - Translated 20141008 How To Use Steam Music Player on Ubuntu Desktop.md - 没事，原文本来也是要删除的。恭喜你完成了第一篇翻译！我会马上发布~ - -commit 71ef31dc95fa3b531f7fd2a6d81add97ff9f27b5 -Author: ZTinoZ -Date: Sun Dec 28 20:51:48 2014 +0800 - - Translating by ZTinoZ - -commit 6d421e21ca5e1545bbf86f493867c46edc9eb148 -Merge: 6472c49 e587300 -Author: geekpi -Date: Sun Dec 28 18:40:35 2014 +0800 - - Merge pull request #2157 from geekpi/master - - translated - -commit e587300c7caa8bb4a0b5a506e8031cd4c6cb7760 -Author: zhengsihua -Date: Sun Dec 28 18:39:29 2014 +0800 - - translated - -commit 6472c49a12e672ccab370842fc97812e8a6eacb7 -Merge: 268dc0e e5402df -Author: geekpi -Date: Sun Dec 28 17:49:17 2014 +0800 - - Merge pull request #2156 from geekpi/master - - translating - -commit e5402df860eaffc1e2f8029608853e39eddfe855 -Author: zhengsihua -Date: Sun Dec 28 17:47:19 2014 +0800 - - translating - -commit bf26401b0e5c9dea193697a5c777b445fabbb16c -Author: mtunique -Date: Sun Dec 28 15:41:12 2014 +0800 - - 【翻译完成】20141224 Linux FAQs with Answers--How to install non-free packages on Debian - -commit 86489418630ff0192d1287ac8270331aac63e5f2 -Author: mtunique -Date: Sun Dec 28 14:25:11 2014 +0800 - - Translating by mtunique - -commit 8b083563a9861cff2ce34283992afd18f647f360 -Author: H-mudcup -Date: Sun Dec 28 12:54:47 2014 +0800 - - Create 20141008 How To Use Steam Music Player on Ubuntu Desktop.md - -commit 71cff408b174ef03c50ce9537a8053095cb30903 -Author: H-mudcup -Date: Sun Dec 28 12:50:54 2014 +0800 - - Delete 20141008 How To Use Steam Music Player on Ubuntu Desktop.md - -commit e8d26c2bdfcfa5cec796325cc21658306433db6a -Author: H-mudcup -Date: Sun Dec 28 12:26:48 2014 +0800 - - Update 20141008 How To Use Steam Music Player on Ubuntu Desktop.md - -commit 268dc0eadd15d7594a7705304b872c1a067f95a1 -Merge: 77a96b8 4782651 -Author: runningwater -Date: Sat Dec 27 23:00:08 2014 +0800 - - Merge pull request #2153 from runningwater/master - - 翻译中 by runningwater - -commit 4782651a2d3510a32a338e98e3c8853c5515c776 -Author: runningwater -Date: Sat Dec 27 22:54:25 2014 +0800 - - 翻译中 by runningwater - -commit 77a96b8be04015a26d64081c1ee25fb7ad77d602 -Merge: 2eef77c 34eb334 -Author: runningwater -Date: Sat Dec 27 22:23:15 2014 +0800 - - Merge pull request #2152 from runningwater/master - - 翻译完成 - -commit 34eb334cb73079690da6d50c3e5f33aeb793f29b -Author: runningwater -Date: Sat Dec 27 22:18:21 2014 +0800 - - 翻译完成 - -commit 2eef77cedb7d037905b0baf298028f481dc49e66 -Merge: 8893327 e4d68ad -Author: geekpi -Date: Sat Dec 27 12:01:26 2014 +0800 - - Merge pull request #2151 from geekpi/master - - translated - -commit e4d68ad946aa6681705e0876fa3ea3b5fbd427e7 -Author: zhengsihua -Date: Sat Dec 27 11:58:41 2014 +0800 - - translated - -commit 62de838381f98bf53dd8cf19a339f4b463f3d2eb -Author: zhengsihua -Date: Sat Dec 27 11:14:34 2014 +0800 - - translating - -commit 88933273fa784867fce3310f1703b8b1a14c509d -Merge: 28a0950 bbe861a -Author: geekpi -Date: Fri Dec 26 21:29:26 2014 +0800 - - Merge pull request #2150 from geekpi/master - - translated - -commit bbe861a9c8de30cacdfad16046c92bb4403e3b41 -Author: zhengsihua -Date: Fri Dec 26 21:27:07 2014 +0800 - - translated - -commit 28a0950f812670bda7fd7aa9c6a03ef226a30b24 -Merge: e079c94 de67c15 -Author: geekpi -Date: Fri Dec 26 20:36:10 2014 +0800 - - Merge pull request #2149 from geekpi/master - - translating - -commit de67c15c07237fc464939ee35a6f543de530a09a -Author: zhengsihua -Date: Fri Dec 26 20:32:32 2014 +0800 - - translating - -commit bdc7f0da338fdf3201d90a86286130b13a682a67 -Merge: 2955a22 e079c94 -Author: H-mudcup -Date: Fri Dec 26 18:21:55 2014 +0800 - - Merge pull request #1 from LCTT/master - - 更新2014年12月26日 - -commit e079c94dcbba39bb1747803b4984a9a5dde2ac76 -Author: DeadFire -Date: Fri Dec 26 16:51:06 2014 +0800 - - 20141226-2 选题 - -commit 4ca1c3dc87ea51e77702afc126b2be2bac3869d5 -Author: ZTinoZ -Date: Fri Dec 26 15:56:59 2014 +0800 - - Translating by ZTinoZ - -commit a6eca5d1cd2c3edce28c9a02f0eb9457071495d6 -Author: DeadFire -Date: Fri Dec 26 14:52:02 2014 +0800 - - 20141226-1 选题 - -commit 90e28a3b7cbdf9cd018980c8864b13cdcb739a68 -Merge: beb172b 9ac2839 -Author: Xingyu.Wang -Date: Fri Dec 26 14:26:59 2014 +0800 - - Merge pull request #2147 from disylee/master - - Translated by disylee - -commit beb172b1d17386bd1e2e5ffd443b44575c166e08 -Merge: 2196b81 6a389b5 -Author: Xingyu.Wang -Date: Fri Dec 26 14:26:17 2014 +0800 - - Merge pull request #2146 from H-mudcup/patch-1 - - Update 20141008 How To Use Steam Music Player on Ubuntu Desktop.md - -commit 2196b810b6b14e0593ebc034eab217bd621801ce -Merge: 9d73eb5 005ce23 -Author: Xingyu.Wang -Date: Fri Dec 26 14:26:03 2014 +0800 - - Merge pull request #2145 from Vic020/patch-24 - - Update 20141224 Linux FAQs with Answers--How to install Kingsoft Office ... - -commit 9d73eb5a0ee79cba76aeab065d8665d97196bdc8 -Merge: 2955a22 6213d88 -Author: joeren -Date: Fri Dec 26 10:29:52 2014 +0800 - - Merge pull request #2148 from GOLinux/master - - [Translated] 20141223 Setting up a 'PXE Network Boot Server' for Multiple Linux Distribution Installations in RHEL or CentOS 7.md - -commit 6213d88fe8b83fcc288f09337e6ded15af600662 -Merge: dfa5842 2955a22 -Author: joeren -Date: Fri Dec 26 10:28:45 2014 +0800 - - Merge pull request #17 from LCTT/master - - Update Repository - -commit dfa5842c74e41919c0894b37f767479103c3d50b -Author: GOLinux -Date: Fri Dec 26 10:25:20 2014 +0800 - - [Translated] 20141223 Setting up a 'PXE Network Boot Server' for Multiple Linux Distribution Installations in RHEL or CentOS 7.md - -commit 9ac2839a5250dae875f7276063ccc45ddc81d0a0 -Author: disylee -Date: Fri Dec 26 02:04:23 2014 +0800 - - Translated by disylee - -commit 6a389b5471a7a793bfd5699b98e7f650ed40379d -Author: H-mudcup -Date: Thu Dec 25 23:09:29 2014 +0800 - - Update 20141008 How To Use Steam Music Player on Ubuntu Desktop.md - - Translating by H-mudcup - -commit 2955a222bb9aba254a11ba57bd2e3fbd385e7422 -Author: wxy -Date: Thu Dec 25 21:54:09 2014 +0800 - - 晋升 runningwater 为 core - -commit b1ffe063d1accf4df1152a67ae529f73f4bfb297 -Author: wxy -Date: Thu Dec 25 21:53:41 2014 +0800 - - PUB:20141119 10 SCP Commands to Transfer Files or Folders in Linux - - @ZTinoZ - -commit 005ce238f59ef692fcad41a92eed18ae9674e6bd -Author: Vic___ -Date: Thu Dec 25 21:13:35 2014 +0800 - - Update 20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md - -commit 4d1008437a1d6f612a875f259fa934686b345c7e -Author: ZTinoZ -Date: Thu Dec 25 17:55:07 2014 +0800 - - Translating by ZTinoZ - -commit e6966181f74065b07f0a221c6fb62aa434301ab9 -Author: wxy -Date: Thu Dec 25 11:06:18 2014 +0800 - - PUB:20141118 Linux FAQs with Answers--How to install phpMyAdmin on CentOS - - @ZTinoZ - -commit e20bf8816c3d190c4f34f4a91a2fdfe2736376b5 -Author: wxy -Date: Thu Dec 25 10:47:21 2014 +0800 - - PUB:20140915 Make Downloading Files Effortless - - @zpl1025 - -commit 16622478f52e8c3712b2f6f47980eec2cdc797d5 -Merge: ba0faf4 ddde7ce -Author: Xingyu.Wang -Date: Thu Dec 25 13:02:24 2014 +0800 - - Merge pull request #2144 from ZTinoZ/master - - Translating by ZTinoZ - -commit ddde7ce69dfba1cc974e7efb2287de604b386d3d -Author: ZTinoZ -Date: Thu Dec 25 12:04:23 2014 +0800 - - Translating by ZTinoZ - -commit 7720875b8dca1ffbfd8f70a497947b55a87709ce -Merge: 8527820 ba0faf4 -Author: ZTinoZ -Date: Thu Dec 25 11:35:17 2014 +0800 - - Merge pull request #3 from LCTT/master - - Update the Repositories - -commit ba0faf47d88accd9ebd96419715611de538e8f94 -Merge: 6b448d8 8527820 -Author: Xingyu.Wang -Date: Thu Dec 25 11:06:45 2014 +0800 - - Merge pull request #2143 from ZTinoZ/master - - Finish the translation by ZTinoZ - -commit 852782056e92d0a160ef1e00639f659f2767ab86 -Author: ZTinoZ -Date: Thu Dec 25 10:57:59 2014 +0800 - - Finish the translation by ZTinoZ - -commit 6b448d82636cb660bd3dc13f1912340c2700fe92 -Author: wxy -Date: Thu Dec 25 10:22:53 2014 +0800 - - PUB:20140910 Why Do Some Old Programming Languages Never Die - - @runningwater - -commit 7ff13e77dc81bd2cc69c2bcb3e69dae8fc1965a4 -Merge: 0ec62b6 e7864a8 -Author: joeren -Date: Thu Dec 25 08:39:26 2014 +0800 - - Merge pull request #2142 from GOLinux/master - - [Translated] 20141222 A Great Tool To Show Linux Command Progress Like ETA.md - -commit e7864a8716c6086e3d891f29c333bc0619707299 -Author: GOLinux -Date: Thu Dec 25 08:36:29 2014 +0800 - - [Translated] 20141222 A Great Tool To Show Linux Command Progress Like ETA.md - -commit 3893ee8c5f6f41c3c37a25193833367701ae1374 -Author: ZTinoZ -Date: Wed Dec 24 17:58:37 2014 +0800 - - Translating by ZTinoZ - -commit 0ec62b6055241db57f18a2aee95bd9d99812321c -Author: DeadFire -Date: Wed Dec 24 16:52:39 2014 +0800 - - 20141224-1 选题 - -commit b27de43b7456e86f7565de8ceca8f1ed26401ce0 -Merge: 3f605ee 514c1dc -Author: joeren -Date: Wed Dec 24 16:19:54 2014 +0800 - - Merge pull request #2141 from GOLinux/master - - [Translating]20141223 Setting up a 'PXE Network Boot Server' for Multiple Linux Distribution Installations in RHEL or CentOS 7.md - -commit 514c1dcc67f146a32680dbc7547f7297ba8dc10a -Author: joeren -Date: Wed Dec 24 16:19:16 2014 +0800 - - Update 20141223 Setting up a 'PXE Network Boot Server' for Multiple Linux Distribution Installations in RHEL or CentOS 7.md - -commit 3f605ee665c2703b98c0a850b1ebf86896ab63f7 -Merge: 9f8ddd2 0d14c15 -Author: joeren -Date: Wed Dec 24 16:17:07 2014 +0800 - - Merge pull request #2140 from GOLinux/master - - [Translating]20141222 A Great Tool To Show Linux Command Progress Like ETA.md - -commit 0d14c152732feac36b06dc77d72063555fa285b4 -Author: joeren -Date: Wed Dec 24 16:16:07 2014 +0800 - - Update 20141222 A Great Tool To Show Linux Command Progress Like ETA.md - -commit 9f8ddd2df48cae5683e21eaac78ea2011b26ce84 -Merge: 7631797 32f484e -Author: joeren -Date: Wed Dec 24 10:12:11 2014 +0800 - - Merge pull request #2139 from GOLinux/master - - [Translated] 20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md - -commit 32f484e215636f830df94750ef81d3e1b41c94e1 -Author: GOLinux -Date: Wed Dec 24 10:09:36 2014 +0800 - - [Translated] 20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md - -commit 7631797c0ef70c693b65f1b676fbbed8ce674c87 -Merge: 9afa538 e08247d -Author: joeren -Date: Wed Dec 24 08:33:28 2014 +0800 - - Merge pull request #2138 from GOLinux/master - - [Translating]20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md - -commit e08247d21a4e070836ed5b184bb510c20971f0b4 -Author: joeren -Date: Wed Dec 24 08:32:53 2014 +0800 - - Update 20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md - -commit a68b42975bf1901e6a57acd737ce9ac0b61f5ea1 -Merge: 1bb3f96 9afa538 -Author: joeren -Date: Wed Dec 24 08:32:05 2014 +0800 - - Merge pull request #16 from LCTT/master - - Update Repository - -commit 9afa5387f3d89c4e8bfd7a1987b012bd08fcc2dc -Author: DeadFire -Date: Tue Dec 23 16:47:50 2014 +0800 - - 20141223-3 选题 - -commit 059350f824e7fb0e6292b60e84cccdc84e05591e -Author: DeadFire -Date: Tue Dec 23 16:42:23 2014 +0800 - - 20141223-2 选题 - -commit dcad76a0f9e4b0ce71fe58ef7df00aad5bc62086 -Author: DeadFire -Date: Tue Dec 23 13:39:39 2014 +0800 - - 20141223-1 选题 - -commit 1bb3f967b17c0650d30ce61c1f3b87cc0a382a6d -Merge: ff344ec 683c969 -Author: joeren -Date: Tue Dec 23 13:09:02 2014 +0800 - - Merge pull request #15 from LCTT/master - - Update Repository - -commit 683c96900a25b5c12a34a519592dc0b7b5f00e27 -Merge: 614911f b7fb010 -Author: joeren -Date: Tue Dec 23 13:07:50 2014 +0800 - - Merge pull request #2137 from yupmoon/master - - tranlated - -commit a1a057e40fa1545e7d17dc88782c6e2a0c35dd2c -Author: ZTinoZ -Date: Tue Dec 23 00:03:00 2014 +0800 - - Translating by ZTinoZ - -commit b7fb0102844a8ae8e0fa74e8c7fe19cc99fcbe60 -Author: yupmoon -Date: Mon Dec 22 22:19:48 2014 +0800 - - tranlated - -commit 614911fde4e657f699718ba833a805d9c4fc483c -Author: wxy -Date: Mon Dec 22 21:37:51 2014 +0800 - - PUB:20141112 Intro to Systemd Runlevels and Service Management Commands - - @coloka - -commit 2cb3b0820d66168585297d70367d2f9926ad6794 -Author: wxy -Date: Mon Dec 22 21:12:49 2014 +0800 - - PUB:20141030 rsync Command to Exclude a List of Files and Directories in Linux - - @GOLinux - -commit 262a2df7b592a12177d8c3d38df45ec3b9ef145f -Author: wxy -Date: Mon Dec 22 21:06:35 2014 +0800 - - PUB:20141222 How to use Rsync Command In Linux With Examples - - @geekpi - -commit 1fc675e6b9e9a15f08436625946b09e701d1b3e2 -Merge: e3782e8 0d692e2 -Author: geekpi -Date: Mon Dec 22 20:51:47 2014 +0800 - - Merge pull request #2136 from geekpi/master - - translated - -commit 0d692e270385c6d8f8753a7a3b1b99b5ccef3e8b -Author: zhengsihua -Date: Mon Dec 22 20:48:39 2014 +0800 - - translated - -commit e3782e8f1f4d0b827d64936741c86fe33d6ea254 -Merge: 5bbf79d 53214ad -Author: geekpi -Date: Mon Dec 22 20:28:32 2014 +0800 - - Merge pull request #2135 from geekpi/master - - translating - -commit 53214ad958cdcacb61c3033faa78fc8d847b9d4d -Author: geekpi -Date: Mon Dec 22 07:27:32 2014 -0500 - - translating - -commit 5bbf79dc8c239aa90ca9c075105846b7c84e83e5 -Merge: c481ea2 4d6a428 -Author: Xingyu.Wang -Date: Mon Dec 22 20:16:51 2014 +0800 - - Merge pull request #2134 from yupmoon/master - - ###yupmoon translating### - -commit c481ea218042ad9fabb3d2bbfbd34391a8f25640 -Author: DeadFire -Date: Mon Dec 22 16:36:34 2014 +0800 - - 20141222-3 选题 - -commit 17669ee7a2a2997542965381937c9834f3584381 -Author: DeadFire -Date: Mon Dec 22 15:37:01 2014 +0800 - - 20141222-2 选题 - -commit 44d2576118470007af3df3aa30d1919817c0a74a -Author: DeadFire -Date: Mon Dec 22 14:26:16 2014 +0800 - - 20141222-1 选题 - -commit 4d6a4286880baa269053e49a40af9f6e8b150bf6 -Author: yupmoon -Date: Mon Dec 22 11:17:54 2014 +0800 - - ###yupmoon translating### - -commit 4813316cb3955e346e518027357d8db850d2f95d -Merge: e6ffb9c ff344ec -Author: joeren -Date: Mon Dec 22 10:23:14 2014 +0800 - - Merge pull request #2133 from GOLinux/master - - [Translated] 20141219 Attic--Deduplicating backup program.md - -commit ff344ec2202e80b2846748f840b960b525a67477 -Author: GOLinux -Date: Mon Dec 22 10:19:50 2014 +0800 - - [Translated] 20141219 Attic--Deduplicating backup program.md - -commit e6ffb9c85e388e730846c543d60e1210591f860d -Merge: 78ab7ce 2f4a7a1 -Author: joeren -Date: Mon Dec 22 09:26:14 2014 +0800 - - Merge pull request #2132 from GOLinux/master - - [Translating] 20141219 Attic--Deduplicating backup program.md - -commit 2f4a7a1f067851615057121acf06b9faf233a8a0 -Author: joeren -Date: Mon Dec 22 09:25:44 2014 +0800 - - Update 20141219 Attic--Deduplicating backup program.md - -commit 62faae4910ea47013e7b6736b1968003b3529cc2 -Merge: 4167376 78ab7ce -Author: joeren -Date: Mon Dec 22 09:24:13 2014 +0800 - - Merge pull request #14 from LCTT/master - - Update Repository - -commit 78ab7ce2dc0eb306f7e011c894e908308135db29 -Merge: 9029711 49fbafb -Author: joeren -Date: Mon Dec 22 09:23:35 2014 +0800 - - Merge pull request #2131 from SPccman/master - - How to filter, split or merge pcap files on Linux - -commit 90297119de3e2d3ca5433f2bf2c2dd53ce358470 -Author: wxy -Date: Sun Dec 21 23:19:15 2014 +0800 - - PUB:20141120 Postfix tips and Troubleshooting Commands - - @Vic020 - -commit 937f096a63a741fef0cff615f4a89f315f482e6f -Author: wxy -Date: Sun Dec 21 23:08:07 2014 +0800 - - PUB:20141120 5 Best Open Source Web Browser Security Apps - - @yupmoon - -commit 908ca37521c0797cd3dbe697f5c7c24c6e757f23 -Author: wxy -Date: Sun Dec 21 22:40:07 2014 +0800 - - PUB:20141104 Pitivi 0.94 Uses GTK HeaderBar, Squashes Umpteen Bugs - - @ThomazL - -commit 49fbafbafb84afb7ea4353d2a18f99917d29af27 -Author: DoubleC <450760206@qq.com> -Date: Sun Dec 21 21:33:32 2014 +0800 - - complete - - 翻已完成 - -commit 8eca31ef32807bce5b4a304bcae4c66abf2afb43 -Author: DoubleC <450760206@qq.com> -Date: Sun Dec 21 21:27:11 2014 +0800 - - delete source file - - 删除原文 - -commit 5a0c84097c7cf18a705c465e5ae03e2527e640c7 -Merge: bec12e6 801855b -Author: DoubleC <450760206@qq.com> -Date: Sun Dec 21 21:19:15 2014 +0800 - - Merge pull request #12 from LCTT/master - - update - -commit 801855bc1cd6a63984d942115b6180268f860c59 -Merge: fca7f96 b866001 -Author: geekpi -Date: Sun Dec 21 14:39:31 2014 +0800 - - Merge pull request #2130 from geekpi/master - - translated - -commit b866001dbd018b90e2946fb2f3a514ae33774476 -Author: zhengsihua -Date: Sun Dec 21 14:37:48 2014 +0800 - - translated - -commit fca7f966b0d361bdcc7165c408276a24f821359e -Merge: d551188 5c7518a -Author: geekpi -Date: Sun Dec 21 13:34:50 2014 +0800 - - Merge pull request #2129 from geekpi/master - - translating - -commit 5c7518a24514333aa9674d6f5a183b38880a645e -Author: zhengsihua -Date: Sun Dec 21 13:32:19 2014 +0800 - - translating - -commit d5511888d38be2efbfbed5c5904f045029aab98f -Author: wxy -Date: Sun Dec 21 11:25:13 2014 +0800 - - PUB:20141204 How To Drop Database In Oracle 11 Without Using DBCA - - @Vic020 - -commit 0f1eb122e3f8229e674cc42d6d86d195935d259d -Author: wxy -Date: Sun Dec 21 11:19:10 2014 +0800 - - PUB:20141120 How to visualize memory usage on Linux - - @coloka - -commit 0a5e8200b948e8373cc64881d1e33633726b917b -Author: wxy -Date: Sun Dec 21 11:07:54 2014 +0800 - - PUB:20141127 Some Sentences about Java - - @a598799539 - -commit a741a4ca81d8f6ad6b789e41e056b222ffff3cfc -Author: wxy -Date: Sun Dec 21 10:59:36 2014 +0800 - - PUB:20141021 How to monitor a log file on Linux with logwatch - - @runningwater - -commit 234a0ae94eb2fdf1ab4b26f7220f513074691d19 -Author: wxy -Date: Sun Dec 21 10:31:59 2014 +0800 - - PUB:20141029 Shell Scripting--Checking Conditions with if - - @ThomazL - -commit b3235ccc86fec902dcec99128edf73d379e826f7 -Author: wxy -Date: Sat Dec 20 21:54:46 2014 +0800 - - 清除过期文章，回收过期未完成文章 - - 以下诸位逾期未完成的文章收回： @barney-ro @mdjsjdqe @felixonmars (3篇！) @CHINAANSHE - @forsil - -commit dffdcdb1183accaf119c0f1e1518c0f6cb965bc6 -Author: wxy -Date: Sat Dec 20 21:39:26 2014 +0800 - - 更正格式 - -commit de02f24cfb57be4685b1b91ec1b07d4bf306c594 -Author: wxy -Date: Sat Dec 20 21:39:13 2014 +0800 - - 过期 - - @geekpi 十分抱歉，这篇已经过期较长时间了，不合适发布了。 - -commit a8e6c6ad0f5b8bc191f646e06cf017e6cba1bd88 -Merge: 7d0d098 6f9d4bd -Author: Xingyu.Wang -Date: Sat Dec 20 21:16:38 2014 +0800 - - Merge pull request #2128 from Stevearzh/master - - [translated by Stevearzh]20141211 NetHack.md - -commit 6f9d4bd84a6cb56dcff67c5345a4f522efdb6b7b -Author: Stevearzh -Date: Sat Dec 20 16:41:03 2014 +0800 - - translated by Stevearzh - -commit 7d0d0986794c10c86f0b3a85f948d763d674b0f5 -Merge: f5f0271 0674555 -Author: geekpi -Date: Sat Dec 20 12:44:17 2014 +0800 - - Merge pull request #2127 from geekpi/master - - translated - -commit 0674555003b85b2a52cb3ada1651ad35664d0c14 -Author: zhengsihua -Date: Sat Dec 20 12:43:00 2014 +0800 - - translated - -commit f5f0271abda5e8f0d605d2c7de92a8b6048aa110 -Merge: 858d6fa 85875e9 -Author: geekpi -Date: Sat Dec 20 11:56:00 2014 +0800 - - Merge pull request #2126 from geekpi/master - - translating - -commit 85875e9a38476de3ac755e73eddd231e4edbde61 -Author: zhengsihua -Date: Sat Dec 20 11:55:04 2014 +0800 - - translating - -commit 858d6fa45697b68ca12f84bf9b64d0bba87495c3 -Merge: aa0cd7f 690324d -Author: geekpi -Date: Fri Dec 19 22:47:51 2014 +0800 - - Merge pull request #2125 from geekpi/master - - translated - -commit 690324d4a9f5c52a76c680f018355e675100db8e -Author: zhengsihua -Date: Fri Dec 19 22:40:23 2014 +0800 - - translated - -commit aa0cd7f3f3ee048907d8222ae31536c51c52034f -Author: wxy -Date: Fri Dec 19 00:06:42 2014 +0800 - - PUB:20141024 Amazing 25 Linux Performance Monitoring Tools - - @andyxue - -commit f9bcb73ff1e52a45d04e9638fb32568670de21ca -Author: wxy -Date: Thu Dec 18 22:18:20 2014 +0800 - - PUB:20141013 Migrating LVM Partitions to New Logical Volume (Drive)--Part VI - - @GOLinux - -commit ca0e7cb31b530d525940b4722ee0ff1db516fa3d -Author: geekpi -Date: Fri Dec 19 21:19:33 2014 +0800 - - Update 20141219 Creating your First App on Linux with Python and Flask.md - -commit e760c6d12101932f01eca6efdeed0e15f2052bca -Author: geekpi -Date: Fri Dec 19 21:19:08 2014 +0800 - - Update 20141219 Creating your First App on Linux with Python and Flask.md - -commit b317ee66fac0ab178713efd7149db0b15e822631 -Merge: 08115c8 5ea8db6 -Author: geekpi -Date: Fri Dec 19 20:56:01 2014 +0800 - - Merge pull request #2124 from SPccman/patch-12 - - spccman................ - -commit bd6db6f132fb71e8098d004fcf7ad9459bb684dd -Author: ZTinoZ -Date: Fri Dec 19 17:57:23 2014 +0800 - - Translating by ZTinoZ - -commit 5ea8db6566c1850a460c9daa9545cd115760ffd6 -Author: DoubleC <450760206@qq.com> -Date: Fri Dec 19 17:35:40 2014 +0800 - - spccman................ - - 申领文章 - -commit 08115c855421316e5438b65ff669da2d5e8f0144 -Author: DeadFire -Date: Fri Dec 19 16:08:49 2014 +0800 - - 20141219-6 选题 - -commit 08a34699d6766a95723ba1759bd7fa0cf7d85ca7 -Author: DeadFire -Date: Fri Dec 19 15:10:59 2014 +0800 - - 20141219-5 选题 - -commit 5f9f46f87b62788df0a73a49dcaf2cbd5f485cd5 -Author: DeadFire -Date: Fri Dec 19 11:30:25 2014 +0800 - - 20141219-4 选题 - -commit 6703a353ee83ed56572d3bc8a715be07d2630999 -Author: DeadFire -Date: Fri Dec 19 11:18:34 2014 +0800 - - 20141219-3 选题 - -commit 3460e6ed4fd6e8c2122b17d6050e22e880216945 -Author: DeadFire -Date: Fri Dec 19 10:50:38 2014 +0800 - - 20141219-2 选题 - -commit 69f68536769e9d6b4d4e20a8fdefb33891a4fd65 -Author: DeadFire -Date: Fri Dec 19 10:22:36 2014 +0800 - - 20141219-1 选题 - -commit 4167376769e5c8d5ed17b40d30b2f85c0e3c0612 -Merge: 3b87ab6 16bfd25 -Author: joeren -Date: Fri Dec 19 08:42:20 2014 +0800 - - Merge pull request #13 from LCTT/master - - Update Repository - -commit 16bfd25d308fefb34bb7beb5e6e1e972485e7a6b -Merge: 74d6ae5 274277a -Author: geekpi -Date: Thu Dec 18 22:24:24 2014 +0800 - - Merge pull request #2123 from geekpi/master - - translated - -commit 274277a29fb127cf874ea8b74cf397003ea854aa -Author: zhengsihua -Date: Thu Dec 18 22:18:04 2014 +0800 - - translated - -commit 74d6ae5c9bfcbbbe41aaf07a60a870013a13c711 -Merge: 2c49bae ca2a561 -Author: geekpi -Date: Thu Dec 18 22:17:07 2014 +0800 - - Merge pull request #2122 from geekpi/master - - translating - -commit ca2a561ba171f76e154fffcc7a2beccba02e77c2 -Author: zhengsihua -Date: Thu Dec 18 22:15:06 2014 +0800 - - translating - -commit fc073c3cfc82831a49a6cbde550d5aeff4857f4c -Author: ZTinoZ -Date: Thu Dec 18 20:56:35 2014 +0800 - - Translating by ZTinoZ - -commit 2c49baeed82a4d0199f7cd8570a2110504635c70 -Author: wxy -Date: Thu Dec 18 00:34:55 2014 +0800 - - PUB:20141112 How to Remove Music Players from Ubuntu Sound Menu - - @disylee - -commit 5cacaf750349e67deb475da54c3e8d68048c068d -Author: wxy -Date: Thu Dec 18 00:08:35 2014 +0800 - - PUB:20140818 Why Your Company Needs To Write More Open Source Software - - @barney-ro - -commit 6dff097ea10967752d78ff9c87184cfb6810cd4b -Author: wxy -Date: Wed Dec 17 23:42:19 2014 +0800 - - PUB:05 - The history of Android - - @alim0x - -commit 86dbb67ef725febcf36c3dae16978b7b5643ccc4 -Author: wxy -Date: Wed Dec 17 23:31:40 2014 +0800 - - PUB:20141027 How to encrypt files and directories with eCryptFS on Linux - - @GOLinux - -commit 2f4ad746369b6334f94072008dea3dd07ae76da1 -Author: wxy -Date: Wed Dec 17 23:19:04 2014 +0800 - - PUB:20141021 Configuring layer-two peer-to-peer VPN using n2n - - @GOLinux - -commit 2537751954bd04f3fa4720a893113d9f4d07bd54 -Merge: b721315 a55029a -Author: Xingyu.Wang -Date: Wed Dec 17 22:11:27 2014 +0800 - - Merge pull request #2121 from johnhoow/master - - 翻译完成 - -commit b721315edf7ebc7654082f848422505c447c7c69 -Merge: 53e5d19 45f20f6 -Author: Xingyu.Wang -Date: Wed Dec 17 22:11:10 2014 +0800 - - Merge pull request #2120 from alim0x/master - - [translated]10 - The history of Android.md - -commit 03202e2dfdbe5a3c988a5e96573619e34446539d -Author: ZTinoZ -Date: Wed Dec 17 20:54:13 2014 +0800 - - Translating by ZTinoZ - -commit 53e5d1942d52ff0db67f5c334c5dc07f37090c6b -Author: DeadFire -Date: Wed Dec 17 16:27:13 2014 +0800 - - 20141217-2 选题 - -commit a55029a9f62ccc457bbaf6d6a0fed64ce1ba2ad7 -Author: johnhoow -Date: Wed Dec 17 15:12:20 2014 +0800 - - modify - -commit 36c48afc1d55cd0c604c9f4fe3f13d9095eedf8c -Author: johnhoow -Date: Wed Dec 17 15:10:20 2014 +0800 - - modify - -commit eded5eee9b6c3d8202a8c4812e546c510537bf9b -Author: johnhoow -Date: Wed Dec 17 15:04:57 2014 +0800 - - translated - -commit 45f20f6a52bae3c06c5186c3bd6f3d544eb8a206 -Author: alim0x -Date: Wed Dec 17 13:11:36 2014 +0800 - - [translated]10 - The history of Android.md - -commit 3b87ab6c50e0a9e4c00f022891a99f00f653bb91 -Merge: fda2d2a 24eaa2d -Author: joeren -Date: Wed Dec 17 11:55:11 2014 +0800 - - Merge pull request #12 from LCTT/master - - Update Repository - -commit 24eaa2d4de95e363da5746b72f5db05d7643d8fa -Author: DeadFire -Date: Wed Dec 17 10:57:09 2014 +0800 - - 20141217-1 选题 - -commit 48b58798712c2e2ed4974a2d429e4b2486c2da5b -Merge: f66dd60 eeb84d9 -Author: Xingyu.Wang -Date: Wed Dec 17 10:07:48 2014 +0800 - - Merge pull request #2119 from yupmoon/master - - translating Open source all over the world.md - -commit eeb84d9941ff75f93487f187f64477bc6c0f1e43 -Author: yupmoon -Date: Wed Dec 17 09:55:28 2014 +0800 - - yupmoon translating... - -commit ffd2d2188af2f0b451f538deba5506dd49a701b1 -Merge: 0a65b81 f66dd60 -Author: yupmoon -Date: Wed Dec 17 09:48:38 2014 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit f66dd6081854bd04eb471cff9bb4f86b04bf2fd6 -Author: wxy -Date: Wed Dec 17 00:12:04 2014 +0800 - - PUB:20141017 How to check hard disk health on Linux using smartmontools - - @KayGuoWhu - -commit fd54eb2202aea934efbc05665087ae9394e60c42 -Author: wxy -Date: Tue Dec 16 23:55:43 2014 +0800 - - PUB:20141204 Readers' Choice Awards 2014--Linux Journal - - @yupmoon 翻译的不错！ - -commit 4175ca0b64dbb28ba6f5e93a1f0c94c57a5de29b -Author: wxy -Date: Mon Dec 15 16:29:14 2014 +0800 - - PUB:20141211 Linux Kernel 3.18 Released, This Is What' s New - - @geekpi - -commit f627136220594de83b9c904ab7b2db14aaf4a4cc -Author: wxy -Date: Mon Dec 15 16:18:04 2014 +0800 - - PUB:20141013 Manage Multiple Logical Volume Management Disks using Striping I O--Part V - - @GOLinux - -commit e3e23caf5c1494f2af793919bee6a72f19c0cb2e -Merge: 67339eb bec12e6 -Author: Xingyu.Wang -Date: Tue Dec 16 23:19:36 2014 +0800 - - Merge pull request #2118 from SPccman/master - - How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS & How to create a custom backup plan for Debian with backupninja - -commit 67339eb6dd63394c2a115eb1e8deeb64fc50687a -Merge: d1eb322 ef10044 -Author: Xingyu.Wang -Date: Tue Dec 16 23:18:10 2014 +0800 - - Merge pull request #2117 from yupmoon/master - - choice awards ...translated - -commit d1eb3228fbe143ab7b9947224b37984cedbc9110 -Merge: 103c336 34ea47e -Author: Xingyu.Wang -Date: Tue Dec 16 23:17:00 2014 +0800 - - Merge pull request #2116 from ZTinoZ/master - - Translating by ZTinoZ - -commit bec12e6fcc5a86556e6f36aee65cdff0132f32d4 -Author: DoubleC <450760206@qq.com> -Date: Tue Dec 16 20:01:34 2014 +0800 - - 翻译完成 - -commit 246b2f862eb854f5c93f7b691cab9c73f90b8652 -Author: DoubleC <450760206@qq.com> -Date: Tue Dec 16 20:00:45 2014 +0800 - - 翻译完成 - - 这篇文章，之前应该还有一篇，本来要一起发上来的，群里面催了一下，就算了，这篇先发 - -commit 97fd96a1eff948f3a09b9502b5555dcc0e9c3172 -Author: DoubleC <450760206@qq.com> -Date: Tue Dec 16 19:57:43 2014 +0800 - - delete source file - - 删除原文 - -commit d64adef0e96fc9b0f19e602cfd26fc1d4d58eec9 -Author: DoubleC <450760206@qq.com> -Date: Tue Dec 16 19:57:08 2014 +0800 - - delete source file - -commit 34a4de8535d2eee6da877a96653898b380cc44cc -Merge: 1e95d12 103c336 -Author: DoubleC <450760206@qq.com> -Date: Tue Dec 16 19:47:22 2014 +0800 - - Merge pull request #11 from LCTT/master - - update - -commit 0a65b817548bd4471d0c01eb820199255a21dda9 -Merge: ef10044 103c336 -Author: yupmoon -Date: Tue Dec 16 16:56:25 2014 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit ef10044316b5cc97a62d3ab0d9548165e03c532a -Author: yupmoon -Date: Tue Dec 16 16:52:31 2014 +0800 - - choice awards ...translated - -commit 34ea47e2c974dfa47167b2b815a1d2bf30aae55b -Author: ZTinoZ -Date: Tue Dec 16 09:32:20 2014 +0800 - - Translating by ZTinoZ - -commit 98d969797ea7d09a3355d3e9348494cedf6f8944 -Merge: fb7ea0e 103c336 -Author: ZhouJ-sh <32321321@qq.com> -Date: Tue Dec 16 09:29:53 2014 +0800 - - Merge pull request #1 from LCTT/master - - Merge from base - -commit 0f79c28187de7c512f059d2d89515175fb0b1ee2 -Merge: 174a778 103c336 -Author: ZTinoZ -Date: Tue Dec 16 09:27:57 2014 +0800 - - Merge pull request #2 from LCTT/master - - Update the repositories - -commit 103c336cb4e6994854a97ebbe3729abf92cbea2c -Merge: fc24411 fda2d2a -Author: joeren -Date: Tue Dec 16 08:44:59 2014 +0800 - - Merge pull request #2115 from GOLinux/master - - [Translated] 20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md - -commit fda2d2ad7fd05262b6a4d1a63d7c54842bf6dd10 -Author: GOLinux -Date: Tue Dec 16 08:42:14 2014 +0800 - - [Translated] 20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md - -commit fc2441129ac13bc6b929a10fdd2155910a94b680 -Merge: b435d45 d9ae8c1 -Author: joeren -Date: Tue Dec 16 08:14:55 2014 +0800 - - Merge pull request #2114 from GOLinux/master - - [Translating] 20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md - -commit d9ae8c1739e941fd0ffa83fa136ab3e3d50ff7f5 -Author: joeren -Date: Tue Dec 16 08:14:24 2014 +0800 - - Update 20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md - -commit 9490898a5e8430ad11dca7d7307fcf52e9345199 -Merge: 8d9777a b435d45 -Author: joeren -Date: Tue Dec 16 08:13:17 2014 +0800 - - Merge pull request #11 from LCTT/master - - Update Repository - -commit b435d45abcc48326659ca53d3be3b2fe5b499412 -Merge: 5f03ba9 174a778 -Author: joeren -Date: Tue Dec 16 08:12:45 2014 +0800 - - Merge pull request #2113 from ZTinoZ/master - - Finish the translation by ZTinoZ - -commit 174a778200dd9ddd22e964ad016096f054fde705 -Author: ZTinoZ -Date: Mon Dec 15 20:50:20 2014 +0800 - - Finish the translation by ZTinoZ - -commit 8d9777a37eedabb0a6afd46125fffb3fd1f63a88 -Merge: 193c789 5f03ba9 -Author: joeren -Date: Mon Dec 15 09:43:08 2014 +0800 - - Merge pull request #10 from LCTT/master - - Update Repository - -commit 5f03ba9eaaef6c51b42cb22cd72f606709c6bf80 -Author: wxy -Date: Sun Dec 14 19:24:23 2014 +0800 - - PUB:20141009 How to set up RAID 10 for high performance and fault tolerant disk I or O on Linux - - @KayGuoWhu - -commit 50ea541534d677c0c0508b99d80b68fc3227a216 -Merge: 45b2034 553b97a -Author: geekpi -Date: Sun Dec 14 14:24:29 2014 +0800 - - Merge pull request #2112 from geekpi/master - - [Translated] What is a good free control panel for VPS.md - -commit 553b97ac39432d37ddf721607d6a2d726df4e61b -Author: zhengsihua -Date: Sun Dec 14 14:18:08 2014 +0800 - - [Translated] What is a good free control panel for VPS.md - -commit 45b203456d03ddba9c22de083139cd0176d253ac -Merge: 9d595b9 3de7f54 -Author: geekpi -Date: Sun Dec 14 13:16:43 2014 +0800 - - Merge pull request #2111 from geekpi/master - - [Translating] What is a good free control panel for VPS.md - -commit 3de7f543e2d4f3284e16fae6f137956811648be2 -Author: zhengsihua -Date: Sun Dec 14 13:15:40 2014 +0800 - - [Translating] What is a good free control panel for VPS.md - -commit 9d595b919ce63edaf0cb51fcefe5e1211ce1a6a2 -Merge: 961a502 3179279 -Author: geekpi -Date: Sun Dec 14 13:07:42 2014 +0800 - - Merge pull request #2110 from runningwater/master - - 【翻译中 by runningwater】 20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X - -commit 317927958edbe926639647895d400240254ded0b -Author: runningwater -Date: Sat Dec 13 20:02:23 2014 +0800 - - 翻译中 by runningwater - -commit 961a502a4aeac47bf71b8b00bb9b2e7e4431e0de -Merge: 2522c4a 7aeeb75 -Author: geekpi -Date: Sat Dec 13 13:02:49 2014 +0800 - - Merge pull request #2109 from geekpi/master - - [Translated] How to use Evernote from the command line on Linux.md - -commit 7aeeb75205813f2e8739ef4c2e0e9662b425aa94 -Author: zhengsihua -Date: Sat Dec 13 13:01:07 2014 +0800 - - [Translated] How to use Evernote from the command line on Linux.md - -commit 2522c4af102f69d5a9afd75321c83d9145f03d49 -Merge: 47f3bba 473785a -Author: geekpi -Date: Sat Dec 13 12:10:37 2014 +0800 - - Merge pull request #2108 from geekpi/master - - [Translating] How to use Evernote from the command line on Linux - -commit 473785ad1920b82d97a2716dea5287dc72962991 -Author: zhengsihua -Date: Sat Dec 13 12:01:57 2014 +0800 - - [Translating] How to use Evernote from the command line on Linux - -commit 47f3bba0d769d3217a5cd47f6f5c996668d66182 -Merge: 881d47a 434de3b -Author: Xingyu.Wang -Date: Sat Dec 13 01:27:13 2014 +0800 - - Merge pull request #2107 from geekpi/master - - [Translated] Linux Kernel 3.18 Released, This Is What’s New - -commit 434de3b52a29302875c41912bf7487baaadb2dc5 -Author: zhengsihua -Date: Fri Dec 12 22:12:44 2014 +0800 - - [Translated] Linux Kernel 3.18 Released, This Is What’s New - -commit 881d47afdb1fb4669c3913593ab5981777425136 -Merge: d902163 b875372 -Author: geekpi -Date: Fri Dec 12 21:38:05 2014 +0800 - - Merge pull request #2106 from geekpi/master - - [Translating] Linux Kernel 3.18 Released, This Is What’s New - -commit b875372fe0c1dcb282883738d820f2a69ac06a66 -Author: zhengsihua -Date: Fri Dec 12 21:18:12 2014 +0800 - - [Translating] Linux Kernel 3.18 Released, This Is What’s New - -commit 3a033231a90ce6d076a1b80a0d3657aa0aa76cbb -Author: ideas4u -Date: Fri Dec 12 16:21:39 2014 +0800 - - Create 20141211 How to use matplotlib for scientific plotting on Linux - -commit d902163264553da73b36788bc7d405974e0f065c -Author: carolinewuyan <309866211@qq.com> -Date: Fri Dec 12 11:03:58 2014 +0800 - - 已发布 - -commit 489d3b5224247f8373ae4beffaf02bb8e12d007d -Author: carolinewuyan <309866211@qq.com> -Date: Fri Dec 12 11:01:08 2014 +0800 - - 已校对 - -commit 193c78927bb15e7a16771961f3d7dfae6eb1db79 -Merge: 99bb0fc 48dd231 -Author: joeren -Date: Fri Dec 12 10:27:18 2014 +0800 - - Merge pull request #9 from LCTT/master - - Update Repository - -commit 48dd231c3d68b0a7de27ab2b15e9356210339550 -Merge: 46ac8d6 99bb0fc -Author: joeren -Date: Fri Dec 12 10:25:56 2014 +0800 - - Merge pull request #2100 from GOLinux/master - - Delete duplicated files - -commit 99bb0fc98f8dd0ae540fed760c2cccfbfefa4703 -Author: GOLinux -Date: Fri Dec 12 10:23:21 2014 +0800 - - Delete duplicated files - -commit 46ac8d67cdbfacd5dd4c3c38a4c3071642ceebc7 -Merge: 15a8c87 ddaf9d4 -Author: joeren -Date: Fri Dec 12 10:19:47 2014 +0800 - - Merge pull request #2099 from GOLinux/master - - 两篇重复文章，已有人领，请勿重复申领。 - -commit ddaf9d4c1ee0e5061e0e5a2705c1f1bf5b9f8dc0 -Author: joeren -Date: Fri Dec 12 10:18:37 2014 +0800 - - Update 20141205 How to use matplotlib for scientific plotting on Linux.md - -commit 323481080d169c6d6cec55e01e2f7247300136e1 -Author: joeren -Date: Fri Dec 12 10:17:14 2014 +0800 - - Update 20141211 How to configure a syslog server with rsyslog on Linux.md - -commit af0a365de2f7b61f355595f2dabb03e4473941bd -Merge: 9ff2c39 15a8c87 -Author: joeren -Date: Fri Dec 12 09:58:21 2014 +0800 - - Merge pull request #8 from LCTT/master - - Update Repository - -commit 15a8c875469a8655e5fa697859a62db61d2e845e -Merge: ef92116 c6883a4 -Author: joeren -Date: Fri Dec 12 09:57:48 2014 +0800 - - Merge pull request #2098 from Stevearzh/master - - Translating by Stevearzh - -commit ef921160cbbf66562f5852f571c346ff2c75a990 -Merge: 47eef26 e7c71dd -Author: joeren -Date: Fri Dec 12 09:57:40 2014 +0800 - - Merge pull request #2097 from ideas4u/patch-1 - - Update 20141211 How to use matplotlib for scientific plotting on Linux.m... - -commit c6883a43a02b6614078d33b3573e708b922abdfd -Author: Stevearzh -Date: Thu Dec 11 23:27:34 2014 +0800 - - Translating by Stevearzh - -commit 47eef26efebb6dd56ef94358838b9d3e978ef4ed -Merge: 888b79d f0baa45 -Author: geekpi -Date: Thu Dec 11 21:37:10 2014 +0800 - - Merge pull request #2094 from Vic020/master - - 忘记推送了~ - -commit 888b79d229ea448e532905ffc5608c313dcc196a -Merge: 7dcf341 a8dd5da -Author: geekpi -Date: Thu Dec 11 21:36:27 2014 +0800 - - Merge pull request #2095 from SPccman/patch-10 - - 文章重复 - -commit 7dcf341999e8e94af6ab9f4c342d48b68501c738 -Merge: 3ad2ea5 0bceb3d -Author: geekpi -Date: Thu Dec 11 21:35:56 2014 +0800 - - Merge pull request #2096 from SPccman/patch-11 - - translating - -commit d98dd820a1e7926e289e643df11cb356adcb01d2 -Author: ZTinoZ -Date: Thu Dec 11 21:01:27 2014 +0800 - - Translating by ZTinoZ - -commit 3ad2ea5e505e6cfbba527ebb558461be3acff51e -Author: carolinewuyan <309866211@qq.com> -Date: Thu Dec 11 20:57:06 2014 +0800 - - 已发布 - -commit f17bb612a0be28921313a4a63e9dda67134138fc -Author: carolinewuyan <309866211@qq.com> -Date: Thu Dec 11 20:52:46 2014 +0800 - - 已校对 - -commit e7c71dd8ef8839f6ecea6a0bbdea01023828e06d -Author: ideas4u -Date: Thu Dec 11 17:59:17 2014 +0800 - - Update 20141211 How to use matplotlib for scientific plotting on Linux.md - -commit 762cfef575fb3bb58459145c896ece565b28432b -Author: DeadFire -Date: Thu Dec 11 17:43:58 2014 +0800 - - 20141211-6 选题 - -commit 0bceb3dac69ce61188e0e5c26b59646d0c5fd580 -Author: DoubleC <450760206@qq.com> -Date: Thu Dec 11 17:39:39 2014 +0800 - - translating - - apply artical - -commit a8dd5da95d05adf2c5be221e0d90d8a26274c919 -Author: DoubleC <450760206@qq.com> -Date: Thu Dec 11 17:33:48 2014 +0800 - - 文章重复 - - 文章重复，我之前领了，还没翻完。 - -commit 123fc31871aba93608d7b7e4c98d5cabdb8fdbd5 -Author: DeadFire -Date: Thu Dec 11 17:28:44 2014 +0800 - - 20141211-5 选题 - -commit dd2676ef2beadca89353d654e1261aeaf167b064 -Author: DeadFire -Date: Thu Dec 11 17:14:19 2014 +0800 - - 20141211-4 选题 - -commit 8db52bfc8a70111f084f5d490b5d19cff70fd914 -Author: DeadFire -Date: Thu Dec 11 17:03:50 2014 +0800 - - 20141211-3 选题 - -commit ffafaea7f9a912f16416270c72b7cb664965362e -Author: DeadFire -Date: Thu Dec 11 16:52:08 2014 +0800 - - 20141211-2 选题 - -commit 073e360542163476b08c856c0b5dad2e320ac8b7 -Author: DeadFire -Date: Thu Dec 11 16:45:37 2014 +0800 - - 20141211-1 选题 - -commit f0baa4539e8d9ce0de8f264e003da4a18c45b63b -Author: Vic___ -Date: Thu Dec 11 15:12:51 2014 +0800 - - Moved - -commit d927d84e12f2841d10c6369ca94cfb91f3fcd330 -Author: Vic___ -Date: Thu Dec 11 15:12:16 2014 +0800 - - Translated - -commit 4bd2187c942b3d09458301f2972064ea4b4c7b9f -Merge: 2102c12 9ff2c39 -Author: joeren -Date: Thu Dec 11 09:27:16 2014 +0800 - - Merge pull request #2093 from GOLinux/master - - [Translated] 20141210 How to configure rsyslog client for remote logging on CentOS.md - -commit 9ff2c39e16a4771c89c12d17c45de652aefeb1c8 -Author: GOLinux -Date: Thu Dec 11 09:25:54 2014 +0800 - - [Translated] 20141210 How to configure rsyslog client for remote logging on CentOS.md - -commit 2102c1219cf1679f98b5a03bac9651502426bb82 -Merge: 609ec2d 128de94 -Author: joeren -Date: Thu Dec 11 08:43:52 2014 +0800 - - Merge pull request #2092 from GOLinux/master - - [Translating] 20141210 How to configure rsyslog client for remote logging on CentOS.md - -commit 128de94826ac7b5cd05da48f9ca6708e7bf33515 -Author: joeren -Date: Thu Dec 11 08:43:05 2014 +0800 - - Update 20141210 How to configure rsyslog client for remote logging on CentOS.md - -commit f64b0123db9dd57c718661499ef0093c8ab8b8ef -Merge: 27d61e5 609ec2d -Author: joeren -Date: Thu Dec 11 08:42:23 2014 +0800 - - Merge pull request #7 from LCTT/master - - Update Repository - -commit 609ec2df0faac26a31038574ae04aad31a01e9e5 -Merge: 281fa43 e2dd617 -Author: Xingyu.Wang -Date: Wed Dec 10 21:13:21 2014 +0800 - - Merge pull request #2091 from su-kaiyao/master - - su-kaiyao translated 20141205 10 free Commands to Check Memory Usage in Linux.md - -commit 281fa431422f271d63eb66a212b4f0434d44f127 -Merge: 0c763de 4bf1011 -Author: Xingyu.Wang -Date: Wed Dec 10 21:12:37 2014 +0800 - - Merge pull request #2090 from yupmoon/master - - yupmoon translating 20141204 Readers' Choice Awards 2014--Linux Journal - -commit e2dd61786bc8237e8258434a73882576ffabb903 -Author: su-kaiyao <1250471161@qq.com> -Date: Wed Dec 10 20:50:34 2014 +0800 - - su-kaiyao translated - -commit 4f9077ac9ee9dd7b7d80bbb646170854d55291ca -Author: ZTinoZ -Date: Wed Dec 10 20:07:20 2014 +0800 - - Translating by ZTinoZ - -commit 0c763de017fb1843829ba82a967f9fdbb879bf6e -Author: DeadFire -Date: Wed Dec 10 16:16:48 2014 +0800 - - 20141210-1 选题 - -commit 4bf101114ef54100a1a0e15b6449bbcc022a3bda -Author: yupmoon -Date: Wed Dec 10 11:15:05 2014 +0800 - - yupmoon translating - -commit 5cdb8d3f4e1ada39ab467a39f12271e0fb7d37b2 -Merge: e8816d2 27d61e5 -Author: joeren -Date: Wed Dec 10 10:06:30 2014 +0800 - - Merge pull request #2089 from GOLinux/master - - [Translated] 20141208 Nathive--A libre software image editor.md - -commit 27d61e5795d1ba68c8dfcfab28711c9b414f3f79 -Author: GOLinux -Date: Wed Dec 10 10:03:43 2014 +0800 - - [Translated] Two - -commit e8816d2a067e2aa40fcf04053cbf43385f1c9341 -Merge: de9a981 dc4b334 -Author: joeren -Date: Wed Dec 10 09:08:51 2014 +0800 - - Merge pull request #2088 from GOLinux/master - - [Translating] 20141208 Getting Started With Ubuntu 14.04 (PDF Guide).md - -commit dc4b3340b2f9efeee2a42d9ecc9bfb7458c6cb8c -Author: joeren -Date: Wed Dec 10 09:08:32 2014 +0800 - - Update 20141208 Getting Started With Ubuntu 14.04 (PDF Guide).md - -commit de9a981f8ab7fc3f449b374c34418d49d8f6997b -Merge: b36c5c7 b4133cf -Author: joeren -Date: Wed Dec 10 09:07:51 2014 +0800 - - Merge pull request #2087 from GOLinux/master - - [Translating] 20141208 Nathive--A libre software image editor.md - -commit b4133cfddc22f8e3cb91389a2340432ffca7e98a -Author: joeren -Date: Wed Dec 10 09:07:31 2014 +0800 - - Update 20141208 Nathive--A libre software image editor.md - -commit b36c5c7f68938c148bea8f9b73360939f7c48203 -Merge: 37f3fd2 5389dfc -Author: joeren -Date: Wed Dec 10 09:06:30 2014 +0800 - - Merge pull request #2086 from GOLinux/master - - [Translated] 20141208 Linux FAQs with Answers--How to crop an image from the command line on Linux.md - -commit 5389dfc5aad3a6bb9d0ab00b15145ad818f77f23 -Author: GOLinux -Date: Wed Dec 10 09:04:38 2014 +0800 - - [Translated] 20141208 Linux FAQs with Answers--How to crop an image from the command line on Linux.md - -commit 37f3fd2e711e25ca0774a6b9843f3a322670a1dd -Merge: 0934db2 0559d98 -Author: joeren -Date: Wed Dec 10 08:38:23 2014 +0800 - - Merge pull request #2085 from GOLinux/master - - [Translating] 20141208 Linux FAQs with Answers--How to crop an image from the command line on Linux.md - -commit 0559d9835646fd7e9c41b6c3ad68468428d17487 -Author: joeren -Date: Wed Dec 10 08:37:42 2014 +0800 - - Update 20141208 Linux FAQs with Answers--How to crop an image from the command line on Linux.md - -commit be9a8ac489d7fecd08f4bed91c9b2e6d1ed43c4f -Merge: d099251 0934db2 -Author: joeren -Date: Wed Dec 10 08:36:48 2014 +0800 - - Merge pull request #6 from LCTT/master - - Update Repository - -commit 0934db2eb8543ead4adc215d39e254f84343dc42 -Merge: 723d9b0 c55bac0 -Author: joeren -Date: Wed Dec 10 08:35:43 2014 +0800 - - Merge pull request #2084 from yupmoon/master - - translated - -commit 723d9b0ea1fcde8a9b8a78d1e861e36b3ffdd448 -Merge: 90d94f8 ab0ed58 -Author: joeren -Date: Wed Dec 10 08:35:32 2014 +0800 - - Merge pull request #2083 from Stevearzh/master - - [Translated by Stevearzh]Five Magnificent Linux Music Streaming Clients - -commit c55bac0729ea6db74e7d867275638f2e6351352b -Merge: 48d8eb3 90d94f8 -Author: yupmoon -Date: Tue Dec 9 22:58:00 2014 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit 48d8eb34244fbc3b4cc0ca9e2de720e66eb51775 -Author: yupmoon -Date: Tue Dec 9 22:52:30 2014 +0800 - - translated - -commit 90d94f8b22daac8025ddad2308adae89c258d207 -Merge: fb7ea0e e04ad3b -Author: Xingyu.Wang -Date: Tue Dec 9 22:45:39 2014 +0800 - - Merge pull request #2082 from yupmoon/master - - yupmoon translating - 下回请修改 PR 的标题，带上文件名。 - -commit ab0ed58ba8c9b84023ef0eb508cc5bef3c9263e7 -Author: Stevearzh -Date: Tue Dec 9 22:10:32 2014 +0800 - - Translated by Stevearzh - -commit 521ad3dc3dec085e6b52d893b87b995523c312a8 -Author: Stevearzh -Date: Tue Dec 9 22:07:02 2014 +0800 - - Translated by Stevearzh - -commit e04ad3b1081977c7a32ee10ef949ed620e0df19e -Author: yupmoon -Date: Tue Dec 9 18:07:09 2014 +0800 - - yupmoon translating - -commit 4843057c838360371f90af236009f568b5b0b3a7 -Author: ZTinoZ -Date: Tue Dec 9 12:00:26 2014 +0800 - - Translating by ZTinoZ - -commit d099251ca2c9a3784044e9cd54c8c80ead061592 -Merge: 6e5d25a fb7ea0e -Author: joeren -Date: Tue Dec 9 11:58:55 2014 +0800 - - Merge pull request #5 from LCTT/master - - Update Repository - -commit fb7ea0e8367b7f17758d468c013b53acceb56530 -Merge: 907ab34 aebf340 -Author: Xingyu.Wang -Date: Tue Dec 9 10:04:29 2014 +0800 - - Merge pull request #2081 from coloka/master - - 【translating】How to configure a syslog server with rsyslog on Linux - -commit 907ab34aecda3f52bf0dc63ba9ab517b3928f337 -Author: wxy -Date: Tue Dec 9 00:16:58 2014 +0800 - - PUB:20141004 Practical Lessons in Peer Code Review - - @johnhoow - -commit dcd75324b12cf1a1c3d73ae99463e35f9d4e01b4 -Author: wxy -Date: Mon Dec 8 23:41:49 2014 +0800 - - PUB:20141030 How to run SQL queries against Apache log files on Linux - - @ThomazL - -commit aebf3406d683699672b214e45244a54613b8c577 -Author: coloka -Date: Mon Dec 8 23:13:05 2014 +0800 - - 【translating】How to configure a syslog server with rsyslog on Linux - -commit c12080cf74c4d9d4061497de60adf9ae37e8173c -Merge: 6919ef0 091fef5 -Author: Xingyu.Wang -Date: Mon Dec 8 21:37:41 2014 +0800 - - Merge pull request #2080 from Vic020/patch-23 - - 抢地主 - -commit 091fef52aa3b9da7055c5ccf2e15eb8b49aee6e7 -Author: Vic___ -Date: Mon Dec 8 18:38:06 2014 +0800 - - 抢地主 - -commit 88a89be1346aee4188575b1c9fff28063c5ca8be -Author: ZTinoZ -Date: Mon Dec 8 18:00:37 2014 +0800 - - Translating by ZTinoZ - -commit 6919ef07d64e7be757be0fb49c7e39b10b980770 -Merge: 8af28b6 98c3c32 -Author: Xingyu.Wang -Date: Mon Dec 8 16:22:52 2014 +0800 - - Merge pull request #2079 from su-kaiyao/master - - su-kaiyao translating 20141205 10 free Commands to Check Memory Usage in Linux.md - -commit 8af28b62a8dbc95328cd8bebb0652e3dab0d2bf3 -Merge: 1903cc9 36f58e0 -Author: Xingyu.Wang -Date: Mon Dec 8 16:20:55 2014 +0800 - - Merge pull request #2078 from disylee/patch-1 - - Update 20141203 Docker--Present and Future.md - -commit 1903cc9b554b5726305861934bcb6698e34a7319 -Author: DeadFire -Date: Mon Dec 8 16:19:15 2014 +0800 - - 20141208-3 选题 - -commit 177246828d3701a6d12c014511e6dd716d867df2 -Author: DeadFire -Date: Mon Dec 8 15:59:26 2014 +0800 - - 20141208-2 选题 - -commit 98c3c3272466e00d1bfbc0270253d4ae55803890 -Author: su-kaiyao <1250471161@qq.com> -Date: Mon Dec 8 14:30:03 2014 +0800 - - su-kaiyao translating - -commit 40573bc7c61f4100059f12bb81fda55f993cb148 -Author: DeadFire -Date: Mon Dec 8 11:23:55 2014 +0800 - - 20141208-1 选题 - -commit 36f58e07b0504b077e9d3a5e1f9e8068e4f65719 -Author: disylee -Date: Mon Dec 8 09:46:36 2014 +0800 - - Update 20141203 Docker--Present and Future.md - - by disylee - -commit 2205ebbc7fe5322d963787e03992e2be49f9b620 -Author: wxy -Date: Sun Dec 7 23:40:38 2014 +0800 - - PUB:20141125 Linux FAQs with Answers--How to fix ImportError--No module named scapy.all - - @GOLinux - -commit b6ea28565489965b2e92b233b48c2493f4200f12 -Author: wxy -Date: Sun Dec 7 23:12:29 2014 +0800 - - PUB:20140901 How to use on-screen virtual keyboard on Linux - - @forsil 翻译的不错。就是1、你没在文末写你的译者名称；2、请使用中文标点。 - -commit 6ed2cc9fdb86bfb357873c681462ea8bff035806 -Author: wxy -Date: Sun Dec 7 22:49:02 2014 +0800 - - PUB:20141204 Official Ubuntu 14.10 Utopic Unicorn T-Shirts Now Available to Buy - - @geekpi - -commit 20ccb6b22d9ec90faaaf62034e84222eab39ba81 -Author: wxy -Date: Sun Dec 7 22:34:51 2014 +0800 - - 移动到translated目录 - - @JonathanKang - -commit 00a6c2405e222a55587e420718b0efe314ff7224 -Merge: c34a215 7c27e83 -Author: Xingyu.Wang -Date: Sun Dec 7 22:31:12 2014 +0800 - - Merge pull request #2073 from coloka/master - - 【翻译完成】20141125 Four ways Linux is headed for no-downtime kernel patching.md - -commit c34a215975a8e54c4c6c06bb97f50e6bcbf75cb5 -Merge: a0607ee c8841c0 -Author: Xingyu.Wang -Date: Sun Dec 7 22:28:30 2014 +0800 - - Merge pull request #2072 from JonathanKang/master - - Translated - 忘记挪目录了吧？下次记得哦。 - -commit a0607eeaf892747caffa53ac5abe8bbe366470e7 -Merge: 0c4b458 e69d01e -Author: Xingyu.Wang -Date: Sun Dec 7 22:26:30 2014 +0800 - - Merge pull request #2071 from su-kaiyao/master - - su-kaiyao translated 20141204 How To Run Linux Programs From The Terminal In Background Mode.md - -commit 0c4b458f1a0d96464c28e1727f84bf7746e8461b -Merge: 6704154 9f0f5ca -Author: geekpi -Date: Sun Dec 7 17:45:10 2014 +0800 - - Merge pull request #2077 from geekpi/master - - translated - -commit 9f0f5ca11070cc542619aa74b74f834c5a6d9116 -Author: zhengsihua -Date: Sun Dec 7 17:43:57 2014 +0800 - - translated - -commit 6704154368db5ab5b27a6cdae92d34a6bd0dbf21 -Merge: d3bcd51 938c6fb -Author: geekpi -Date: Sun Dec 7 16:44:53 2014 +0800 - - Merge pull request #2076 from geekpi/master - - translating - -commit 938c6fb3946917506de88e748fc29c39163c9c5e -Author: zhengsihua -Date: Sun Dec 7 16:39:04 2014 +0800 - - translating - -commit c50cd50df5cc22acdeefba2d99df436231a809bb -Merge: d98d2b5 d3bcd51 -Author: zhengsihua -Date: Sun Dec 7 16:37:27 2014 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject - -commit 7c27e836d8a4fdc105d443b5155e59d852ffea02 -Merge: ce00a0c d3bcd51 -Author: coloka -Date: Sun Dec 7 11:19:03 2014 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject.git - -commit ce00a0c10ca71a593d87b8a6831445e7b92cc689 -Author: coloka -Date: Sun Dec 7 11:18:56 2014 +0800 - - 【翻译完成】20141125 Four ways Linux is headed for no-downtime kernel patching - -commit c8841c085193e40ed597c7afda073794d741d9de -Author: Jonathan Kang -Date: Sun Dec 7 10:04:48 2014 +0800 - - Translated - -commit e69d01e26072b178d650290137202300aa250769 -Author: su-kaiyao <1250471161@qq.com> -Date: Sat Dec 6 21:54:40 2014 +0800 - - su-kaiyao translated - -commit d3bcd518930881098af3e5abae645b5f54a24fa3 -Merge: 830e5a5 a5a76e1 -Author: Xingyu.Wang -Date: Sat Dec 6 17:10:48 2014 +0800 - - Merge pull request #2070 from su-kaiyao/master - - su-kaiyao translating 20141204 How To Run Linux Programs From The Terminal In Background Mode.md - -commit 830e5a546bd02b9a10a91845f5d6d6f0b86025ae -Merge: 5edd21d bae30fd -Author: Xingyu.Wang -Date: Sat Dec 6 17:10:16 2014 +0800 - - Merge pull request #2069 from SPccman/patch-9 - - Update 20141205 How to create a custom backup plan for Debian with backu... - -commit 5edd21de1f01fe5ad51c6fd4f54ea55e009bc256 -Merge: 1e7168c d8a14e7 -Author: Xingyu.Wang -Date: Sat Dec 6 17:09:54 2014 +0800 - - Merge pull request #2068 from Vic020/master - - Translated - -commit a5a76e14a91722e40d2b0f5d6cac9f3b5e56237a -Author: su-kaiyao <1250471161@qq.com> -Date: Sat Dec 6 12:50:01 2014 +0800 - - su-kaiyao translating - -commit bae30fddc09374099f4b7069383c93a612c0a4b4 -Author: DoubleC <450760206@qq.com> -Date: Sat Dec 6 10:26:22 2014 +0800 - - Update 20141205 How to create a custom backup plan for Debian with backupninja.md - - 申领文章 - -commit 1e7168c4d96f933be8e59265153307decf0ebd58 -Author: DeadFire -Date: Fri Dec 5 23:41:09 2014 +0800 - - 20141205-4 选题 - -commit d8a14e7733e99d7e58dcabdd735ce0dacdb726bd -Author: Vic___ -Date: Fri Dec 5 23:41:09 2014 +0800 - - moved - -commit 8160d35495568a58f2e3d757ac2ecbb5236374c6 -Author: Vic___ -Date: Fri Dec 5 23:39:50 2014 +0800 - - Translated - -commit d83bf7321b6577d9e5b9bf3e819c071ce0912ffd -Merge: c3983be 0c2eb30 -Author: geekpi -Date: Fri Dec 5 22:58:22 2014 +0800 - - Merge pull request #2067 from geekpi/master - - translated - -commit d98d2b5c2ffb579f4c87312eb71ae7b9bd24700d -Author: zhengsihua -Date: Fri Dec 5 22:57:29 2014 +0800 - - translated - -commit 0c2eb305197a2adeaa7d51313f3af2024b32ec10 -Author: geekpi -Date: Fri Dec 5 09:49:22 2014 -0500 - - translated - -commit c3983be1cd409a4589a204da1d5d5f982d694e08 -Merge: 65df647 f08ce4b -Author: geekpi -Date: Fri Dec 5 22:47:03 2014 +0800 - - Merge pull request #2066 from geekpi/master - - translating - -commit cc063420fe3107398e633f67f0182f2e925695a9 -Author: geekpi -Date: Fri Dec 5 09:45:42 2014 -0500 - - translated - -commit f08ce4b7c1e61240332ea29a0918c3f8d8295fb6 -Author: geekpi -Date: Fri Dec 5 09:40:03 2014 -0500 - - translating - -commit 65df647065b6983726e953f19d7b44add841d734 -Author: DeadFire -Date: Fri Dec 5 19:54:15 2014 +0800 - - 20141205-3 选题 - -commit e4f3b848e87ff381bd4f4721fd240a6ca3836aa2 -Author: DeadFire -Date: Fri Dec 5 19:40:19 2014 +0800 - - 20141205-2 选题 - -commit 5f026b35fd9dd9562339d08d70c02caddfe86f9a -Author: DeadFire -Date: Fri Dec 5 19:12:16 2014 +0800 - - 20141205-1 选题 - -commit 46a17ceea426244f45a1f279b5ba48e595eb8fa8 -Merge: 3ecb07a 6e5d25a -Author: joeren -Date: Fri Dec 5 10:49:23 2014 +0800 - - Merge pull request #2065 from GOLinux/master - - [Translated] 20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md - -commit 6e5d25a194f525ef306cf6edf4bb1f9128249b4b -Author: GOLinux -Date: Fri Dec 5 10:47:29 2014 +0800 - - [Translated] 20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md - -commit 3ecb07a280845f1d6dffa3467d62067b1e0d7dce -Merge: 12c7541 a5ca241 -Author: joeren -Date: Fri Dec 5 09:03:42 2014 +0800 - - Merge pull request #2064 from GOLinux/master - - [Translating] 20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md - -commit a5ca2419279dfad8e36fc29bae5c41b9f415e241 -Author: joeren -Date: Fri Dec 5 09:02:52 2014 +0800 - - Update 20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md - -commit ba9cd41f27a5eccdf19e700d86a06e78a625fdd0 -Merge: f73e76a 12c7541 -Author: joeren -Date: Fri Dec 5 09:02:06 2014 +0800 - - Merge pull request #4 from LCTT/master - - Update Repository - -commit 12c754127f99b782bd98592843b4cdab0e0bbb0a -Merge: 3f9ed17 6d67300 -Author: bazz2 -Date: Fri Dec 5 08:12:28 2014 +0800 - - Merge pull request #2063 from bazz2/master - - [translating]Linux Namespaces - -commit 6d6730077c769d13c2cb6e02bb8355ac93500e75 -Author: bazz2 -Date: Fri Dec 5 08:06:33 2014 +0800 - - [translating]Linux Namespaces - -commit 3f9ed17fd20d5761d5b8af0be4289df99454ae1b -Author: wxy -Date: Thu Dec 4 23:52:45 2014 +0800 - - PUB:20141017 How to verify the authenticity and integrity of a downloaded file on Linux - - @geekpi - -commit 38909dfa5db9c08e5d272677bf62ee42e94b80d1 -Author: wxy -Date: Thu Dec 4 23:30:09 2014 +0800 - - PUB:20141021 How to create and use Python CGI scripts - - @su-kaiyao - -commit 04a0061a25307dfa23a3258081e34b7be45e92c6 -Merge: 552ad45 ad454b0 -Author: Xingyu.Wang -Date: Thu Dec 4 23:21:28 2014 +0800 - - Merge pull request #2060 from Vic020/patch-22 - - 抢地主，好吧，地主是你的了。。。 - -commit 552ad451f447e67da5671e1e1d7e7ba0d59ec619 -Merge: 2e30c5c 63cb892 -Author: geekpi -Date: Thu Dec 4 22:33:07 2014 +0800 - - Merge pull request #2062 from geekpi/master - - translated - -commit 63cb892335c04c296f0ed28237da2357122ea5a5 -Author: zhengsihua -Date: Thu Dec 4 22:31:50 2014 +0800 - - translated - -commit 2e30c5c5ecf56c33655e3cc7c3a9092b79bb6782 -Merge: 2bcf986 d78f215 -Author: geekpi -Date: Thu Dec 4 22:19:53 2014 +0800 - - Merge pull request #2061 from geekpi/master - - translating - -commit d78f21521459eb18ddd03d0be8abdea912d030b4 -Author: zhengsihua -Date: Thu Dec 4 22:18:48 2014 +0800 - - translating - -commit ad454b0a5d6d1a1eba170d9ad187baa3499618f8 -Author: Vic___ -Date: Thu Dec 4 20:33:22 2014 +0800 - - 抢地主 - -commit 2bcf9868369fb5fa3bd7956429203513afd0fd3d -Author: DeadFire -Date: Thu Dec 4 19:27:19 2014 +0800 - - 20141204-6 选题 - -commit 34d4475dede86febccf67af697c5ef6769b5b5f5 -Author: DeadFire -Date: Thu Dec 4 19:14:11 2014 +0800 - - 20141204-5 选题 - -commit 813e4c0d00af882368e17522776c3d1c6978b09e -Author: DeadFire -Date: Thu Dec 4 19:03:12 2014 +0800 - - 20141204-4 选题 - -commit b5bb90f1388949e4e46118854656b7b9bd8119d3 -Author: DeadFire -Date: Thu Dec 4 18:46:36 2014 +0800 - - 20141204-3 选题 - -commit 62bc5546f318f0f48caab1ce347994dff03881c7 -Author: DeadFire -Date: Thu Dec 4 18:11:07 2014 +0800 - - 20141204-2 选题 - -commit c5477e1bee70871f024221f351a14c3673cc8325 -Author: carolinewuyan <309866211@qq.com> -Date: Thu Dec 4 18:08:35 2014 +0800 - - 已发布 - -commit 70ca70d0cb470f3872ff2d439613a0736792b17c -Author: ZTinoZ -Date: Thu Dec 4 17:53:39 2014 +0800 - - Translating by ZTinoZ - -commit 15a0b00dd6acd188d9469bc1f4640ae2b204cd40 -Author: carolinewuyan <309866211@qq.com> -Date: Thu Dec 4 17:50:50 2014 +0800 - - 已校对 - -commit aa0a75d014c43cc32b48cf8816abde743afa3249 -Author: DeadFire -Date: Thu Dec 4 17:40:56 2014 +0800 - - 20141204-1 选题 - -commit c7d3faffccb7fcb4a5b7d4a99f5c3b439eff5486 -Author: carolinewuyan <309866211@qq.com> -Date: Thu Dec 4 16:59:55 2014 +0800 - - 已发布 - -commit 037ed20977f9d4fe782d922ea041dc8e52fb1b63 -Author: carolinewuyan <309866211@qq.com> -Date: Thu Dec 4 16:52:32 2014 +0800 - - 已校对 - -commit f73e76a188607ebb36f62e289e617cd39cc03181 -Merge: c63694f 70e2996 -Author: joeren -Date: Thu Dec 4 12:05:42 2014 +0800 - - Merge pull request #3 from LCTT/master - - Update Repository - -commit 70e2996b27decb5ef91bf76d5404fd5ac8877099 -Author: wxy -Date: Thu Dec 4 10:12:50 2014 +0800 - - PUB:20141017 Linux ss Tool to Identify Sockets or Network Connections with Examples - - @geekpi - -commit 4a987f333ecc03fd57260d8c024bc9e27430fe7f -Author: wxy -Date: Wed Dec 3 22:17:31 2014 +0800 - - PUB:20141023 What is a good command-line calculator on Linux - - @JonathanKang - -commit 61086fad22dc6edb024c5e4a71e7fd51f9f26e97 -Author: wxy -Date: Wed Dec 3 21:59:06 2014 +0800 - - PUB:20141022 Linux FAQs with Answers--How to fix sshd error--could not load host key - - @GOLinux - -commit b8fbf78801c91f75c470398e01c61624e8877a5d -Author: wxy -Date: Wed Dec 3 21:52:07 2014 +0800 - - PUB:20140910 How to create a cloud-based encrypted file system on Linux - - @felixonmars - -commit f9b557d2f785d0fd4eba7b6b52650977438f9a69 -Author: wxy -Date: Wed Dec 3 21:30:08 2014 +0800 - - PUB:20141119 When Microsoft Went A-Courting - - @GOLinux - -commit e78500a70f3adb9fbc4a5065d5b15e08d83bd997 -Merge: 986571c 914ae20 -Author: Xingyu.Wang -Date: Wed Dec 3 21:00:02 2014 +0800 - - Merge pull request #2058 from Stevearzh/master - - ignore .DS_Store - -commit 986571ceb9d51e34f88805616ce0b402735819b9 -Merge: dcb830a 08635e0 -Author: Xingyu.Wang -Date: Wed Dec 3 20:59:35 2014 +0800 - - Merge pull request #2057 from forsil/master - - forsil transliating ... - "Undelete Files on Linux Systems" - -commit dcb830a5d09fe08daed8032491ef3403c59bf5de -Merge: de32ba5 f7a105d -Author: Xingyu.Wang -Date: Wed Dec 3 20:59:14 2014 +0800 - - Merge pull request #2056 from JonathanKang/master - - JonathanKang is translating - -commit 9756548568a382f36db1cd9991c64bc2a3109881 -Author: ZTinoZ -Date: Wed Dec 3 17:55:57 2014 +0800 - - Translating by ZTinoZ - -commit 914ae202b7e207116e7d4edd4783b51cb40b909f -Author: Stevearzh -Date: Wed Dec 3 17:38:55 2014 +0800 - - Translating by Stevearzh - -commit 5590da98619fc2754dc9bc54cb9a462a5df0d48f -Author: Stevearzh -Date: Wed Dec 3 17:32:21 2014 +0800 - - ignore .DS_Store - -commit 08635e022f0999478a30a3923c5888d5d7f67891 -Author: forsil -Date: Wed Dec 3 16:43:22 2014 +0800 - - forsil transliating ... - -commit de32ba5c778ae71ea7273e4999b1a58cd4276ebb -Author: DeadFire -Date: Wed Dec 3 15:33:41 2014 +0800 - - 20141203-1 选题 - -commit f7a105d9afd140aa4f5900b6eb6e44d361109297 -Author: Jonathan Kang -Date: Wed Dec 3 15:28:22 2014 +0800 - - JonathanKang is translating - -commit 916a8498a19700fb456ae938e6484d65f040cc3e -Merge: ef504ac 3d70b82 -Author: Xingyu.Wang -Date: Wed Dec 3 14:01:09 2014 +0800 - - Merge pull request #2055 from mdjsjdqe/master - - Update 20141127 11 Useful Utilities To Supercharge Your Ubuntu Experienc... - -commit ef504acac1ae85005bd0b3d48be2c9f64b34b02e -Merge: 540ee1f 63a6eab -Author: Xingyu.Wang -Date: Wed Dec 3 14:00:48 2014 +0800 - - Merge pull request #2054 from forsil/master - - translate finished - "How to use on-screen virtual keyboard on Linux" - -commit 3d70b82e807e1423a74989ef87138077d7e7c740 -Author: mdjsjdqe -Date: Wed Dec 3 11:10:41 2014 +0800 - - Update 20141127 11 Useful Utilities To Supercharge Your Ubuntu Experience.md - -commit 540ee1fc311cdbb83876eb18a7f37eb174063507 -Author: carolinewuyan <309866211@qq.com> -Date: Wed Dec 3 11:08:39 2014 +0800 - - 已发布 - -commit 63a6eab73dcf200b35cbc0da300b78c33fab0741 -Author: forsil -Date: Wed Dec 3 11:03:28 2014 +0800 - - translate finished - -commit 139911ff7ea18234e99ea6ae03e23c7712ee2aea -Author: carolinewuyan <309866211@qq.com> -Date: Tue Dec 2 23:35:03 2014 +0800 - - 已校对 - -commit 929fd236d48a51c476026315624a4aefba021ff3 -Author: wxy -Date: Tue Dec 2 23:09:28 2014 +0800 - - 更新成员列表 - -commit 6a95046f3d9d79390cda7cd741da558ec658f4a7 -Author: carolinewuyan <309866211@qq.com> -Date: Tue Dec 2 18:15:29 2014 +0800 - - 校对中 - -commit 48f48783210f2c6c0de58ac0c0ad73e4418174eb -Author: ZTinoZ -Date: Tue Dec 2 17:53:43 2014 +0800 - - Translating by ZTinoZ - -commit 1986af6f30e91a78506dc0d97d7e317a5570ca6d -Author: wxy -Date: Tue Dec 2 15:09:43 2014 +0800 - - PUB:20141124 15 pwd (Print Working Directory) Command Examples in Linux - - @geekpi - -commit cc40ae47a73ef47fe223eb6a14e862f3a4a721c5 -Author: wxy -Date: Tue Dec 2 14:47:09 2014 +0800 - - PUB:20141125 Linux FAQs with Answers--How to access a NAT guest from host with VirtualBox - - @geekpi - -commit 034e4ecb3ec9ebabbea35d063f7034aca5e5ab65 -Author: wxy -Date: Tue Dec 2 11:27:59 2014 +0800 - - PUB:20141119 Qshutdown--An avanced shutdown tool - - @GOLinux - -commit b7d68f825989f68a1b83d4b43f0880af1d0345f8 -Author: wxy -Date: Tue Dec 2 11:01:30 2014 +0800 - - PUB:20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu - - @DoubleShit - -commit cb91adb70f867853034a5225008bccaa75701bca -Merge: 2fc03df ac79d9b -Author: Xingyu.Wang -Date: Tue Dec 2 10:31:53 2014 +0800 - - Merge pull request #2052 from felixonmars/20141114-emoji - - [Translating] How To Use Emoji Anywhere With Twitter's Open Source Library - -commit 2fc03df34fc56cc3a8119f06820b4ffed381d4ab -Merge: 8027f1b c63694f -Author: joeren -Date: Tue Dec 2 08:43:34 2014 +0800 - - Merge pull request #2053 from GOLinux/master - - [Translated] 20141119 When Microsoft Went A-Courting.md - -commit c63694f8a1f390e81033aa2764a12413f15a19f1 -Author: GOLinux -Date: Tue Dec 2 08:41:59 2014 +0800 - - [Translated] 20141119 When Microsoft Went A-Courting.md - -commit ac79d9b0ffae29930eb5f4b79c613a340a6a479c -Author: Felix Yan -Date: Mon Dec 1 23:34:00 2014 +0800 - - [Translating] How To Use Emoji Anywhere With Twitter's Open Source Library - -commit ac5dcd7026784f873cfcf16ea2db27e68e411796 -Author: ZTinoZ -Date: Mon Dec 1 22:12:32 2014 +0800 - - Translating by ZTinoZ - -commit 8027f1b0daf235f4e2931574e37094dac4f7a202 -Merge: d08dc0b ed5987a -Author: Xingyu.Wang -Date: Mon Dec 1 21:20:29 2014 +0800 - - Merge pull request #2051 from ZTinoZ/master - - Translating by ZTinoZ - -commit ed5987a7af9acf8d0dc63db9f175c47452adc1a1 -Author: ZTinoZ -Date: Mon Dec 1 21:19:03 2014 +0800 - - Translating by ZTinoZ - -commit 2530f71c158391f719ab7f66ac3e90d1aa93f355 -Merge: bd3ce8c d08dc0b -Author: ZTinoZ -Date: Mon Dec 1 21:18:09 2014 +0800 - - Merge pull request #1 from LCTT/master - - Update Popular repositories - -commit d08dc0b89957905d29df0cd47a7694b732d0c88e -Author: wxy -Date: Mon Dec 1 21:09:33 2014 +0800 - - 回收 - -commit c40f1964980fc954fbb28e1567a492a836c34c7e -Author: wxy -Date: Mon Dec 1 21:09:23 2014 +0800 - - PUB:20141030 8 Tips to Solve Linux and Unix Systems Hard Disk Problmes Like Disk Full Or Can't Write to the Disk.md - - @ZTinoZ - -commit 487ac45d4b30348fc68aea1b7f78e53a5c522a91 -Author: wxy -Date: Mon Dec 1 20:38:20 2014 +0800 - - PUB:20140818 What are useful CLI tools for Linux system admins - - @zpl1025 - -commit 9cc94c8014c131e041a4ba8cff2881d677a780bd -Author: wxy -Date: Mon Dec 1 20:14:22 2014 +0800 - - PUB:20140826 20 Postfix Interview Questions and Answers - - @bazz2 - -commit c55d124ffbe9b26a2e853292ca4f6cc53a2c40ef -Author: wxy -Date: Mon Dec 1 10:21:44 2014 +0800 - - 归档 201411 - -commit db57f2d75508e89e50ca6c87492f58cd9be17cfd -Author: wxy -Date: Mon Dec 1 10:18:06 2014 +0800 - - PUB:20141014 How to monitor and troubleshoot a Linux server using sysdig.md - - @GOLinux - -commit 842b1db81234914e1f801e670d05ef28451fa54b -Merge: 6711373 1adfadc -Author: joeren -Date: Mon Dec 1 08:31:15 2014 +0800 - - Merge pull request #2050 from GOLinux/master - - [Translating] 20141119 When Microsoft Went A-Courting.md - -commit 1adfadc8967eb3408b1f23889fc15f3f19de55f5 -Author: joeren -Date: Mon Dec 1 08:29:25 2014 +0800 - - Update 20141119 When Microsoft Went A-Courting.md - -commit 1ef54f5f51238cf3b1dd70b30d14e9de990db63d -Merge: cbbc133 6711373 -Author: joeren -Date: Mon Dec 1 08:26:07 2014 +0800 - - Merge pull request #2 from LCTT/master - - Update Repository - -commit 671137363c8179aaea68cd95365bc112892aaeaa -Merge: 3f8ce06 a72c37d -Author: joeren -Date: Mon Dec 1 08:24:49 2014 +0800 - - Merge pull request #2049 from coloka/master - - 【翻译中】Four ways Linux is headed for no-downtime kernel patching - -commit a72c37dcaed0705132f5509fb925edf15617958e -Author: coloka -Date: Sun Nov 30 22:11:16 2014 +0800 - - 【翻译中】Four ways Linux is headed for no-downtime kernel patching - -commit 3f8ce069479dc1be41573a751a7fc55177684b91 -Author: wxy -Date: Sun Nov 30 21:10:06 2014 +0800 - - PUB:20141127 How to install Docker on CentOS 7 - - @felixonmars - -commit aa3fca6507b03db0897e0a22eec8e3e0c06b2302 -Merge: 23af494 bd3ce8c -Author: Xingyu.Wang -Date: Sun Nov 30 18:38:59 2014 +0800 - - Merge pull request #2048 from ZTinoZ/master - - Finish the translation by ZTinoZ - -commit 23af4948fe0f5bbf40806dc769639b2e89de07a6 -Merge: 5cef7cf 17d979d -Author: Xingyu.Wang -Date: Sun Nov 30 18:38:40 2014 +0800 - - Merge pull request #2045 from coloka/master - - 【翻译完成】20141117 Restricting process CPU usage using nice cpulimit and cgroups.md - -commit 5cef7cf448316f13f235eafa6ac3093ede244d29 -Merge: dcfa943 e0be268 -Author: geekpi -Date: Sun Nov 30 18:00:24 2014 +0800 - - Merge pull request #2047 from geekpi/master - - translated - -commit bd3ce8c9fdc63ccd287289e96ec66b0c3449740e -Author: ZTinoZ -Date: Sun Nov 30 17:33:29 2014 +0800 - - Finish the translation by ZTinoZ - -commit e0be26800b36696a2a62378c92f4a62fa831a718 -Author: geekpi -Date: Sun Nov 30 04:22:57 2014 -0500 - - translated - -commit dcfa943010298ae729316d8c6061b50049268041 -Merge: 25bf2ec c94225c -Author: geekpi -Date: Sun Nov 30 16:49:46 2014 +0800 - - Merge pull request #2046 from geekpi/master - - Translating - -commit c94225cdf5912dc04e9aebd2a363beedb7d75be8 -Author: geekpi -Date: Sun Nov 30 03:47:49 2014 -0500 - - Translating - -commit 17d979dfa0a1678bd9c6363d4de435e70d34c2c6 -Merge: cd27963 25bf2ec -Author: coloka -Date: Sun Nov 30 11:37:35 2014 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject.git - -commit cd27963acc8a1c4bb1907537c50fee5e48db7717 -Author: coloka -Date: Sun Nov 30 11:37:20 2014 +0800 - - 【翻译完成】20141117 Restricting process CPU usage using nice cpulimit and cgroups.md - -commit 25bf2ecd2d7edbdfbe02b8cbcf4be37b6470e8d6 -Author: wxy -Date: Sun Nov 30 10:31:33 2014 +0800 - - PUB:04 - The history of Android - - @alim0x - -commit 125ceabe71c909a489f044279d6a21b6e9a8d8d4 -Author: wxy -Date: Sun Nov 30 10:05:10 2014 +0800 - - PUB:Meet systemd, the controversial project taking over a Linux distro near you - - @SPccman - -commit 1d67907640615266fab1c25ecbb9a189869873f6 -Author: wxy -Date: Fri Nov 28 09:46:46 2014 +0800 - - PUB:20141125 Linux FAQs with Answers--How to check glibc version on Linux - - @GOLinux - -commit 4774a8c6e80384dd2fa15d71afb55e85b60550b3 -Merge: f4b3167 84eaf6e -Author: Xingyu.Wang -Date: Sat Nov 29 22:50:20 2014 +0800 - - Merge pull request #2044 from disylee/master - - [ translated] by disylee - -commit 84eaf6ed1dcb11898f8c975782affbb7e08fce70 -Author: disylee -Date: Sat Nov 29 22:34:25 2014 +0800 - - disylee translated ok - -commit f4b31670e3051756ecd3525bce205f5e241a3043 -Merge: 528ed42 f552369 -Author: Xingyu.Wang -Date: Sat Nov 29 22:05:27 2014 +0800 - - Merge pull request #2043 from a598799539/master - - [Translated by a598799539] Some Sentences about Java - 哈哈，作为你的处翻，我会好好校对的哈~~ - -commit 528ed42501a3e9edf6d5a3a409e01c14ec7bde38 -Merge: 4cd7280 03e22ba -Author: Xingyu.Wang -Date: Sat Nov 29 22:04:24 2014 +0800 - - Merge pull request #2040 from Stevearzh/master - - [translated by Stevearzh]20141108 When hackers grow old.md - 赞！据说这篇比较难翻译，等我合并了仔细拜读:> - -commit 4cd7280436984d4331cdb42a539bfa05a3de8f8e -Merge: c89d8ad 3760bdc -Author: Xingyu.Wang -Date: Sat Nov 29 22:03:29 2014 +0800 - - Merge pull request #2039 from KayGuoWhu/master - - [Translated]20141127 What Makes a Good Programmer - -commit c89d8ada43e31266d164d8c2080dbeafae8e44b6 -Merge: c9684fa 1e95d12 -Author: Xingyu.Wang -Date: Sat Nov 29 22:03:08 2014 +0800 - - Merge pull request #2036 from SPccman/master - - Meet systemd, the controversial project taking over a Linux distro near you - -commit c9684fa307fc25b32c99c0c7e1a5a76de72895d1 -Merge: e80a538 04eb460 -Author: Xingyu.Wang -Date: Sat Nov 29 22:02:40 2014 +0800 - - Merge pull request #2035 from felixonmars/20141127-docker - - [Translated] How to install Docker on CentOS 7 - -commit e80a538719348619af9337fae1bce36f57492348 -Merge: b841012 e9d5996 -Author: Xingyu.Wang -Date: Sat Nov 29 22:01:38 2014 +0800 - - Merge pull request #2034 from DoubleShit/master - - [translated] 20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu - -commit f552369682e10e6de62d6b5ec6bd01b311c0503c -Merge: 37715e5 b841012 -Author: a598799539 -Date: Sat Nov 29 21:00:38 2014 +0800 - - Merge branch 'master' of github.com:LCTT/TranslateProject - -commit 37715e5eca070baf14453a20446454281f0987f6 -Author: a598799539 -Date: Sat Nov 29 21:00:10 2014 +0800 - - translated Some Sentences about Java - -commit b8410122e9deb8b47426765f51c4a2ff6cb691f1 -Merge: e287fd8 cf40825 -Author: geekpi -Date: Sat Nov 29 19:21:56 2014 +0800 - - Merge pull request #2042 from geekpi/master - - translated - -commit cf408257c1fa3cf44239e7e032f477a680f64ed4 -Author: geekpi -Date: Sat Nov 29 06:15:26 2014 -0500 - - translated - -commit e287fd89c5a1381b5bcad0c72658772fc9ff6f15 -Merge: 592cc17 8858878 -Author: geekpi -Date: Sat Nov 29 17:05:39 2014 +0800 - - Merge pull request #2041 from geekpi/master - - [Translating] - -commit 885887800804be7948dca76ab52214eebbaf8d28 -Author: geekpi -Date: Sat Nov 29 03:18:11 2014 -0500 - - [Translating] - -commit 03e22baa0d96306b7183c857c778fb7bb731c68c -Author: Stevearzh -Date: Sat Nov 29 15:09:11 2014 +0800 - - translated by Stevearzh - -commit 50cbc2fd447c5621d0c54751b43f774415fbf41e -Author: Stevearzh -Date: Sat Nov 29 15:04:44 2014 +0800 - - translated by Stevearzh - -commit 3760bdc4603b29aa7accdb5be6efecc527b40664 -Author: KayGuoWhu -Date: Sat Nov 29 11:53:50 2014 +0800 - - translated - -commit 592cc17351b5adc64af6377d6f26e2b19079550f -Author: geekpi -Date: Fri Nov 28 22:53:55 2014 +0800 - - Update 20141125 Linux FAQs with Answers--How to access a NAT guest from host with VirtualBox.md - -commit db71d4442c3d8be3ec19b615b80608c0364469eb -Merge: 1cee614 1676f66 -Author: geekpi -Date: Fri Nov 28 22:52:11 2014 +0800 - - Merge pull request #2038 from geekpi/master - - trnalsted - -commit 1676f66d703f70f65368f3f10669138c3fb05e87 -Author: root -Date: Fri Nov 28 09:48:34 2014 -0500 - - translated - -commit 5992044cb9ee267f381784573d82eaeea3480f40 -Author: root -Date: Fri Nov 28 09:47:50 2014 -0500 - - translated - -commit 1cee61441beec17d9edcc982405342228e9ddd57 -Merge: 1a52ed9 392bd99 -Author: geekpi -Date: Fri Nov 28 22:45:22 2014 +0800 - - Merge pull request #2037 from geekpi/master - - translated - -commit 392bd99ec4570f4ac5dec6991a77e2da4f8f2861 -Author: root -Date: Fri Nov 28 09:41:00 2014 -0500 - - translated - -commit 1e95d12ee85a6fe6c554700865656748eac96b59 -Author: DoubleC <450760206@qq.com> -Date: Fri Nov 28 22:39:54 2014 +0800 - - Create Meet systemd, the controversial project taking over a Linux distro near you.md - - 翻已完成 - -commit 078ff0fc967f7893526d0abcd865121ea7de87fb -Author: DoubleC <450760206@qq.com> -Date: Fri Nov 28 22:37:46 2014 +0800 - - Delete 20141111 Meet systemd the controversial project taking over a Linux distro near you.md - - 删除原文 - -commit 014e7fdead98a360eae9a4f560cd751abffbbb55 -Merge: a49d56a 1a52ed9 -Author: DoubleC <450760206@qq.com> -Date: Fri Nov 28 22:36:38 2014 +0800 - - Merge pull request #10 from LCTT/master - - update - -commit 04eb460fb15f76a9fdf4d115c179cb5130bea98b -Author: Felix Yan -Date: Fri Nov 28 21:12:19 2014 +0800 - - [Translated] How to install Docker on CentOS 7 - -commit 04ed0501ac3e430a60c091ef0e7196fccd6bbe16 -Author: ZTinoZ -Date: Fri Nov 28 17:35:37 2014 +0800 - - Translating by ZTinoZ - -commit e9d59968c9603e851271496390879ca75881a2c2 -Author: DoubleShift -Date: Fri Nov 28 09:37:02 2014 +0200 - - Create 20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu.md - - Translate finished. - -commit 2137e75ab5208a6f694816749b1b40f6a07ea027 -Author: DoubleShift -Date: Fri Nov 28 09:33:54 2014 +0200 - - Delete 20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu.md - - finished - -commit 1a52ed9badba1087938d77e7567bc19019f3b847 -Merge: aae52f4 c8fc59b -Author: Xingyu.Wang -Date: Fri Nov 28 15:17:08 2014 +0800 - - Merge pull request #2033 from KayGuoWhu/master - - [Translating]20141127 What Makes a Good Programmer - -commit 4887c41da25d71e846fcb2ffbe54e02ea9c5d6f4 -Author: DoubleShift -Date: Fri Nov 28 08:44:07 2014 +0200 - - Update 20141017 UbuTricks--Script to install the latest versions of several games and applications in Ubuntu.md - - begin - -commit c8fc59b10c73bbef12fddaa52caac0ffb7491388 -Author: KayGuoWhu -Date: Fri Nov 28 11:31:15 2014 +0800 - - translating - -commit aae52f4fbfdae91d7442d3470f167b36635c5f4b -Author: carolinewuyan <309866211@qq.com> -Date: Fri Nov 28 09:49:55 2014 +0800 - - 已发布 - -commit 7f804823350d78083179d6e110f874eb02e48ee4 -Merge: cc49b47 4dc9efa -Author: Xingyu.Wang -Date: Fri Nov 28 09:37:35 2014 +0800 - - Merge pull request #2028 from felixonmars/20141127-docker - - [Translating] How to install Docker on CentOS 7 - -commit cc49b47b9f25325d41ac4c7b9f09f7bb804c3f2e -Merge: beb3a86 09517d9 -Author: Xingyu.Wang -Date: Fri Nov 28 09:37:16 2014 +0800 - - Merge pull request #2032 from LCTT/revert-2029-master - - Revert "[Translating]20141127 How to install Docker on CentOS 7" - -commit 09517d99ad04bb1c503984a461ddee9401faec56 -Author: Xingyu.Wang -Date: Fri Nov 28 09:36:39 2014 +0800 - - Revert "[Translating]20141127 How to install Docker on CentOS 7" - -commit cbbc1333fb1d420dab930a6965757e5e03e6dcc3 -Merge: 5651cf8 beb3a86 -Author: joeren -Date: Fri Nov 28 08:39:05 2014 +0800 - - Merge pull request #1 from LCTT/master - - Update Repository - -commit beb3a867e6bdbf0819041ee601b8b3c54c1b668f -Merge: 67c573e 5eae2f8 -Author: joeren -Date: Fri Nov 28 08:37:54 2014 +0800 - - Merge pull request #2027 from felixonmars/20141127-systemd-nspawn - - 选题: Quick systemd-nspawn guide - -commit 67c573e226d879e6d3866880708e14f4f142649e -Merge: bcee8eb 4e82237 -Author: joeren -Date: Fri Nov 28 08:37:05 2014 +0800 - - Merge pull request #2029 from KayGuoWhu/master - - [Translating]20141127 How to install Docker on CentOS 7 - -commit bcee8ebc95d1bddb7f21866c728a01af5a5c73ee -Merge: 6b7af44 db7184f -Author: joeren -Date: Fri Nov 28 08:36:55 2014 +0800 - - Merge pull request #2030 from a598799539/master - - [a598799539 Translating] Some Sentences about Java - -commit 6b7af4483a2e4e686a9cb6d2ad7d8b2f50a81c10 -Merge: 5819b92 6a9b807 -Author: joeren -Date: Fri Nov 28 08:36:42 2014 +0800 - - Merge pull request #2031 from forsil/master - - forsil translating ... - -commit 6a9b8071939047158a54c7e8015aa93eaaab63be -Author: forsil -Date: Thu Nov 27 21:29:11 2014 +0800 - - forsil translating ... - -commit 5819b928297f5cec8ed715a70b57f511565417d1 -Author: wxy -Date: Thu Nov 27 21:22:31 2014 +0800 - - PUB:20140905 Linux TCP or IP networking--net-tools vs. iproute2 - - @KayGuoWhu - -commit db7184f092ac3442614b4d40246e55571404b098 -Author: a598799539 -Date: Thu Nov 27 20:29:45 2014 +0800 - - [Translating] Some Sentences about Java - -commit 3b056857e3945ec823d58e45b27421f5f4e1116c -Author: DeadFire -Date: Thu Nov 27 19:20:59 2014 +0800 - - 20141127-6 选题 带一朵云去远行a598799539 推荐 - -commit 4e82237a0bfbc8a3e97cc533d1afb8c666d0e700 -Author: KayGuoWhu -Date: Thu Nov 27 19:17:27 2014 +0800 - - translating - -commit 85f53161391d52f1bd49b81a1f183536398f3979 -Author: DeadFire -Date: Thu Nov 27 19:06:39 2014 +0800 - - 20141127-5 选题 - -commit ea9fa87ebf012b610aae9406b4bd28a5afbe7316 -Author: ZTinoZ -Date: Thu Nov 27 18:01:21 2014 +0800 - - Translating by ZTinoZ - -commit 454f2c7c54dbd751cb012a23f6b820428bdb965b -Author: DeadFire -Date: Thu Nov 27 17:02:20 2014 +0800 - - 20141127-4 选题 - -commit 5ee99b55b407b09bd9a929eeb00ba9155d63fc13 -Author: carolinewuyan <309866211@qq.com> -Date: Thu Nov 27 17:00:52 2014 +0800 - - 已校对 - -commit bf803aed01b9759a6941fa5dcead90effa458889 -Author: DeadFire -Date: Thu Nov 27 15:22:35 2014 +0800 - - 20141127-3 选题 - -commit 161875b7ca164238201458f26b85ff8d832296cc -Author: DeadFire -Date: Thu Nov 27 15:06:22 2014 +0800 - - 20141127-2 选题 - -commit 4dc9efa9139a9f0b55aea28deec0cbe3456f2355 -Author: Felix Yan -Date: Thu Nov 27 14:20:59 2014 +0800 - - [Translating] How to install Docker on CentOS 7 - -commit 94fb2afe8488a2c415e3141afbf2cc06fe988938 -Author: DeadFire -Date: Thu Nov 27 14:15:44 2014 +0800 - - 20141127-1 选题 - -commit 5eae2f830b77108ded370822de86eb957bdc6867 -Author: Felix Yan -Date: Thu Nov 27 14:06:03 2014 +0800 - - fix a typo - -commit 6ccb1dbc8d77ec78c635b4739cca055dda5b1af7 -Author: Felix Yan -Date: Thu Nov 27 14:00:06 2014 +0800 - - 选题: Quick systemd-nspawn guide - -commit 62d43d894b178b7b4869209233d2b69c14ffa204 -Author: wxy -Date: Thu Nov 27 13:39:14 2014 +0800 - - PUB:20141108 How to Record Your Desktop Video and Audio Using 'Avconv' Tool in Ubuntu - - @ggaaooppeenngg - -commit 9e84442dcedb5b4e5b2dc532bf0aab00a38b8c4d -Author: carolinewuyan <309866211@qq.com> -Date: Thu Nov 27 13:31:42 2014 +0800 - - 已发布 - -commit 3cdfb5927ff234cecda1c2ada70af1f3170e2f75 -Author: wxy -Date: Thu Nov 27 13:04:12 2014 +0800 - - PUB:20141112 [Quick Tip] How To Fix Docky Compositing Error In Lubuntu - - @Vic020 - -commit 5651cf80d86e5232957ef3154bde7998fb0b2f10 -Merge: 3ed12bf d679d35 -Author: joeren -Date: Thu Nov 27 10:10:47 2014 +0800 - - Merge pull request #2025 from felixonmars/20141124-blkid - - [Translated] Linux blkid Command to Find Block Devices Details - -commit 3ed12bf71e7c73b844ec847c15913db1e0cd70cd -Author: wxy -Date: Wed Nov 26 23:35:03 2014 +0800 - - PUB:20141029 How to install LEMP stack nginx MariaDB or MySQL and php on CentOS - - @runningwater - -commit d679d351abd57688a6746a47bfda1a0f3d3e3a3b -Author: Felix Yan -Date: Wed Nov 26 23:09:04 2014 +0800 - - [Translated] Linux blkid Command to Find Block Devices Details - -commit c9b07707f9d9787dc3b0d505dad88d533f082be2 -Author: wxy -Date: Wed Nov 26 23:01:56 2014 +0800 - - PUB:20141029 How to create and manage LXC containers on Ubuntu - - @bazz2 - -commit 0ba87ce9233df4b8f3499e52f9bac12c793e45d1 -Author: wxy -Date: Wed Nov 26 22:47:43 2014 +0800 - - PUB:20141105 Linux FAQs with Answers--How to disable HTTP redirect in wget - - @geekpi - -commit 27d7992eee62f7ccaae99ee6c9ca1a4de064dc31 -Merge: 9a97823 7c1375c -Author: Xingyu.Wang -Date: Wed Nov 26 22:34:05 2014 +0800 - - Merge pull request #2024 from felixonmars/20141124-blkid - - Translating: Linux blkid Command to Find Block Devices Details - -commit 9a97823c5a7dfc856a80c9e0110a978cb0100282 -Merge: ad8ba0f fb74cc0 -Author: Xingyu.Wang -Date: Wed Nov 26 22:33:19 2014 +0800 - - Merge pull request #2023 from johnhoow/master - - Translating by johnhoow - -commit 7c1375cccd21403169ef71c3a9df97243b4676b5 -Author: Felix Yan -Date: Wed Nov 26 21:17:47 2014 +0800 - - Translating: Linux blkid Command to Find Block Devices Details - -commit b6b6d65891534befa4180054ee82720b065ca022 -Author: ZTinoZ -Date: Wed Nov 26 17:39:50 2014 +0800 - - Translating by ZTinoZ - -commit fb74cc08d50b8ccb9c3ae49f227b41494fd93b5f -Merge: a92cdfc ad8ba0f -Author: johnhoow -Date: Wed Nov 26 14:14:46 2014 +0800 - - johnhoow translating - -commit f5cc73c3f3cfc9da0f4e89e8da4470aa31792874 -Author: ZTinoZ -Date: Wed Nov 26 10:40:16 2014 +0800 - - Translating by ZTinoZ - -commit ad8ba0fe6218909c09a1250d1461894127e67662 -Merge: 1fde8e5 78d7bd2 -Author: joeren -Date: Wed Nov 26 09:28:52 2014 +0800 - - Merge pull request #2022 from GOLinux/master - - [Translated] Two Questions with Answers - -commit 78d7bd287e5a3c56d26b0e2023b74234c2283799 -Author: GOLinux -Date: Wed Nov 26 09:26:27 2014 +0800 - - [Translated] Two Questions with Answers - -commit 1fde8e52a8a9d1aa275e26a2898cde632f937a3f -Merge: 791ec3c e928d55 -Author: joeren -Date: Wed Nov 26 08:54:29 2014 +0800 - - Merge pull request #2021 from GOLinux/master - - [Translating] 20141125 Linux FAQs with Answers--How to check glibc version on Linux.md - -commit e928d55e38e7724008754548f922031266890836 -Author: joeren -Date: Wed Nov 26 08:53:57 2014 +0800 - - Update 20141125 Linux FAQs with Answers--How to check glibc version on Linux.md - -commit 791ec3c46a3a139d9289d2a74f1d9bd68d0d1b4f -Merge: 8b77845 10165c8 -Author: joeren -Date: Wed Nov 26 08:53:26 2014 +0800 - - Merge pull request #2020 from GOLinux/master - - [Translating] 20141125 Linux FAQs with Answers--How to fix ImportError--No module named scapy.all.md - -commit 10165c83041e87a7f1bd00d02a48c5beb2835151 -Author: joeren -Date: Wed Nov 26 08:52:46 2014 +0800 - - Update 20141125 Linux FAQs with Answers--How to fix ImportError--No module named scapy.all.md - -commit d12778e9e89e363ea45de81e18c0a4db6e0c2573 -Merge: 25e95b8 8b77845 -Author: joeren -Date: Wed Nov 26 08:51:56 2014 +0800 - - Merge pull request #51 from LCTT/master - - Update Repository - -commit 8b77845ed43e85c462816b6613f42e4176d92b13 -Merge: 6855a65 cd350b0 -Author: joeren -Date: Wed Nov 26 08:51:05 2014 +0800 - - Merge pull request #2018 from alim0x/master - - 09-the history of Android complete - -commit 6855a6597cede9ba9f993f16acd4dbf40967cf7b -Merge: 834ba47 64d08b7 -Author: joeren -Date: Wed Nov 26 08:50:56 2014 +0800 - - Merge pull request #2019 from Stevearzh/master - - Translating by Stevearzh - -commit 64d08b7b04c01ad104ed718dfc1f82c77e8922dd -Author: Stevearzh -Date: Wed Nov 26 00:12:01 2014 +0800 - - Translating by Stevearzh - -commit 834ba47dae70f87ce1fbebe7982aac0cde738965 -Author: wxy -Date: Tue Nov 25 23:38:36 2014 +0800 - - PUB:20141029 Linux FAQs with Answers--How to fix hda-duplex not supported in this QEMU binary - - @geekpi - -commit cd350b09ee20c1c2a7ef465125ec1a8c27c5352d -Author: alim0x -Date: Tue Nov 25 23:01:29 2014 +0800 - - 09-the history of Android complete - -commit 2edcc8b31f4139f3cdacdfe958ea3b0f3548b28c -Author: wxy -Date: Tue Nov 25 22:21:13 2014 +0800 - - PUB:20141024 How To Upgrade Ubuntu 14.04 Trusty To Ubuntu 14.10 Utopic - - @johnhoow 只发布了服务器小节。 - -commit 88408ef3e43b827164affecbe2099e91b6404b8a -Author: wxy -Date: Tue Nov 25 21:51:15 2014 +0800 - - PUB:How-to-debug-a-C or C++ program with GDB command-line debugger - - @SPccman - -commit 21286943d4b86c74f195bba55833ab697c9ba35e -Author: carolinewuyan <309866211@qq.com> -Date: Tue Nov 25 16:44:05 2014 +0800 - - 已校对 - -commit db81f42bb9b0e92d8e7db3fa5a9ada7a6f192899 -Author: wxy -Date: Tue Nov 25 16:40:55 2014 +0800 - - PUB:20140926 How to manage configurations in Linux with Puppet and Augeas - - @geekpi - -commit e794d67ce65ab4665518a0cdf28991a794391145 -Author: DeadFire -Date: Tue Nov 25 15:43:47 2014 +0800 - - 20141125-2 选题 - -commit 3e3d66eecfc53b8c3668215efadb7a02a99e7737 -Author: DeadFire -Date: Tue Nov 25 09:46:48 2014 +0800 - - 20141125-1 选题 - -commit f5a26d4b4a1bec283c88670d828bfa9cfda7cbee -Author: wxy -Date: Mon Nov 24 16:26:00 2014 +0800 - - PUB:20141012 Simple guide to forks in github and git - - @su-kaiyao @FingerLiu - -commit 5d4b860a47bc7e7fe6a621d923bcbd0023ca2f31 -Author: wxy -Date: Mon Nov 24 15:44:56 2014 +0800 - - PUB:20141023 6 Minesweeper Clones for Linux - - @GOLinux - -commit af83c76e78af061b4bf26356d8565751d8fdfd33 -Author: wxy -Date: Mon Nov 24 15:31:28 2014 +0800 - - PUB:20141008 The Why and How of Ansible and Docker - - @bazz2 很流畅！ - -commit 59ecbb93ed9489e789e3ae3555b5b3c9cd455c2b -Author: DeadFire -Date: Mon Nov 24 16:06:52 2014 +0800 - - 20141124-2 选题 - -commit ea6654f3e1029f4da193d4a2c305539a2edea5a3 -Author: DeadFire -Date: Mon Nov 24 15:41:26 2014 +0800 - - 20141124-1 选题 - -commit 43079a4446d561f03a6de9d2ad8028a23634c38b -Merge: 9458bcc f3fe68f -Author: Xingyu.Wang -Date: Mon Nov 24 15:19:24 2014 +0800 - - Merge pull request #2015 from KayGuoWhu/master - - [Translating]20141108 When hackers grow old - 哈哈，没关系，这篇是挺难翻译的。。。 - -commit 9458bccfb6ef04f416637871fe452c58b25ae8ca -Merge: 3cf077c 25e95b8 -Author: joeren -Date: Mon Nov 24 09:28:00 2014 +0800 - - Merge pull request #2017 from GOLinux/master - - [Translated] 20141119 Qshutdown--An avanced shutdown tool.md - -commit 25e95b86cc5261b66455beab757dd694f6dc06c1 -Author: GOLinux -Date: Mon Nov 24 09:26:35 2014 +0800 - - [Translated] 20141119 Qshutdown--An avanced shutdown tool.md - -commit 3cf077c4e80282a6ed4edf513883a9224ede3ea3 -Merge: 3473507 efde8a2 -Author: joeren -Date: Mon Nov 24 09:23:58 2014 +0800 - - Merge pull request #2016 from GOLinux/master - - [Translated] 20141023 6 Minesweeper Clones for Linux.md - -commit efde8a206259eb8b4ee2fbe575e8205c588eb328 -Author: GOLinux -Date: Mon Nov 24 09:21:36 2014 +0800 - - [Translated] 20141023 6 Minesweeper Clones for Linux.md - -commit f3fe68f680eaa44fe2313450c46e756fa77ea60d -Author: KayGuoWhu -Date: Mon Nov 24 09:20:07 2014 +0800 - - stop translating - -commit 3473507b3eed42c8a7cb75918758d0bbcb009c49 -Merge: 6accdf1 76971a6 -Author: joeren -Date: Mon Nov 24 08:40:10 2014 +0800 - - Merge pull request #2014 from GOLinux/master - - [Translating] 20141023 6 Minesweeper Clones for Linux.md - -commit 76971a672c148636524c9f08584428a101e0e46c -Author: joeren -Date: Mon Nov 24 08:39:51 2014 +0800 - - Update 20141023 6 Minesweeper Clones for Linux.md - -commit 6accdf11b44eaa75d3e69ca3150f6f44e89ffe67 -Merge: ee7cef3 09c2778 -Author: joeren -Date: Mon Nov 24 08:38:36 2014 +0800 - - Merge pull request #2013 from GOLinux/master - - [Translating] 20141119 Qshutdown--An avanced shutdown tool.md - -commit 09c2778e955ea03754bf8c864f3e558edda770bc -Author: joeren -Date: Mon Nov 24 08:38:09 2014 +0800 - - Update 20141119 Qshutdown--An avanced shutdown tool.md - -commit f7e2ffda4fd2efcf418614331b31213822665df1 -Merge: 8d4ebf9 ee7cef3 -Author: joeren -Date: Mon Nov 24 08:36:38 2014 +0800 - - Merge pull request #50 from LCTT/master - - Update Repository - -commit ee7cef30c35a2f99fa20f26b5e06006ae6f4b021 -Merge: 68a784d 8ee9eb4 -Author: joeren -Date: Mon Nov 24 08:35:52 2014 +0800 - - Merge pull request #2012 from coloka/master - - 翻译完成：20141120 How to visualize memory usage on Linux.md - -commit 8ee9eb4893ad35de2e1f87c22de6ccaf3f38bb77 -Author: coloka -Date: Sun Nov 23 21:13:25 2014 +0800 - - 翻译完成：20141120 How to visualize memory usage on Linux.md - 翻译中：20141117 Restricting process CPU usage using nice cpulimit and cgroups.md - -commit 68a784d630ca20ae2523029edb45c9cf37f2c8d7 -Author: wxy -Date: Sun Nov 23 12:13:54 2014 +0800 - - PUB:20140901 How to install and configure ownCloud on Debian - - @geekpi - -commit 01f749ff651d08c33e77563a987098f7b510f573 -Author: wxy -Date: Sun Nov 23 11:51:55 2014 +0800 - - PUB:20140828 Setup Thin Provisioning Volumes in Logical Volume Management (LVM)--Part IV - - @GOLinux - -commit e95ffded0019d13d8478d520f801ad2c6a29f0a9 -Author: wxy -Date: Sun Nov 23 11:09:06 2014 +0800 - - PUB:20141027 Handy Disk Image Tools - - @barney-ro - -commit df66dcc31549c0db544e9fa96d4ffe342b0cd333 -Author: wxy -Date: Sat Nov 22 22:01:18 2014 +0800 - - PUB:20141115 LibreOffice 4.3.4 Released With 60 Bug Fixes v4.4 Shaping Up Nicely - - @ZTinoZ - -commit 891a533eeca72373fdff2c160427fcdd00d16347 -Merge: 424da1b d0cd7a6 -Author: Xingyu.Wang -Date: Sat Nov 22 21:09:41 2014 +0800 - - Merge pull request #2011 from ZTinoZ/master - - Translating by ZTinoZ - -commit d0cd7a648fde3e6cc7b4b320064c2db3868ca7ca -Author: ZTinoZ -Date: Sat Nov 22 20:57:33 2014 +0800 - - Translating by ZTinoZ - -commit 424da1b9fb8be94af487639d6347524668d00cd2 -Merge: 4436961 52bff59 -Author: Xingyu.Wang -Date: Sat Nov 22 20:22:31 2014 +0800 - - Merge pull request #2008 from coloka/master - - 【翻译完成】20141112 How to Debug CPU Regressions Using Flame Graphs.md - -commit a92cdfc2e86628214e4b3eeeaa0b89f8f4f2cf8b -Author: johnhoow -Date: Sat Nov 22 17:02:40 2014 +0800 - - johnhoow translating - -commit 4436961b4842bae7d02e404568ac56c74efde07a -Author: wxy -Date: Fri Nov 21 14:53:58 2014 +0800 - - PUB:03 - The history of Android - - @alim0x - -commit a5562536e3e4c08474f2911fc03f5d91077e0c62 -Author: wxy -Date: Thu Nov 20 14:40:51 2014 +0800 - - PUB:20141027 How to download an ISO image with BitTorrent fast and safely from the command line - - @wangjiezhe - -commit c75a469c338c91aab8d0ffc95f2ab1739a8a01de -Author: wxy -Date: Thu Nov 20 13:08:02 2014 +0800 - - PUB:20141106 timedatectl--Control Linux System Time and Date in Systemd - - @su-kaiyao - -commit 6dd41fdc522dc5b213c2621358b4cec6bd8a96b5 -Author: wxy -Date: Thu Nov 20 12:44:04 2014 +0800 - - PUB:20141106 Quick Tip Allow Services Through Firewall In openSUSE - - @Vic020 - -commit 2bd2708f9b16bc0e96a389f6bd28aabfc8145779 -Author: wxy -Date: Wed Nov 19 22:20:23 2014 +0800 - - PUB:20141017 pidstat - Monitor and Find Statistics for Linux Procesess - - @johnhoow - -commit 5aa9736f371d7d32ef5c68fdfa12a121c9f6bef6 -Merge: a1b4767 f87f093 -Author: geekpi -Date: Sat Nov 22 10:59:18 2014 +0800 - - Merge pull request #2006 from runningwater/master - - 【翻译中 by runningwater】10 SCP Commands to Transfer Files/Folders in Linux - -commit a1b47670bcadb3b1b185cb0c8f4851072a33fd4d -Merge: 1e413d3 0dc9479 -Author: geekpi -Date: Sat Nov 22 10:58:20 2014 +0800 - - Merge pull request #2007 from SPccman/patch-8 - - Update 20141111 Meet systemd the controversial project taking over a Lin... - -commit 1e413d3232d252cc9f9fe158fd6725d9965f6fb4 -Merge: ddaa80e 2db322f -Author: geekpi -Date: Sat Nov 22 10:57:22 2014 +0800 - - Merge pull request #2009 from geekpi/master - - [Translating] How To Make Raspberry Pi Boot In To GUI By Default - -commit 2db322fa4bf48dfa63610cffc8edc1b974779afd -Author: zhengsihua -Date: Sat Nov 22 10:56:06 2014 +0800 - - translated - -commit a813b7d0c4fe2e68bd66e49ca7152ca0ce7d8c11 -Author: zhengsihua -Date: Sat Nov 22 10:17:19 2014 +0800 - - [Translating] How To Make Raspberry Pi Boot In To GUI By Default - -commit 52bff59cacfd5110fff61f7eb8f97d0bbb2964fc -Author: coloka -Date: Fri Nov 21 23:23:22 2014 +0800 - - 修改文件夹 source -> translated - -commit 8fa646f2f4d7cd52183ea4a7bdd82c58f5557cab -Author: coloka -Date: Fri Nov 21 22:39:52 2014 +0800 - - 【翻译中】20141120 How to visualize memory usage on Linux.md - -commit 988a3f81572a1dbfa0db12b8943784200ae236b7 -Author: coloka -Date: Fri Nov 21 22:34:37 2014 +0800 - - 翻译完成 by coloka - -commit 3b25910a0976d572ac091fe34ec4972eddc6b7b3 -Merge: 4bbc010 ddaa80e -Author: coloka -Date: Fri Nov 21 22:32:35 2014 +0800 - - Merge branch 'master' of https://github.com/LCTT/TranslateProject.git - -commit 4bbc01058ce83f30ac78147092c63401c6e2aec8 -Author: coloka -Date: Fri Nov 21 22:32 \ No newline at end of file diff --git a/gihua b/gihua deleted file mode 100644 index e4cbf7acae..0000000000 --- a/gihua +++ /dev/null @@ -1,232 +0,0 @@ - - SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS - - Commands marked with * may be preceded by a number, _N. - Notes in parentheses indicate the behavior if _N is given. - A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K. - - h H Display this help. - q :q Q :Q ZZ Exit. - --------------------------------------------------------------------------- - - MMOOVVIINNGG - - e ^E j ^N CR * Forward one line (or _N lines). - y ^Y k ^K ^P * Backward one line (or _N lines). - f ^F ^V SPACE * Forward one window (or _N lines). - b ^B ESC-v * Backward one window (or _N lines). - z * Forward one window (and set window to _N). - w * Backward one window (and set window to _N). - ESC-SPACE * Forward one window, but don't stop at end-of-file. - d ^D * Forward one half-window (and set half-window to _N). - u ^U * Backward one half-window (and set half-window to _N). - ESC-) RightArrow * Left one half screen width (or _N positions). - ESC-( LeftArrow * Right one half screen width (or _N positions). - F Forward forever; like "tail -f". - r ^R ^L Repaint screen. - R Repaint screen, discarding buffered input. - --------------------------------------------------- - Default "window" is the screen height. - Default "half-window" is half of the screen height. - --------------------------------------------------------------------------- - - SSEEAARRCCHHIINNGG - - /_p_a_t_t_e_r_n * Search forward for (_N-th) matching line. - ?_p_a_t_t_e_r_n * Search backward for (_N-th) matching line. - n * Repeat previous search (for _N-th occurrence). - N * Repeat previous search in reverse direction. - ESC-n * Repeat previous search, spanning files. - ESC-N * Repeat previous search, reverse dir. & spanning files. - ESC-u Undo (toggle) search highlighting. - &_p_a_t_t_e_r_n * Display only matching lines - --------------------------------------------------- - A search pattern may be preceded by one or more of: - ^N or ! Search for NON-matching lines. - ^E or * Search multiple files (pass thru END OF FILE). - ^F or @ Start search at FIRST file (for /) or last file (for ?). - ^K Highlight matches, but don't move (KEEP position). - ^R Don't use REGULAR EXPRESSIONS. - --------------------------------------------------------------------------- - - JJUUMMPPIINNGG - - g < ESC-< * Go to first line in file (or line _N). - G > ESC-> * Go to last line in file (or line _N). - p % * Go to beginning of file (or _N percent into file). - t * Go to the (_N-th) next tag. - T * Go to the (_N-th) previous tag. - { ( [ * Find close bracket } ) ]. - } ) ] * Find open bracket { ( [. - ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>. - ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_> - --------------------------------------------------- - Each "find close bracket" command goes forward to the close bracket - matching the (_N-th) open bracket in the top line. - Each "find open bracket" command goes backward to the open bracket - matching the (_N-th) close bracket in the bottom line. - - m_<_l_e_t_t_e_r_> Mark the current position with . - '_<_l_e_t_t_e_r_> Go to a previously marked position. - '' Go to the previous position. - ^X^X Same as '. - --------------------------------------------------- - A mark is any upper-case or lower-case letter. - Certain marks are predefined: - ^ means beginning of the file - $ means end of the file - --------------------------------------------------------------------------- - - CCHHAANNGGIINNGG FFIILLEESS - - :e [_f_i_l_e] Examine a new file. - ^X^V Same as :e. - :n * Examine the (_N-th) next file from the command line. - :p * Examine the (_N-th) previous file from the command line. - :x * Examine the first (or _N-th) file from the command line. - :d Delete the current file from the command line list. - = ^G :f Print current file name. - --------------------------------------------------------------------------- - - MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS - - -_<_f_l_a_g_> Toggle a command line option [see OPTIONS below]. - --_<_n_a_m_e_> Toggle a command line option, by name. - __<_f_l_a_g_> Display the setting of a command line option. - ___<_n_a_m_e_> Display the setting of an option, by name. - +_c_m_d Execute the less cmd each time a new file is examined. - - !_c_o_m_m_a_n_d Execute the shell command with $SHELL. - |XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command. - v Edit the current file with $VISUAL or $EDITOR. - V Print version number of "less". - --------------------------------------------------------------------------- - - OOPPTTIIOONNSS - - Most options may be changed either on the command line, - or from within less by using the - or -- command. - Options may be given in one of two forms: either a single - character preceded by a -, or a name preceded by --. - - -? ........ --help - Display help (from command line). - -a ........ --search-skip-screen - Search skips current screen. - -A ........ --SEARCH-SKIP-SCREEN - Search starts just after target line. - -b [_N] .... --buffers=[_N] - Number of buffers. - -B ........ --auto-buffers - Don't automatically allocate buffers for pipes. - -c ........ --clear-screen - Repaint by clearing rather than scrolling. - -d ........ --dumb - Dumb terminal. - -D [_x_n_._n] . --color=_x_n_._n - Set screen colors. (MS-DOS only) - -e -E .... --quit-at-eof --QUIT-AT-EOF - Quit at end of file. - -f ........ --force - Force open non-regular files. - -F ........ --quit-if-one-screen - Quit if entire file fits on first screen. - -g ........ --hilite-search - Highlight only last match for searches. - -G ........ --HILITE-SEARCH - Don't highlight any matches for searches. - -h [_N] .... --max-back-scroll=[_N] - Backward scroll limit. - -i ........ --ignore-case - Ignore case in searches that do not contain uppercase. - -I ........ --IGNORE-CASE - Ignore case in all searches. - -j [_N] .... --jump-target=[_N] - Screen position of target lines. - -J ........ --status-column - Display a status column at left edge of screen. - -k [_f_i_l_e] . --lesskey-file=[_f_i_l_e] - Use a lesskey file. - -K --quit-on-intr - Exit less in response to ctrl-C. - -L ........ --no-lessopen - Ignore the LESSOPEN environment variable. - -m -M .... --long-prompt --LONG-PROMPT - Set prompt style. - -n -N .... --line-numbers --LINE-NUMBERS - Don't use line numbers. - -o [_f_i_l_e] . --log-file=[_f_i_l_e] - Copy to log file (standard input only). - -O [_f_i_l_e] . --LOG-FILE=[_f_i_l_e] - Copy to log file (unconditionally overwrite). - -p [_p_a_t_t_e_r_n] --pattern=[_p_a_t_t_e_r_n] - Start at pattern (from command line). - -P [_p_r_o_m_p_t] --prompt=[_p_r_o_m_p_t] - Define new prompt. - -q -Q .... --quiet --QUIET --silent --SILENT - Quiet the terminal bell. - -r -R .... --raw-control-chars --RAW-CONTROL-CHARS - Output "raw" control characters. - -s ........ --squeeze-blank-lines - Squeeze multiple blank lines. - -S ........ --chop-long-lines - Chop (truncate) long lines rather than wrapping. - -t [_t_a_g] .. --tag=[_t_a_g] - Find a tag. - -T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e] - Use an alternate tags file. - -u -U .... --underline-special --UNDERLINE-SPECIAL - Change handling of backspaces. - -V ........ --version - Display the version number of "less". - -w ........ --hilite-unread - Highlight first new line after forward-screen. - -W ........ --HILITE-UNREAD - Highlight first new line after any forward movement. - -x [_N[,...]] --tabs=[_N[,...]] - Set tab stops. - -X ........ --no-init - Don't use termcap init/deinit strings. - -y [_N] .... --max-forw-scroll=[_N] - Forward scroll limit. - -z [_N] .... --window=[_N] - Set size of window. - -" [_c[_c]] . --quotes=[_c[_c]] - Set shell quote characters. - -~ ........ --tilde - Don't display tildes after end of file. - -# [_N] .... --shift=[_N] - Horizontal scroll amount (0 = one half screen width) - ........ --no-keypad - Don't send termcap keypad init/deinit strings. - ........ --follow-name - The F command changes files if the input file is renamed. - ........ --use-backslash - Subsequent options use backslash as escape char. - - - --------------------------------------------------------------------------- - - LLIINNEE EEDDIITTIINNGG - - These keys can be used to edit text being entered - on the "command line" at the bottom of the screen. - - RightArrow ..................... ESC-l ... Move cursor right one character. - LeftArrow ...................... ESC-h ... Move cursor left one character. - ctrl-RightArrow ESC-RightArrow ESC-w ... Move cursor right one word. - ctrl-LeftArrow ESC-LeftArrow ESC-b ... Move cursor left one word. - HOME ........................... ESC-0 ... Move cursor to start of line. - END ............................ ESC-$ ... Move cursor to end of line. - BACKSPACE ................................ Delete char to left of cursor. - DELETE ......................... ESC-x ... Delete char under cursor. - ctrl-BACKSPACE ESC-BACKSPACE ........... Delete word to left of cursor. - ctrl-DELETE .... ESC-DELETE .... ESC-X ... Delete word under cursor. - ctrl-U ......... ESC (MS-DOS only) ....... Delete entire line. - UpArrow ........................ ESC-k ... Retrieve previous command line. - DownArrow ...................... ESC-j ... Retrieve next command line. - TAB ...................................... Complete filename & cycle. - SHIFT-TAB ...................... ESC-TAB Complete filename & reverse cycle. - ctrl-L ................................... Complete filename, list all. - - diff --git a/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md b/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md deleted file mode 100644 index b4ddb4497c..0000000000 --- a/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md +++ /dev/null @@ -1,144 +0,0 @@ -Linux 有问必答： 如何在Ubuntu或者Debian中下载和安装ixgbe驱动 -================================================================================ -> **提问**： 我想为我的Intel 10G网卡下载安装最新的ixgbe。我该如何在Ubuntu（或者Debian）中安装ixgbe驱动？ - -Intel的10G网卡（比如，82598、 82599、 x540）由ixgbe驱动支持。现代的Linux发版已经将ixgbe作为一个可加载模块。然而，有些情况你不想要你机器上的已经编译和安装的ixgbe驱动。比如，你想要体验ixbge驱动的最新特性。同样，自带内核中的ixgbe中的一个默认问题是不允许你自定义旭东内核参数。如果你想要完全自动一ixgbe驱动（比如 RSS、多队列、中断阈值等等），你需要手动从源码编译ixgbe驱动。 - -这里是如何在Ubuntu、Debian或者它们的衍生版中下载安装ixgbe驱动。 - -### 第一步： 安装前提 ### - -安装之前，需要安装匹配的内核头文件和开发工具包。 - - $ sudo apt-get install linux-headers-$(uname -r) - $ sudo apt-get install gcc make - -### 第二步： 编译Ixgbe驱动 ### - -从[最新的ixgbe驱动][1]中下载源码。 - - $ wget http://sourceforge.net/projects/e1000/files/ixgbe%20stable/3.23.2/ixgbe-3.23.2.tar.gz - -如下编译ixgbe驱动。 - - $ tar xvfvz ixgbe-3.23.2.tar.gz - $ cd ixgbe-3.23.2/src - $ make - -### 第三步： 检查Ixgbe驱动 ### - -编译之后，你会看到在ixgbe-3.23.2/src目录下创建了**ixgbe.ko**。这就是会加载到内核之中的ixgbe驱动。 - -用modinfo命令检查内核模块的信息。注意你需要指定模块的绝对路径（比如 ./ixgbe.ko 或者 /home/xmodulo/ixgbe/ixgbe-3.23.2/src/ixgbe.ko）。输出中会显示ixgbe内核的版本。 - - $ modinfo ./ixgbe.ko - ----------- - - filename: /home/xmodulo/ixgbe/ixgbe-3.23.2/src/ixgbe.ko - version: 3.23.2 - license: GPL - description: Intel(R) 10 Gigabit PCI Express Network Driver - author: Intel Corporation, - srcversion: 2ADA5E537923E983FA9DAE2 - alias: pci:v00008086d00001560sv*sd*bc*sc*i* - alias: pci:v00008086d00001558sv*sd*bc*sc*i* - alias: pci:v00008086d0000154Asv*sd*bc*sc*i* - alias: pci:v00008086d00001557sv*sd*bc*sc*i* - alias: pci:v00008086d0000154Fsv*sd*bc*sc*i* - alias: pci:v00008086d0000154Dsv*sd*bc*sc*i* - alias: pci:v00008086d00001528sv*sd*bc*sc*i* - alias: pci:v00008086d000010F8sv*sd*bc*sc*i* - alias: pci:v00008086d0000151Csv*sd*bc*sc*i* - alias: pci:v00008086d00001529sv*sd*bc*sc*i* - alias: pci:v00008086d0000152Asv*sd*bc*sc*i* - alias: pci:v00008086d000010F9sv*sd*bc*sc*i* - alias: pci:v00008086d00001514sv*sd*bc*sc*i* - alias: pci:v00008086d00001507sv*sd*bc*sc*i* - alias: pci:v00008086d000010FBsv*sd*bc*sc*i* - alias: pci:v00008086d00001517sv*sd*bc*sc*i* - alias: pci:v00008086d000010FCsv*sd*bc*sc*i* - alias: pci:v00008086d000010F7sv*sd*bc*sc*i* - alias: pci:v00008086d00001508sv*sd*bc*sc*i* - alias: pci:v00008086d000010DBsv*sd*bc*sc*i* - alias: pci:v00008086d000010F4sv*sd*bc*sc*i* - alias: pci:v00008086d000010E1sv*sd*bc*sc*i* - alias: pci:v00008086d000010F1sv*sd*bc*sc*i* - alias: pci:v00008086d000010ECsv*sd*bc*sc*i* - alias: pci:v00008086d000010DDsv*sd*bc*sc*i* - alias: pci:v00008086d0000150Bsv*sd*bc*sc*i* - alias: pci:v00008086d000010C8sv*sd*bc*sc*i* - alias: pci:v00008086d000010C7sv*sd*bc*sc*i* - alias: pci:v00008086d000010C6sv*sd*bc*sc*i* - alias: pci:v00008086d000010B6sv*sd*bc*sc*i* - depends: ptp,dca - vermagic: 3.11.0-19-generic SMP mod_unload modversions - parm: InterruptType:Change Interrupt Mode (0=Legacy, 1=MSI, 2=MSI-X), default IntMode (deprecated) (array of int) - parm: IntMode:Change Interrupt Mode (0=Legacy, 1=MSI, 2=MSI-X), default 2 (array of int) - parm: MQ:Disable or enable Multiple Queues, default 1 (array of int) - parm: DCA:Disable or enable Direct Cache Access, 0=disabled, 1=descriptor only, 2=descriptor and data (array of int) - parm: RSS:Number of Receive-Side Scaling Descriptor Queues, default 0=number of cpus (array of int) - parm: VMDQ:Number of Virtual Machine Device Queues: 0/1 = disable, 2-16 enable (default=8) (array of int) - parm: max_vfs:Number of Virtual Functions: 0 = disable (default), 1-63 = enable this many VFs (array of int) - parm: VEPA:VEPA Bridge Mode: 0 = VEB (default), 1 = VEPA (array of int) - parm: InterruptThrottleRate:Maximum interrupts per second, per vector, (0,1,956-488281), default 1 (array of int) - parm: LLIPort:Low Latency Interrupt TCP Port (0-65535) (array of int) - parm: LLIPush:Low Latency Interrupt on TCP Push flag (0,1) (array of int) - parm: LLISize:Low Latency Interrupt on Packet Size (0-1500) (array of int) - parm: LLIEType:Low Latency Interrupt Ethernet Protocol Type (array of int) - parm: LLIVLANP:Low Latency Interrupt on VLAN priority threshold (array of int) - parm: FdirPballoc:Flow Director packet buffer allocation level: - 1 = 8k hash filters or 2k perfect filters - 2 = 16k hash filters or 4k perfect filters - 3 = 32k hash filters or 8k perfect filters (array of int) - parm: AtrSampleRate:Software ATR Tx packet sample rate (array of int) - parm: FCoE:Disable or enable FCoE Offload, default 1 (array of int) - parm: LRO:Large Receive Offload (0,1), default 1 = on (array of int) - parm: allow_unsupported_sfp:Allow unsupported and untested SFP+ modules on 82599 based adapters, default 0 = Disable (array of int) - -### 第四步： 测试Ixgbe驱动 ### - -在测试新的模块之前，如果你内核中已存在旧版本ixgbe模块的话你需要先移除它。 - - $ sudo rmmod ixgbe - -接着使用insmod命令插入新编译的ixgbe模块。确保指定一个模块的绝对路径。 - - $ sudo insmod ./ixgbe.ko - -如果上面的命令成功运行，就不会显示任何的信息。 - -如果你需要，你可以尝试加入额外的参数。比如，设置RSS的队列数量为16： - - $ sudo insmod ./ixgbe.ko RSS=16 - -检查**/var/log/kern.log**来查看ixgbe驱动是否成功激活。查看日志中的“Intel(R) 10 Gigabit PCI Express Network Driver”。ixgbe的版本信息应该和之前的modinfo的显示应该相同。 - - Sep 18 14:48:52 spongebob kernel: [684717.906254] Intel(R) 10 Gigabit PCI Express Network Driver - version 3.22.3 - -![](https://farm8.staticflickr.com/7583/16056721867_f06e152076_c.jpg) - -### 第五步： 安装Ixgbe驱动 ### - -一旦你验证新的ixgbe驱动已经成功家在，最后一步是在你的系统中安装驱动。 - - $ sudo make install - -**ixgbe.ko** 接着会安装在/lib/modules//kernel/drivers/net/ethernet/intel/ixgbe 下。 - -这一步起，你可以用下面的modprobe命令加载ixgbe驱动了。注意你不必再指定绝对路径。 - - $ sudo modprobe ixgbe - -如果你希望在启动时家在ixgbe驱动，你可以在/etc/modules的最后加入“ixgbe”。 - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/download-install-ixgbe-driver-ubuntu-debian.html - -译者：[geekpi](https://github.com/geekpi) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://sourceforge.net/projects/e1000/files/ixgbe%20stable/ \ No newline at end of file From fdfd323db33cf60d3d3756528c7aae926cc2649b Mon Sep 17 00:00:00 2001 From: DeadFire Date: Sun, 25 Jan 2015 21:41:27 +0800 Subject: [PATCH 022/207] =?UTF-8?q?20150125-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dern Open Source Code Editors For Linux.md | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md diff --git a/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md b/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md new file mode 100644 index 0000000000..d3ed7d6dd9 --- /dev/null +++ b/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md @@ -0,0 +1,86 @@ +4 Best Modern Open Source Code Editors For Linux +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Best_Open_Source_Editors.jpeg) + +Looking for **best programming editors in Linux**? If you ask the old school Linux users, their answer would be Vi, Vim, Emacs, Nano etc. But I am not talking about them. I am going to talk about new age, cutting edge, great looking, sleek and yet powerful, feature rich **best open source code editors for Linux** that would enhance your programming experience. + +### Best modern Open Source editors for Linux ### + +I use Ubuntu as my main desktop and hence I have provided installation instructions for Ubuntu based distributions. But this doesn’t make this list as **best text editors for Ubuntu** because the list is apt for any Linux distribution. Just to add, the list is not in any particular priority order. + +#### Brackets #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/brackets_UI.jpeg) + +[Brackets][1] is an open source code editor from [Adobe][2]. Brackets focuses exclusively on the needs of web designers with built in support for HTML, CSS and Java Script. It’s light weight and yet powerful. It provides you with inline editing and live preview. There are plenty of plugins available to further enhance your experience with Brackets. + +To [install Brackets in Ubuntu][3] and Ubuntu based distributions such as Linux Mint, you can use this unofficial PPA: + + sudo add-apt-repository ppa:webupd8team/brackets + sudo apt-get update + sudo apt-get install brackets + +For other Linux distributions, you can get the source code as well as binaries for Linux, OS X and Windows on its website. + +- [Download Brackets Source Code and Binaries][5] + +#### Atom #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/08/Atom_Editor.jpeg) + +[Atom][5] is another modern and sleek looking open source editor for programmers. Atom is developed by Github and promoted as a “hackable text editor for the 21st century”. The looks of Atom resembles a lot like Sublime Text editor, a hugely popular but closed source text editors among programmers. + +Atom has recently released .deb and .rpm packages so that one can easily install Atom in Debian and Fedora based Linux distributions. Of course, its source code is available as well. + +- [Download Atom .deb][6] +- [Download Atom .rpm][7] +- [Get Atom source code][8] + +#### Lime Text #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/08/LimeTextEditor.jpeg) + +So you like Sublime Text editor but you are not comfortable with the fact that it is not open source. No worries. We have an [open source clone of Sublime Text][9], called [Lime Text][10]. It is built on Go, HTML and QT. The reason behind cloning of Sublime Text is that there are numerous bugs in Sublime Text 2 and Sublime Text 3 is in beta since forever. There are no transparency in its development, on whether the bugs are being fixed or not. + +So open source lovers, rejoice and get the source code of Lime Text from the link below: + +- [Get Lime Text Source Code][11] + +#### Light Table #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Light_Table.jpeg) + +Flaunted as “the next generation code editor”, [Light Table][12] is another modern looking, feature rich open source editor which is more of an IDE than a mere text editor. There are numerous extensions available to enhance its capabilities. Inline evaluation is what you would love in it. You have to use it to believe how useful Light Table actually is. + +- [Get Light Table Source Code][13] + +### What’s your pick? ### + +No, we are not limited to just four code editors in Linux. The list was about modern editors for programmers. Of course you have plenty of other options such as [Notepad++ alternative Notepadqq][14] or [SciTE][15] and many more. So, among these four, which one is your favorite code editor for Linux? + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/best-modern-open-source-code-editors-for-linux/ + +作者：[Abhishek][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:http://brackets.io/ +[2]:http://www.adobe.com/ +[3]:http://itsfoss.com/install-brackets-ubuntu/ +[4]:https://github.com/adobe/brackets/releases +[5]:https://atom.io/ +[6]:https://atom.io/download/deb +[7]:https://atom.io/download/rpm +[8]:https://github.com/atom/atom/blob/master/docs/build-instructions/linux.md +[9]:http://itsfoss.com/lime-text-open-source-alternative/ +[10]:http://limetext.org/ +[11]:https://github.com/limetext/lime +[12]:http://lighttable.com/ +[13]:https://github.com/LightTable/LightTable +[14]:http://itsfoss.com/notepadqq-notepad-for-linux/ +[15]:http://itsfoss.com/scite-the-notepad-for-linux/ \ No newline at end of file From fe56ba65792cae43a69031fdf5b464c47f1a645b Mon Sep 17 00:00:00 2001 From: DeadFire Date: Sun, 25 Jan 2015 21:50:59 +0800 Subject: [PATCH 023/207] =?UTF-8?q?20150125-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Your Linux OS X Unix Shell Environment.md | 692 ++++++++++++++++++ 1 file changed, 692 insertions(+) create mode 100644 sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md diff --git a/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md b/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md new file mode 100644 index 0000000000..eafc6d21e5 --- /dev/null +++ b/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md @@ -0,0 +1,692 @@ +A Shell Primer: Master Your Linux, OS X, Unix Shell Environment +================================================================================ +On a Linux or Unix-like systems each user and process runs in a specific environment. An environment includes variables, settings, aliases, functions and more. Following is a very brief introduction to some useful shell environment commands, including examples of how to use each command and setup your own environment to increase productivity in the command prompt. + +![](http://s0.cyberciti.org/uploads/cms/2015/01/bash-shell-welcome-image.jpg) + +### Finding out your current shell ### + +Type any one of the following command at the Terminal app: + + ps $$ + ps -p $$ + +OR + + echo "$0" + +Sample outputs: + +[![Fig.01: Finding out your shell name](http://s0.cyberciti.org/uploads/cms/2015/01/finding-your-shell-like-a-pro.jpg)][1] +Fig.01: Finding out your shell name + +### Finding out installed shells ### + +To find out the full path for installed shell type: + + type -a zsh + type -a ksh + type -a sh + type -a bash + +Sample outputs: + +[![Fig.02: Finding out your shell path](http://s0.cyberciti.org/uploads/cms/2015/01/finding-and-verifying-shell-path.jpg)][2] +Fig.02: Finding out your shell path + +The /etc/shells file contains a list of the shells on the system. For each shell a single line should be present, consisting of the shell's path, relative to root. Type the following [cat command][3] to see shell database: + + cat /etc/shells + +Sample outputs: + + # List of acceptable shells for chpass(1). + # Ftpd will not allow users to connect who are not using + # one of these shells. + + /bin/bash + /bin/csh + /bin/ksh + /bin/sh + /bin/tcsh + /bin/zsh + /usr/local/bin/fish + +### Changing your current shell temporarily ### + +Just type the shell name. In this example, I'm changing from bash to zsh: + + zsh + +You just changed your shell temporarily to zsh. Also known as subshell. To exit from subshell/temporary shell, type the following command or hit CTRL-d: + + exit + +### Finding out subshell level/temporary shell nesting level ### + +The $SHLVL incremented by one each time an instance of bash is started. Type the following command: + + echo "$SHLVL" + +Sample outputs: + +[![Fig. 03: Bash shell nesting level (subshell numbers)](http://s0.cyberciti.org/uploads/cms/2015/01/a-nested-shell-level-command.jpg)][4] +Fig. 03: Bash shell nesting level (subshell numbers) + +### Changing your current shell permanently with chsh command ### + +Want to change your own shell from bash to zsh permanently? Try: + + chsh -s /bin/zsh + +Want to change the other user's shell from bash to ksh permanently? Try: + + sudo chsh -s /bin/ksh userNameHere + +### Finding out your current environment ### + +You need to use the + + env + env | more + env | less + env | grep 'NAME' + +Sample outputs: + + TERM_PROGRAM=Apple_Terminal + SHELL=/bin/bash + TERM=xterm-256color + TMPDIR=/var/folders/6x/45252d6j1lqbtyy_xt62h40c0000gn/T/ + Apple_PubSub_Socket_Render=/tmp/launch-djaOJg/Render + TERM_PROGRAM_VERSION=326 + TERM_SESSION_ID=16F470E3-501C-498E-B315-D70E538DA825 + USER=vivek + SSH_AUTH_SOCK=/tmp/launch-uQGJ2h/Listeners + __CF_USER_TEXT_ENCODING=0x1F5:0:0 + PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin:/usr/local/go/bin:/usr/local/sbin/modemZapp:/Users/vivek/google-cloud-sdk/bin + __CHECKFIX1436934=1 + PWD=/Users/vivek + SHLVL=2 + HOME=/Users/vivek + LOGNAME=vivek + LC_CTYPE=UTF-8 + DISPLAY=/tmp/launch-6hNAhh/org.macosforge.xquartz:0 + _=/usr/bin/env + OLDPWD=/Users/vivek + +Here is a table of commonly used bash shell variables: + +![Fig.04: Common bash environment variables](http://s0.cyberciti.org/uploads/cms/2015/01/common-shell-vars.jpg) +Fig.04: Common bash environment variables + +> **Warning**: It is always a good idea not to change the following environment variables. Some can be changed and may results into unstable session for you: +> +> SHELL +> +> UID +> +> RANDOM +> +> PWD +> +> PPID +> +> SSH_AUTH_SOCK +> +> USER +> +> HOME +> +> LINENO + +### Displays the values of environment variables ### + +Use any one of the following command to show the values of environment variable called HOME: + + ## Use printenv ## + printenv HOME + + ## or use echo ## + echo "$HOME" + + # or use printf for portability ## + printf "%s\n" "$HOME" + +Sample outputs: + + /home/vivek + +### Adding or setting a new variables ### + +The syntax is as follows in bash or zsh or sh or ksh shell: + + ## The syntax is ## + VAR=value + FOO=bar + + ## Set the default editor to vim ## + EDITOR=vim + export $EDITOR + + ## Set default shell timeout for security ## + TMOUT=300 + export TMOUT + + ## You can directly use export command to set the search path for commands ## + export PATH=$PATH:$HOME/bin:/usr/local/bin:/path/to/mycoolapps + +Again, use the printenv or echo or printf command to see the values of environment variables called PATH, EDITOR, and TMOUT: + + printenv PATH + echo "$EDITOR" + printf "%s\n" $TMOUT + +### How do I change an existing environment variables? ### + +The syntax is as follows: + + export VAR=value + ## OR ## + VAR=value + export $VAR + + ## Change the default editor from vim to emacs ## + echo "$EDITOR" ## <--- print vim + EDITOR=emacs ## <--- change it + export $EDITOR ## <--- export it for next session too + echo "$EDITOR" ## <--- print emacs + +The syntax is as follows for the **tcsh shell for adding or changing a variables**: + + ## Syntax + setenv var value + printenv var + + ## Set foo variable with bar as a value ## + setenv foo bar + echo "$foo" + printenv foo + + ## Set PATH variable ## + setenv PATH $PATH\:$HOME/bin + echo "$PATH" + + ## set PAGER variable ## + setenv PAGER most + printf "%s\n" $PAGER + +### Finding your bash shell configuration files ### + +Type the following command to list your bash shell files, enter: + + ls -l ~/.bash* ~/.profile /etc/bash* /etc/profile + +Sample output: + +[![Fig.05: List all bash environment configuration files](http://s0.cyberciti.org/uploads/cms/2015/01/list-bash-enviroment-variables.jpg)][5] +Fig.05: List all bash environment configuration files + +To look at all your bash config files, enter: + + less ~/.bash* ~/.profile /etc/bash* /etc/profile + +You can edit bash config files one by one using the text editor such as vim or emacs: + + vim ~/.bashrc + +To edit files located in /etc/, type: + + ## first make a backup.. just in case + sudo cp -v /etc/bashrc /etc/bashrc.bak.22_jan_15 + + ######################################################################## + ## Alright, edit it to your hearts content and by all means, have fun ## + ## with your environment or just increase the productivity :) ## + ######################################################################## + sudo vim /etc/bashrc + +### Confused by Bash shell Initialization files? ### + +The following "bash file initialization" graph will help you: + +![](http://s0.cyberciti.org/uploads/cms/2015/01/BashStartupfiles.jpg) + +Depending on which shell is set up as your default, your user profile or system profile can be one of the following: + +### Finding your zsh shell configuration files ### + +The zsh [wiki][6] recommend the following command: + + strings =zsh | grep zshrc + +Sample outputs: + + /etc/zshrc + .zshrc + +Type the following command to list your zsh shell files, enter: + + ls -l /etc/zsh/* /etc/profile ~/.z* + +To look at all your zsh config files, enter: + + less /etc/zsh/* /etc/profile ~/.z* + +### Finding your ksh shell configuration files ### + +1. See ~/.profile or /etc/profile file. + +### Finding your tcsh shell configuration files ### + +1. See ~/.login, ~/.cshrc for the C shell. +2. See ~/.tcshrc and ~/.cshrc for the TC shell. + +### Can I have a script like this execute automatically every time I login? ### + +Yes, add your commands or aliases or other settings to ~/.bashrc (bash shell) or ~/.profile (sh/ksh/bash) or ~/.login (csh/tcsh) file. + +### Can I have a script like this execute automatically every time I logout? ### + +Yes, add your commands or aliases or other settings to ~/.bash_logout (bash) or ~/.logout (csh/tcsh) file. + +### History: Getting more info about your shell session ### + +Just type the history command to see session history: + + history + +Sample outputs: + + 9 ls + 10 vi advanced-cache.php + 11 cd .. + 12 ls + 13 w + 14 cd .. + 15 ls + 16 pwd + 17 ls + .... + .. + ... + 91 hddtemp /dev/sda + 92 yum install hddtemp + 93 hddtemp /dev/sda + 94 hddtemp /dev/sg0 + 95 hddtemp /dev/sg1 + 96 smartctl -d ata -A /dev/sda | grep -i temperature + 97 smartctl -d ata -A /dev/sg1 | grep -i temperature + 98 smartctl -A /dev/sg1 | grep -i temperature + 99 sensors + +Type history 20 to see the last 20 commands from your history: + + history 20 + +Sample outputs: + +[![Fig.06: View session history in the bash shell using history command](http://s0.cyberciti.org/uploads/cms/2015/01/history-outputs.jpg)][7] +Fig.06: View session history in the bash shell using history command + +You can reuses commands. Simply hit [Up] and [Down] arrow keys to see previous commands. Press [CTRL-r] from the shell prompt to search backwards through history buffer or file for a command. To repeat last command just type !! at a shell prompt: + + ls -l /foo/bar + !! + +To see command #93 (hddtemp /dev/sda)from above history session, type: + + !93 + +### Changing your identity with sudo or su ### + +The syntax is as follows: + + su userName + + ## To log in as a tom user ## + su tom + + ## To start a new login shell for tom user ## + su tom + + ## To login as root user ## + su - + + ## The sudo command syntax (must be configured on your system) ## + sudo -s + sudo tom + +See "[Linux Run Command As Another User][8]" post for more on sudo, su and runuser commands. + +### Shell aliases ### + +An alias is nothing but shortcut to commands. + +### Listing aliases ### + +Type the following command: + + alias + +Sample outputs: + + alias ..='cd ..' + alias ...='cd ../../../' + alias ....='cd ../../../../' + alias .....='cd ../../../../' + alias .4='cd ../../../../' + alias .5='cd ../../../../..' + alias bc='bc -l' + alias cd..='cd ..' + alias chgrp='chgrp --preserve-root' + alias chmod='chmod --preserve-root' + alias chown='chown --preserve-root' + alias cp='cp -i' + alias dnstop='dnstop -l 5 eth1' + alias egrep='egrep --color=auto' + alias ethtool='ethtool eth1' + +### Create an alias ### + +The bash/zsh syntax is: + + alias c='clear' + alias down='sudo /sbin/shutdown -h now' + +Type c alias for the system command clear, so we can type c instead of clear command to clear the screen: + + c + +Or type down to shutdown the Linux based server: + + down + +You can create as many aliases you want. See "[30 Handy Bash Shell Aliases For Linux / Unix / Mac OS X][9]" for practical usage of aliases on Unix-like system. + +### Shell functions ### + +Bash/ksh/zsh functions allows you further customization of your environment. In this example, I'm creating a simple bash function called memcpu() to display top 10 cpu and memory eating process: + + memcpu() { echo "*** Top 10 cpu eating process ***"; ps auxf | sort -nr -k 3 | head -10; + echo "*** Top 10 memory eating process ***"; ps auxf | sort -nr -k 4 | head -10; } + +Just type memcpu to see the info on screen: + + memcpu + + *** Top 10 cpu eating process *** + nginx 39559 13.0 0.2 264020 35168 ? S 04:26 0:00 \_ /usr/bin/php-cgi + nginx 39545 6.6 0.1 216484 13088 ? S 04:25 0:04 \_ /usr/bin/php-cgi + nginx 39471 6.2 0.6 273352 81704 ? S 04:22 0:17 \_ /usr/bin/php-cgi + nginx 39544 5.7 0.1 216484 13084 ? S 04:25 0:03 \_ /usr/bin/php-cgi + nginx 39540 5.5 0.1 221260 19296 ? S 04:25 0:04 \_ /usr/bin/php-cgi + nginx 39542 5.4 0.1 216484 13152 ? S 04:25 0:04 \_ /usr/bin/php-cgi + nixcraft 39543 5.3 0.1 216484 14096 ? S 04:25 0:04 \_ /usr/bin/php-cgi + nixcraft 39538 5.2 0.1 221248 18608 ? S 04:25 0:04 \_ /usr/bin/php-cgi + nixcraft 39539 5.0 0.1 216484 16272 ? S 04:25 0:04 \_ /usr/bin/php-cgi + nixcraft 39541 4.8 0.1 216484 14860 ? S 04:25 0:04 \_ /usr/bin/php-cgi + + *** Top 10 memory eating process *** + 498 63859 0.5 4.0 2429652 488084 ? Ssl 2014 177:41 memcached -d -p 11211 -u memcached -m 2048 -c 18288 -P /var/run/memcached/memcached.pid -l 10.10.29.68 -L + mysql 64221 4.2 3.4 4653600 419868 ? Sl 2014 1360:40 \_ /usr/libexec/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --log-error=/var/log/mysqld.log --open-files-limit=65535 --pid-file=/var/run/mysqld/mysqld.pid --socket=/var/lib/mysql/mysql.sock + nixcraft 39418 0.4 1.1 295312 138624 ? S 04:17 0:02 | \_ /usr/bin/php-cgi + nixcraft 39419 0.5 0.9 290284 113036 ? S 04:18 0:02 | \_ /usr/bin/php-cgi + nixcraft 39464 0.7 0.8 294356 99200 ? S 04:20 0:02 | \_ /usr/bin/php-cgi + nixcraft 39469 0.3 0.7 288400 91256 ? S 04:20 0:01 | \_ /usr/bin/php-cgi + nixcraft 39471 6.2 0.6 273352 81704 ? S 04:22 0:17 \_ /usr/bin/php-cgi + vivek 39261 2.2 0.6 253172 82812 ? S 04:05 0:28 \_ /usr/bin/php-cgi + squid 9995 0.0 0.5 175152 72396 ? S 2014 27:00 \_ (squid) -f /etc/squid/squid.conf + cybercit 3922 0.0 0.4 303380 56304 ? S Jan10 0:13 | \_ /usr/bin/php-cgi + +See "[how to write and use shell functions][10]" for more information. + +### Putting it all together: Customizing your Linux or Unix bash shell working environment ### + +Now, you are ready to configure your environment using bash shell. I'm only covering bash. But the theory remains same from zsh, ksh and other common shells. Let us see how to adopt shell to my need as a sysadmin. Edit your ~/.bashrc file and append settings. Here are some useful configuration options for you. + +#### #1: Setting up bash path and environment variables #### + + # Set path ## + export PATH=$PATH:/usr/local/bin:/home/vivek/bin:/opt/firefox/bin:/opt/oraapp/bin + + # Also set path for cd command + export CDPATH=.:$HOME:/var/www + +Use less or most command as a pager: + + export PAGER=less + +Set vim as default text editor for us: + + export EDITOR=vim + export VISUAL=vim + export SVN_EDITOR="$VISUAL" + +Set Oracle database specific stuff: + + export ORACLE_HOME=/usr/lib/oracle/xe/app/oracle/product/10.2.0/server + export ORACLE_SID=XE + export NLS_LANG=$($ORACLE_HOME/bin/nls_lang.sh) + +Set JAVA_HOME and other paths for java as per java version: + + export JAVA_HOME=/usr/lib/jvm/java-6-sun/jre + + # Add ORACLE, JAVA to PATH + export PATH=$PATH:$ORACLE_HOME/bin:$JAVA_HOME/bin + +Secure my remote [SSH login using keychain for password less login][11]: + + # No need to input password again ever + /usr/bin/keychain $HOME/.ssh/id_rsa + source $HOME/.keychain/$HOSTNAME-sh + +Finally, [turn on bash command completion][12] + + source /etc/bash_completio + +#### #2: Setting up bash command prompt #### + +Set [custom bash prompt (PS1)][13]: + + PS1='{\u@\h:\w }\$ ' + +#### #3: Setting default file permissions #### + + ## Set default to 644 ## + umask 022 + +#### #4: Control your shell history settings #### + + # Dont put duplicate lines in the history + HISTCONTROL=ignoreboth + + # Ignore these commands + HISTIGNORE="reboot:shutdown *:ls:pwd:exit:mount:man *:history" + + # Set history length via HISTSIZE and HISTFILESIZE + export HISTSIZE=10000 + export HISTFILESIZE=10000 + + # Add timestamp to history file. + export HISTTIMEFORMAT="%F %T " + + #Append to history, don't overwrite + shopt -s histappend + +#### #5: Set the time zone for your session #### + + ## set to IST for my own session ## + TZ=Asia/Kolkata + +#### #6: Setting up shell line editing interface #### + + ## use a vi-style line editing interface for bash from default emacs mode ## + set -o vi + +#### #7: Setting up your favorite aliases #### + + ## add protection ## + alias rm='rm -i' + alias cp='cp -i' + alias mv='mv -i' + + ## Memcached ## + alias mcdstats='/usr/bin/memcached-tool 10.10.29.68:11211 stats' + alias mcdshow='/usr/bin/memcached-tool 10.10.29.68:11211 display' + alias mcdflush='echo "flush_all" | nc 10.10.29.68 11211' + + ## Default command options ## + alias vi='vim' + alias grep='grep --color=auto' + alias egrep='egrep --color=auto' + alias fgrep='fgrep --color=auto' + alias bc='bc -l' + alias wget='wget -c' + alias chown='chown --preserve-root' + alias chmod='chmod --preserve-root' + alias chgrp='chgrp --preserve-root' + alias rm='rm -I --preserve-root' + alias ln='ln -i' + +Here are some additional OS X Unix bash shell aliases: + + # Open desktop apps from bash + alias preview="open -a '$PREVIEW'" + alias safari="open -a safari" + alias firefox="open -a firefox" + alias chrome="open -a google\ chrome" + alias f='open -a Finder ' + + # Get rid of those .DS_Store files + alias dsclean='find . -type f -name .DS_Store -delete' + +#### #8: Colour my world #### + + # Get colored grep output + alias grep='grep --color=auto' + export GREP_COLOR='1;33' + + # colored ls too + export LSCOLORS='Gxfxcxdxdxegedabagacad' + # Gnu/linux ls + ls='ls --color=auto' + + # BSD/os x ls command + # alias ls='ls -G' + +#### #9: Setting up your favorite bash functions #### + + # Show top 10 history command on screen + function ht { + history | awk '{a[$2]++}END{for(i in a){print a[i] " " i}}' | sort -rn | head + } + + # Wrapper for host and ping command + # Accept http:// or https:// or ftps:// names for domain and hostnames + _getdomainnameonly(){ + local h="$1" + local f="${h,,}" + # remove protocol part of hostname + f="${f#http://}" + f="${f#https://}" + f="${f#ftp://}" + f="${f#scp://}" + f="${f#scp://}" + f="${f#sftp://}" + # remove username and/or username:password part of hostname + f="${f#*:*@}" + f="${f#*@}" + # remove all /foo/xyz.html* + f=${f%%/*} + # show domain name only + echo "$f" + } + + + ping(){ + local array=( $@ ) # get all args in an array + local len=${#array[@]} # find the length of an array + local host=${array[$len-1]} # get the last arg + local args=${array[@]:0:$len-1} # get all args before the last arg in $@ in an array + local _ping="/bin/ping" + local c=$(_getdomainnameonly "$host") + [ "$t" != "$c" ] && echo "Sending ICMP ECHO_REQUEST to \"$c\"..." + # pass args and host + $_ping $args $c + } + + host(){ + local array=( $@ ) + local len=${#array[@]} + local host=${array[$len-1]} + local args=${array[@]:0:$len-1} + local _host="/usr/bin/host" + local c=$(_getdomainnameonly "$host") + [ "$t" != "$c" ] && echo "Performing DNS lookups for \"$c\"..." + $_host $args $c + } + +#### #10: Configure bash shell behavior via shell shopt options command #### + +Finally, you can [make changes to your bash shell environment using set and shopt][14] commands: + + # Correct dir spellings + shopt -q -s cdspell + + # Make sure display get updated when terminal window get resized + shopt -q -s checkwinsize + + # Turn on the extended pattern matching features + shopt -q -s extglob + + # Append rather than overwrite history on exit + shopt -s histappend + + # Make multi-line commandsline in history + shopt -q -s cmdhist + + # Get immediate notification of background job termination + set -o notify + + # Disable [CTRL-D] which is used to exit the shell + set -o ignoreeof + +### Conclusion ### + +This post is by no means comprehensive. It provided a short walkthrough of how to customize your enviorment. For a thorough look at bash/ksh/zsh/csh/tcsh capabilities, I suggest you read the man page by typing the following command: + + man bash + man zsh + man tcsh + man ksh + +> This article was contributed by Aadrika T. J.; Editing and additional content added by admin. You can too [contribute to nixCraft][15]. + +-------------------------------------------------------------------------------- + +via: http://www.cyberciti.biz/howto/shell-primer-configuring-your-linux-unix-osx-environment/ + +作者：[nixCraft][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.cyberciti.biz/tips/about-us +[1]:http://www.cyberciti.biz/howto/shell-primer-configuring-your-linux-unix-osx-environment/attachment/finding-your-shell-like-a-pro/ +[2]:http://www.cyberciti.biz/howto/shell-primer-configuring-your-linux-unix-osx-environment/attachment/finding-and-verifying-shell-path/ +[3]:http://www.cyberciti.biz/faq/linux-unix-appleosx-bsd-cat-command-examples/ +[4]:http://www.cyberciti.biz/howto/shell-primer-configuring-your-linux-unix-osx-environment/attachment/a-nested-shell-level-command/ +[5]:http://www.cyberciti.biz/howto/shell-primer-configuring-your-linux-unix-osx-environment/attachment/list-bash-enviroment-variables/ +[6]:http://zshwiki.org/home/config/files +[7]:http://www.cyberciti.biz/howto/shell-primer-configuring-your-linux-unix-osx-environment/attachment/history-outputs/ +[8]:http://www.cyberciti.biz/open-source/command-line-hacks/linux-run-command-as-different-user/ +[9]:http://www.cyberciti.biz/tips/bash-aliases-mac-centos-linux-unix.html +[10]:http://bash.cyberciti.biz/guide/Chapter_9:_Functions +[11]:http://www.cyberciti.biz/faq/ssh-passwordless-login-with-keychain-for-scripts/ +[12]:http://www.cyberciti.biz/faq/fedora-redhat-scientific-linuxenable-bash-completion/ +[13]:http://www.cyberciti.biz/tips/howto-linux-unix-bash-shell-setup-prompt.html +[14]:http://bash.cyberciti.biz/guide/Setting_shell_options +[15]:http://www.cyberciti.biz/write-for-nixcraft/ \ No newline at end of file From 4f2ddf816a43342b681d51f36d0a62ad7913ad70 Mon Sep 17 00:00:00 2001 From: Ping Yang Date: Sun, 25 Jan 2015 22:02:10 +0800 Subject: [PATCH 024/207] Translating --- ...o create and configure a MySQL user from the command line.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md b/sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md index 09f29434e4..c021158400 100644 --- a/sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md +++ b/sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md @@ -1,3 +1,5 @@ +Ping Translating + Linux FAQs with Answers--How to create and configure a MySQL user from the command line ================================================================================ > **Question**: I would like to create a new user account on MySQL server, and apply appropriate permissions and resource limits to the account. How can I create and configure a MySQL user from the command line? From 172b9dc837f00143613422813eb71a444f0a4e87 Mon Sep 17 00:00:00 2001 From: Ping Yang Date: Sun, 25 Jan 2015 22:05:57 +0800 Subject: [PATCH 025/207] Translating --- ...nux FAQs with Answers--How to check memory usage on Linux.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md b/sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md index ecd5ba10da..0ed5ab4394 100644 --- a/sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md +++ b/sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md @@ -1,3 +1,5 @@ +Ping Translating + Linux FAQs with Answers--How to check memory usage on Linux ================================================================================ > **Question**: I would like to monitor memory usage on my Linux system. What are the available GUI-based or command-line tools for checking current memory usage of Linux? From 0a49bf86cd5bf22e8537a8e1d548f12d0ff39316 Mon Sep 17 00:00:00 2001 From: Ping Yang Date: Sun, 25 Jan 2015 22:11:38 +0800 Subject: [PATCH 026/207] Translating --- ...AQs with Answers--How to set a custom HTTP header in curl.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md b/sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md index 37622009f1..f52527cd8a 100644 --- a/sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md +++ b/sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md @@ -1,3 +1,5 @@ +Ping Translating + Linux FAQs with Answers--How to set a custom HTTP header in curl ================================================================================ > **Question**: I am trying to fetch a URL with curl command, but want to set a few custom header fields in the outgoing HTTP request. How can I use a custom HTTP header with curl? From 77b3ca0f17a749b68e6a46b5bd76decfad3c9e1a Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 25 Jan 2015 22:49:39 +0800 Subject: [PATCH 027/207] PUB:20141117 Restricting process CPU usage using nice cpulimit and cgroups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @coloka 翻译的不错！ --- ...U usage using nice cpulimit and cgroups.md | 195 +++++++++++++++++ ...U usage using nice cpulimit and cgroups.md | 196 ------------------ 2 files changed, 195 insertions(+), 196 deletions(-) create mode 100644 published/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md delete mode 100644 translated/tech/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md diff --git a/published/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md b/published/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md new file mode 100644 index 0000000000..5ca233ae98 --- /dev/null +++ b/published/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md @@ -0,0 +1,195 @@ +使用 nice、cpulimit 和 cgroups 限制 cpu 占用率 +================================================================================ + +![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/juggle.jpg) + +Linux内核是一名了不起的马戏表演者，它在进程和系统资源间小心地玩着杂耍，并保持系统的能够正常运转。 同时，内核也很公正：它将资源公平地分配给各个进程。 + +但是，如果你需要给一个重要进程提高优先级时，该怎么做呢？ 或者是，如何降低一个进程的优先级？ 又或者，如何限制一组进程所使用的资源呢？ + +**答案是需要由用户来为内核指定进程的优先级** + +大部分进程启动时的优先级是相同的，因此Linux内核会公平地进行调度。 如果想让一个CPU密集型的进程运行在较低优先级，那么你就得事先配置好调度器。 + +下面介绍3种控制进程运行时间的方法： + +- 使用 nice 命令手动降低任务的优先级。 +- 使用 cpulimit 命令不断的暂停进程，以控制进程所占用处理能力不超过特定限制。 +- 使用linux内建的**control groups（控制组）**功能，它提供了限制进程资源消耗的机制。 + +我们来看一下这3个工具的工作原理和各自的优缺点。 + +### 模拟高cpu占用率 ### + +在分析这3种技术前，我们要先安装一个工具来模拟高CPU占用率的场景。我们会用到CentOS作为测试系统，并使用[Mathomatic toolkit][1]中的质数生成器来模拟CPU负载。 + +很不幸，在CentOS上这个工具没有预编译好的版本，所以必须要从源码进行安装。先从 http://mathomatic.orgserve.de/mathomatic-16.0.5.tar.bz2 这个链接下载源码包并解压。然后进入 **mathomatic-16.0.5/primes** 文件夹，运行 **make** 和 **sudo make install** 进行编译和安装。这样，就把 **matho-primes** 程序安装到了 **/usr/local/bin** 目录中。 + +接下来，通过命令行运行： + + /usr/local/bin/matho-primes 0 9999999999 > /dev/null & + +程序运行后，将输出从0到9999999999之间的质数。因为我们并不需要这些输出结果，直接将输出重定向到/dev/null就好。 + +现在，使用top命令就可以看到matho-primes进程榨干了你所有的cpu资源。 + +![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image00.jpg) + +好了，接下来（按q键）退出 top 并杀掉 matho-primes 进程（使用 fg 命令将进程切换到前台，再按 CTRL+C） + +### nice命令 ### + +下来介绍一下nice命令的使用方法，nice命令可以修改进程的优先级，这样就可以让进程运行得不那么频繁。 **这个功能在运行cpu密集型的后台进程或批处理作业时尤为有用。** nice值的取值范围是[-20,19],-20表示最高优先级，而19表示最低优先级。 Linux进程的默认nice值为0。使用nice命令（不带任何参数时）可以将进程的nice值设置为10。这样调度器就会将此进程视为较低优先级的进程，从而减少cpu资源的分配。 + +下面来看一个例子，我们同时运行两个 **matho-primes** 进程，一个使用nice命令来启动运行，而另一个正常启动运行： + + nice matho-primes 0 9999999999 > /dev/null & + matho-primes 0 9999999999 > /dev/null & + +再运行top命令。 + + +![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image05.jpg) + +看到没，正常运行的进程（nice值为0）获得了更多的cpu运行时间，相反的，用nice命令运行的进程占用的cpu时间会较少（nice值为10）。 + +在实际使用中，如果你要运行一个CPU密集型的程序，那么最好用nice命令来启动它，这样就可以保证其他进程获得更高的优先级。 也就是说，即使你的服务器或者台式机在重载的情况下，也可以快速响应。 + +nice 还有一个关联命令叫做 renice，它可以在运行时调整进程的 nice 值。使用 renice 命令时，要先找出进程的 PID。下面是一个例子： + + renice +10 1234 + +其中，1234是进程的 PID。 + +测试完 **nice** 和 **renice** 命令后，记得要将 **matho-primes** 进程全部杀掉。 + +### cpulimit命令 ### + +接下来介绍 **cpulimit** 命令的用法。 **cpulimit** 命令的工作原理是为进程预设一个 cpu 占用率门限，并实时监控进程是否超出此门限，若超出则让该进程暂停运行一段时间。cpulimit 使用 SIGSTOP 和 SIGCONT 这两个信号来控制进程。它不会修改进程的 nice 值，而是通过监控进程的 cpu 占用率来做出动态调整。 + +cpulimit 的优势是可以控制进程的cpu使用率的上限值。但与 nice 相比也有缺点，那就是即使 cpu 是空闲的，进程也不能完全使用整个 cpu 资源。 + +在 CentOS 上，可以用下面的方法来安装它： + + wget -O cpulimit.zip https://github.com/opsengine/cpulimit/archive/master.zip + unzip cpulimit.zip + cd cpulimit-master + make + sudo cp src/cpulimit /usr/bin + +上面的命令行，会先从从 GitHub 上将源码下载到本地，然后再解压、编译、并安装到 /usr/bin 目录下。 + +cpulimit 的使用方式和 nice 命令类似，但是需要用户使用 **-l** 选项显式地定义进程的 cpu 使用率上限值。举例说明： + + cpulimit -l 50 matho-primes 0 9999999999 > /dev/null & + +![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image03.jpg) + +从上面的例子可以看出 matho-primes 只使用了50%的 cpu 资源，剩余的 cpu 时间都在 idle。 + +cpulimit 还可以在运行时对进程进行动态限制，使用 **-p** 选项来指定进程的 PID，下面是一个实例： + + cpulimit -l 50 -p 1234 + +其中，1234是进程的 PID。 + +### cgroups 命令集 ### + +最后介绍，功能最为强大的控制组（cgroups）的用法。cgroups 是 Linux 内核提供的一种机制，利用它可以指定一组进程的资源分配。 具体来说，使用 cgroups，用户能够限定一组进程的 cpu 占用率、系统内存消耗、网络带宽，以及这几种资源的组合。 + +对比nice和cpulimit，**cgroups 的优势**在于它可以控制一组进程，不像前者仅能控制单进程。同时，nice 和 cpulimit 只能限制 cpu 使用率，而 cgroups 则可以限制其他进程资源的使用。 + +对 cgroups 善加利用就可以控制好整个子系统的资源消耗。就拿 CoreOS 作为例子，这是一个专为大规模服务器部署而设计的最简化的 Linux 发行版本，它的 upgrade 进程就是使用 cgroups 来管控。这样，系统在下载和安装升级版本时也不会影响到系统的性能。 + +下面做一下演示，我们将创建两个控制组（cgroups），并对其分配不同的 cpu 资源。这两个控制组分别命名为“cpulimited”和“lesscpulimited”。 + +使用 cgcreate 命令来创建控制组，如下所示： + + sudo cgcreate -g cpu:/cpulimited + sudo cgcreate -g cpu:/lesscpulimited + +其中“-g cpu”选项用于设定 cpu 的使用上限。除 cpu 外，cgroups 还提供 cpuset、memory、blkio 等控制器。cpuset 控制器与 cpu 控制器的不同在于，cpu 控制器只能限制一个 cpu 核的使用率，而 cpuset 可以控制多个 cpu 核。 + +cpu 控制器中的 cpu.shares 属性用于控制 cpu 使用率。它的默认值是 1024，我们将 lesscpulimited 控制组的 cpu.shares 设为1024（默认值），而 cpulimited 设为512，配置后内核就会按照2：1的比例为这两个控制组分配资源。 + +要设置cpulimited 组的 cpu.shares 为 512，输入以下命令： + + sudo cgset -r cpu.shares=512 cpulimited + +使用 cgexec 命令来启动控制组的运行，为了测试这两个控制组，我们先用cpulimited 控制组来启动 matho-primes 进程，命令行如下： + + sudo cgexec -g cpu:cpulimited /usr/local/bin/matho-primes 0 9999999999 > /dev/null & + +打开 top 可以看到，matho-primes 进程占用了所有的 cpu 资源。 + +![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image01.jpg) + +因为只有一个进程在系统中运行，不管将其放到哪个控制组中启动，它都会尽可能多的使用cpu资源。cpu 资源限制只有在两个进程争夺cpu资源时才会生效。 + +那么，现在我们就启动第二个 matho-primes 进程，这一次我们在 lesscpulimited 控制组中来启动它： + + sudo cgexec -g cpu:lesscpulimited /usr/local/bin/matho-primes 0 9999999999 > /dev/null & + +再打开 top 就可以看到，cpu.shares 值大的控制组会得到更多的 cpu 运行时间。 + +![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image02.jpg) + +现在，我们再在 cpulimited 控制组中增加一个 matho-primes 进程： + + sudo cgexec -g cpu:cpulimited /usr/local/bin/matho-primes 0 9999999999 > /dev/null & + +![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image04.jpg) + +看到没，两个控制组的 cpu 的占用率比例仍然为2：1。其中，cpulimited 控制组中的两个 matho-primes 进程获得的cpu 时间基本相当，而另一组中的 matho-primes 进程显然获得了更多的运行时间。 + +更多的使用方法，可以在 Red Hat 上查看详细的 cgroups 使用[说明][2]。（当然CentOS 7也有） + +### 使用Scout来监控cpu占用率 ### + +监控cpu占用率最为简单的方法是什么？[Scout][3] 工具能够监控能够自动监控进程的cpu使用率和内存使用情况。 + +![](https://dl.dropboxusercontent.com/u/468982/blog/server_view/processes.png) + +[Scout][3]的触发器（trigger）功能还可以设定 cpu 和内存的使用门限，超出门限时会自动产生报警。 + +从这里可以获取 [Scout][4] 的试用版。 + +### 总结 ### + +![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/overview.png) + +计算机的系统资源是非常宝贵的。上面介绍的这3个工具能够帮助大家有效地管理系统资源，特别是cpu资源： + +- **nice**可以一次性调整进程的优先级。 +- **cpulimit**在运行cpu密集型任务且要保持系统的响应性时会很有用。 +- **cgroups**是资源管理的瑞士军刀，同时在使用上也很灵活。 + +-------------------------------------------------------------------------------- + +via: http://blog.scoutapp.com/articles/2014/11/04/restricting-process-cpu-usage-using-nice-cpulimit-and-cgroups + +译者：[coloka](https://github.com/coloka) +校对：[wxy](https://github.com/wxy) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://www.mathomatic.org/ +[2]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Resource_Management_and_Linux_Containers_Guide/chap-Introduction_to_Control_Groups.html +[3]:https://scoutapp.com/ +[4]:https://scoutapp.com/ +[5]: +[6]: +[7]: +[8]: +[9]: +[10]: +[11]: +[12]: +[13]: +[14]: +[15]: +[16]: +[17]: +[18]: +[19]: +[20]: \ No newline at end of file diff --git a/translated/tech/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md b/translated/tech/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md deleted file mode 100644 index 7dd9bc4851..0000000000 --- a/translated/tech/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md +++ /dev/null @@ -1,196 +0,0 @@ -使用nice、cpulimit和cgroups限制cpu占用率 -================================================================================ -注：本文中的图片似乎都需要翻墙后才能看到，发布的时候注意 - -![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/juggle.jpg) - -Linux内核是一名了不起的马戏表演者，它在进程和系统资源间小心地玩着杂耍，并保持系统的能够正常运转。 同时，内核也很公正：它将资源公平地分配给各个进程。 - -但是，如果你需要给一个重要进程提高优先级时，该怎么做呢？ 或者是，如何降低一个进程的优先级？ 又或者，如何限制一组进程所使用的资源呢？ - -**答案是需要由用户来为内核指定进程的优先级** - -大部分进程启动时的优先级时相同的，因此Linux内核会公平地进行调度。 如果想让一个CPU密集型的进程运行在低优先级，那么你就得事先配置好调度器。 - -下面介绍3种控制进程运行时间的方法： - -- 使用nice命令手动减低任务的优先级。 -- 使用cpulimit命令控制进程的运行时间上限。 -- 使用linux内建的**control groups**功能，它提供了限制进程资源消耗的机制。 - -我们来看一下这3个工具的工作原理和各自的优缺点。 - -### 模拟高cpu占用率 ### - -在分析这3种技术前，我们要先安装一个工具来模拟高CPU占用率的场景。我们会用到CentOS作为测试系统，并使用[Mathomatic toolkit][1]中的质数生成器来模拟CPU负载。 - -很不幸，在CentOS上这个工具没有预编译好的版本，所以必须要从源码进行安装。先从http://mathomatic.orgserve.de/mathomatic-16.0.5.tar.bz2这个链接下载源码包并解压。然后进入**mathomatic-16.0.5/primes**文件夹，运行**make** 和 **sudo make install**进行编译和安装。这样，就把**matho-primes**程序安装到了**/usr/local/bin**目录中。 - -接下来，通过命令行运行： - - /usr/local/bin/matho-primes 0 9999999999 > /dev/null & - -程序运行后，将输出从0到9999999999之间的质数。因为我们并不需要这些输出结果，直接将输出重定向到/dev/null就好。 - -现在，使用top命令就可以看到matho-primes进程榨干了你所有的cpu资源。 - -![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image00.jpg) - -好了，接下来退出top（按q键）并杀掉matho-primes进程（使用fg命令将进程切换到前台，再按CTRL+C） - -### nice命令 ### -下来介绍一下nice命令的使用方法，nice命令可以修改进程的优先级，这样就可以让进程运行得不那么频繁。 **这个功能在运行cpu密集型的后台进程或批处理作业时尤为有用。** nice值的取值范围是[-20,19],-20表示最高优先级，而19表示最低优先级。 Linux进程的默认nice值为0。使用nice命令（不带任何参数时）可以将进程的nice值设置为10。这样调度器就会将此进程视为低优先级的进程，从而减少cpu资源的分配。 - -下面来看一个例子，我们同时运行两个**matho-primes**进程，一个使用nice命令来启动运行，而另一个正常启动运行： - - nice matho-primes 0 9999999999 > /dev/null & - matho-primes 0 9999999999 > /dev/null & - -再运行top命令。 - - - -![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image05.jpg) - -看到没，正常运行的进程（nice值为0）获得了更多的cpu运行时间，相反的，用nice命令运行的进程占用的cpu时间会较少（nice值为10）。 - -在实际使用中，如果你要运行一个CPU密集型的程序，那么最好用nice命令来启动它，这样就可以保证其他进程获得更高的优先级。 也就是说，即使你的服务器或者台式机在重载的情况下，也可以快速响应。 - -nice还有一个关联命令叫做renice，它可以在运行时调整进程的nice值。使用renice命令时，要先找出进程的PID。下面是一个例子： - - renice +10 1234 - -其中，1234是进程的PID。 - -测试完**nice** 和 **renice**命令后，记得要将**matho-primes**进程全部杀掉。 - -### cpulimit命令 ### - -接下来介绍 **cpulimit** 命令的用法。 **cpulimit** 命令的工作原理是为进程预设一个cpu占用率门限，并实时监控进程是否超出此门限，若超出则让该进程暂停运行一段时间。cpulimit使用 SIGSTOP和SIGCONT这两个信号来控制进程。它不会修改进程的nice值，而是通过监控进程的cpu占用率来做出动态调整。 - -cpulimit的优势是可以控制进程的cpu使用率的上限值。但与nice相比也有缺点，那就是即使cpu是空闲的，进程也不能完全使用整个cpu资源。 - -在CentOS上，可以用下面的方法来安装： - - wget -O cpulimit.zip https://github.com/opsengine/cpulimit/archive/master.zip - unzip cpulimit.zip - cd cpulimit-master - make - sudo cp src/cpulimit /usr/bin - -上面的命令行，会先从从GitHub上将源码下载到本地，然后再解压、编译、并安装到/usr/bin目录下。 - -cpulimit的使用方式和nice命令类似，但是需要用户使用-l选项显式地定义进程的cpu使用率上限值。举例说明： - - cpulimit -l 50 matho-primes 0 9999999999 > /dev/null & - -![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image03.jpg) - -从上面的例子可以看出matho-primes只使用了50%的cpu资源，剩余的cpu时间都为idle。 - -You can also limit a currently running process by specifying its PID using the ‘-p’ parameter. For example -cpulimit还可以在运行时对进程进行动态限制，使用-p选项来指定进程的PID，下面是一个实例： - - cpulimit -l 50 -p 1234 - -其中，1234是进程的PID。 - -### cgroups命令集 ### - -最后介绍，功能最为强大的控制组（cgroups）的用法。cgroups是Linux内核提供的一种机制，利用它可以指定一组进程的资源分配。 具体来说，使用cgroups，用户能够限定一组进程的cpu占用率、系统内存消耗、网络带宽，以及这几种资源的组合。 - -对比nice和cpulimit，**cgroups的优势**在于它可以控制一组进程，不像前者仅能控制单进程。同时，nice和cpulimit只能限制cpu使用率，而cgroups可以限制其他进程资源的使用。 - -对cgroups善加利用就可以控制好整个子系统的资源消耗。就拿CoreOS作为例子，这是一个专为大规模服务器部署而设计的最简化的Linux发行版本，它的upgrade进程就是使用cgroups来管控。这样，系统在下载和安装升级版本时也不会影响到系统的性能。 - -下面做一下演示，我们将创建两个控制组（cgroups），并对其分配不同的cpu资源。这两个控制组分别命名为“cpulimited”和“lesscpulimited”。 - -使用cgcreate命令来创建控制组，如下所示： - - sudo cgcreate -g cpu:/cpulimited - sudo cgcreate -g cpu:/lesscpulimited - -其中“-g cpu”选项用于设定cpu的使用上限。除此cpu外，cgroups还提供cpuset、memory、blkio等控制器。cpuset控制器与cpu控制器的不同在于，cpu控制器只能限制一个cpu核的使用率，而cpuset可以控制多个cpu核。 - -cpu控制器中的cpu.shares属性用于控制cpu使用率。它的默认值是1024，我们将lesscpulimited控制组的cpu.shares设为1024（默认值），而cpulimited设为512，配置后内核就会按照2：1的比例为这两个控制组分配资源。 - -To set the cpu.shares to 512 in the cpulimited group, type: - - sudo cgset -r cpu.shares=512 cpulimited - -使用cgexec命令来启动控制组的运行，为了测试这两个控制组，我们先用cpulimited控制组来启动matho-primes进程，命令行如下： - - sudo cgexec -g cpu:cpulimited /usr/local/bin/matho-primes 0 9999999999 > /dev/null & - -打开top可以看到，matho-primes进程占用了所有的cpu资源。 - -![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image01.jpg) - -因为只有一个进程在系统中运行，不管将其放到哪个控制组中启动，它都会尽可能多的使用cpu资源。cpu资源限制只有在两个进程争夺cpu资源时才会生效。 - -那么，现在我们就启动第二个matho-primes进程，这一次我们在lesscpulimited控制组中来启动它： - - sudo cgexec -g cpu:lesscpulimited /usr/local/bin/matho-primes 0 9999999999 > /dev/null & - -再打开top就可以看到，cpu.shares值大的控制组会得到更多的cpu运行时间。 - -![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image02.jpg) - -现在，我们再在cpulimited控制组中增加一个matho-primes进程： - - sudo cgexec -g cpu:cpulimited /usr/local/bin/matho-primes 0 9999999999 > /dev/null & - -![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/image04.jpg) - -看到没，两个控制组的cpu的占用率比例仍然为2：1。其中，cpulimited控制组中的两个matho-primes进程获得的cpu时间基本相当，而另一组中的matho-primes进程显然获得了更多的运行时间。 - -更多的使用方法，可以在Red Hat上查看详细的cgroups使用[说明][2]。（当然CentOS 7也有） - -### 使用Scout来监控cpu占用率 ### - -监控cpu占用率最为简单的方法是什么？[Scout][3]工具能够监控能够自动监控进程的cpu使用率和内存使用情况。 - -![](https://dl.dropboxusercontent.com/u/468982/blog/server_view/processes.png) - -[Scout][3]的触发器（trigger）功能还可以设定cpu和内存的使用门限，超出门限时会自动产生报警。 - -从这里可以获取[Scout][4]的试用版。 - -### 总结 ### -![](https://dl.dropboxusercontent.com/u/468982/blog/cpu_usage_blog/overview.png) - -计算机的系统资源是非常宝贵的。上面介绍的这3个工具能够帮助大家有效地管理系统资源，特别是cpu资源： - -- **nice**可以一次性调整进程的优先级。 -- **cpulimit**在运行cpu密集型任务且要保持系统的响应性时会很有用。 -- **cgroups**是资源管理的瑞士军刀，同时在使用上也很灵活。 - --------------------------------------------------------------------------------- - -via: http://blog.scoutapp.com/articles/2014/11/04/restricting-process-cpu-usage-using-nice-cpulimit-and-cgroups - -译者：[coloka](https://github.com/coloka) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://www.mathomatic.org/ -[2]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Resource_Management_and_Linux_Containers_Guide/chap-Introduction_to_Control_Groups.html -[3]:https://scoutapp.com/ -[4]:https://scoutapp.com/ -[5]: -[6]: -[7]: -[8]: -[9]: -[10]: -[11]: -[12]: -[13]: -[14]: -[15]: -[16]: -[17]: -[18]: -[19]: -[20]: \ No newline at end of file From e44e56151d063e91272318bdc0df3f4c4badbb09 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Sun, 25 Jan 2015 23:10:58 +0800 Subject: [PATCH 028/207] Translating by ZTinoZ --- ...0141223 20 Linux Commands Interview Questions & Answers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index 17a1179b8e..2b1fa24d92 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -82,9 +82,9 @@ 答: # find / -name core -exec rm {} \; -**问:15 What is the purpose of strings command ?** +**问:15 strings命令有什么作用？** -答: The strings command is used to extract and display the legible contents of a non-text file. +答: strings命令用来extract and display the legible contents of a non-text file. **问:16 What is the use tee filter ?** From 6f3210474b26f7dc6ab7294c674ec8c8d662572e Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 25 Jan 2015 23:41:16 +0800 Subject: [PATCH 029/207] PUB:20141124 Important 10 Linux ps command Practical Examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @johnhoow 忠实原文翻译比较好~ --- ... 10 Linux ps command Practical Examples.md | 186 ++++++++++++++++++ ... 10 Linux ps command Practical Examples.md | 186 ------------------ 2 files changed, 186 insertions(+), 186 deletions(-) create mode 100644 published/20141124 Important 10 Linux ps command Practical Examples.md delete mode 100644 translated/tech/20141124 Important 10 Linux ps command Practical Examples.md diff --git a/published/20141124 Important 10 Linux ps command Practical Examples.md b/published/20141124 Important 10 Linux ps command Practical Examples.md new file mode 100644 index 0000000000..6423db4a2a --- /dev/null +++ b/published/20141124 Important 10 Linux ps command Practical Examples.md @@ -0,0 +1,186 @@ +10个重要的Linux ps命令实战 +================================================================================ +Linux作为Unix的衍生操作系统，Linux内建有查看当前进程的工具。这个工具能在命令行中使用。 + +### PS 命令是什么 ### + +查看它的man手册可以看到，ps命令能够给出当前系统中进程的快照。它能捕获系统在某一事件的进程状态。如果你想不断更新查看的这个状态，可以使用top命令。 + +ps命令支持三种使用的语法格式 + +1. UNIX 风格，选项可以组合在一起，并且选项前必须有“-”连字符 +2. BSD 风格，选项可以组合在一起，但是选项前不能有“-”连字符 +3. GNU 风格的长选项，选项前有两个“-”连字符 + +我们能够混用这几种风格，但是可能会发生冲突。本文使用 UNIX 风格的ps命令。这里有在日常生活中使用较多的ps命令的例子。 + +### 1. 不加参数执行ps命令 ### + +这是一个基本的 **ps** 使用。在控制台中执行这个命令并查看结果。 + +![不加选项执行ps命令](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_no_options.png) + +结果默认会显示4列信息。 + +- PID: 运行着的命令(CMD)的进程编号 +- TTY: 命令所运行的位置（终端） +- TIME: 运行着的该命令所占用的CPU处理时间 +- CMD: 该进程所运行的命令 + +这些信息在显示时未排序。 + +### 2. 显示所有当前进程 ### + +使用 **-a** 参数。**-a 代表 all**。同时加上x参数会显示没有控制终端的进程。 + + $ ps -ax + +这个命令的结果或许会很长。为了便于查看，可以结合less命令和管道来使用。 + + $ ps -ax | less + +![ps all 信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_ax.png) + +### 3. 根据用户过滤进程 ### + +在需要查看特定用户进程的情况下，我们可以使用 **-u** 参数。比如我们要查看用户'pungki'的进程，可以通过下面的命令： + + $ ps -u pungki + +![通过用户过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps__u.png) + +### 4. 通过cpu和内存使用来过滤进程 ### + +也许你希望把结果按照 CPU 或者内存用量来筛选，这样你就找到哪个进程占用了你的资源。要做到这一点，我们可以使用 **aux 参数**，来显示全面的信息: + + $ ps -aux | less + +![显示全面信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux.png) + +当结果很长时，我们可以使用管道和less命令来筛选。 + +默认的结果集是未排好序的。可以通过 **--sort**命令来排序。 + +根据 **CPU 使用**来升序排序 + + $ ps -aux --sort -pcpu | less + +![根据cpu使用排序](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux_sort_cpu.png) + +根据 **内存使用** 来升序排序 + + $ ps -aux --sort -pmem | less + +![根据内存使用来排序](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux_sort_mem.png) + +我们也可以将它们合并到一个命令，并通过管道显示前10个结果： + + $ ps -aux --sort -pcpu,+pmem | head -n 10 + +### 5. 通过进程名和PID过滤 ### + +使用 **-C 参数**，后面跟你要找的进程的名字。比如想显示一个名为getty的进程的信息，就可以使用下面的命令： + + $ ps -C getty + +![通过进程名和PID过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_C.png) + +如果想要看到更多的细节，我们可以使用-f参数来查看格式化的信息列表： + + $ ps -f -C getty + +![通过进程名和PID过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_C_f.png) + +### 6. 根据线程来过滤进程 ### + +如果我们想知道特定进程的线程，可以使用**-L 参数**，后面加上特定的PID。 + + $ ps -L 1213 + +![根据线程来过滤进程](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_L.png) + +### 7. 树形显示进程 ### + +有时候我们希望以树形结构显示进程，可以使用 **-axjf** 参数。 + + $ps -axjf + +![树形显示进程](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_axjf.png) + +或者可以使用另一个命令。 + + $ pstree + +![树形显示进程](http://blog.linoxide.com/wp-content/uploads/2014/10/pstree.png) + +### 8. 显示安全信息 ### + +如果想要查看现在有谁登入了你的服务器。可以使用ps命令加上相关参数: + + $ ps -eo pid,user,args + +**参数 -e** 显示所有进程信息，**-o 参数**控制输出。**Pid**,**User 和 Args**参数显示**PID，运行应用的用户**和**该应用**。 + +![显示安全信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_security_1.png) + +能够与**-e 参数** 一起使用的关键字是**args, cmd, comm, command, fname, ucmd, ucomm, lstart, bsdstart 和 start**。 + +### 9. 格式化输出root用户（真实的或有效的UID）创建的进程 ### + +系统管理员想要查看由root用户运行的进程和这个进程的其他相关信息时，可以通过下面的命令: + + $ ps -U root -u root u + +**-U 参数**按真实用户ID(RUID)筛选进程，它会从用户列表中选择真实用户名或 ID。真实用户即实际创建该进程的用户。 + +**-u** 参数用来筛选有效用户ID（EUID）。 + +最后的**u**参数用来决定以针对用户的格式输出，由**User, PID, %CPU, %MEM, VSZ, RSS, TTY, STAT, START, TIME 和 COMMAND**这几列组成。 + +这里有上面的命令的输出结果： + +![show real and effective User ID](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_root_real_effective_ID.png) + +### 10. 使用PS实时监控进程状态 ### + +ps 命令会显示你系统当前的进程状态，但是这个结果是静态的。 + +当有一种情况，我们需要像上面第四点中提到的通过CPU和内存的使用率来筛选进程，并且我们希望结果能够每秒刷新一次。为此，我们可以**将ps命令和watch命令结合起来**。 + + $ watch -n 1 ‘ps -aux --sort -pmem, -pcpu’ + +![组合 ps 和 watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_1.png) + +如果输出太长，我们也可以限制它，比如前20条，我们可以使用**head**命令来做到。 + + $ watch -n 1 ‘ps -aux --sort -pmem, -pcpu | head 20’ + +![组合 ps 和 watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_2.png) + +这里的动态查看并不像top或者htop命令一样。**但是使用ps的好处是**你能够定义显示的字段，你能够选择你想查看的字段。 + +举个例子，**如果你只需要看名为'pungki'用户的信息**，你可以使用下面的命令： + + $ watch -n 1 ‘ps -aux -U pungki u --sort -pmem, -pcpu | head 20’ + +![组合 ps 和 watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_3.png) + +### 结论 ### + +你也许每天都会使用ps命令来监控你的Linux系统。但是事实上，你可以通过ps命令的参数来生成各种你需要的报表。 + +ps命令的另一个优势是ps是各种 Linux系统都默认安装的，因此你只要用就行了。 + +不要忘了通过 man ps来查看更多的参数。（LCTT 译注：由于 ps 命令古老而重要，所以它在不同的 UNIX、BSD、Linux 等系统中的参数不尽相同，因此如果你用的不是 Linux 系统，请查阅你的文档了解具体可用的参数。） + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/how-tos/linux-ps-command-examples/ + +作者：[Pungki Arianto][a] +译者：[johnhoow](https://github.com/johnhoow) +校对：[wxy](https://github.com/wxy) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/pungki/ diff --git a/translated/tech/20141124 Important 10 Linux ps command Practical Examples.md b/translated/tech/20141124 Important 10 Linux ps command Practical Examples.md deleted file mode 100644 index 7e1ece4787..0000000000 --- a/translated/tech/20141124 Important 10 Linux ps command Practical Examples.md +++ /dev/null @@ -1,186 +0,0 @@ -10个重要的Linux ps命令实战 -================================================================================ -Linux作为Unix的衍生操作系统，Linux拥有内建用来查看当前进程的工具。这个工具能在命令行中使用。 - -### PS 命令是什么 ### - -查看它的man手册可以看到，ps命令能够给出当前系统中进程的快照。它能捕获系统在某一事件的进程状态。如果你想实时更新这个状态，可以使用top命令。 - -ps命令支持三种使用的语法格式 - -1. UNIX 风格，一定要被分组并且必须有Dash引导使用(可以理解为必须在dash中使用，dash是一种shell) -2. BSD 风格，一点要被分组但不一定要在dash中使用 -3. GNU 风格，能够在两种dash中使用 - -我们能够混用这几种风格，但是可能会发生冲突。本文使用UNIX风格的ps命令。这里有在日常生活中使用较多的ps命令的例子。 - -### 1. 不加参数执行ps命令 ### - -这是一个基本的 **ps** 使用。只要在控制台中执行这个命令并查看结果。 - -![不加选项执行ps命令](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_no_options.png) - -结果默认会显示4列信息。 - -- PID: 运行命令(CMD)的进程编号 -- TTY: 命令运行的位置 -- TIME: 说明运行这个命令所用的CPU时间 -- CMD: 作为当前进程运行的命令 - -这些信息在显示时未排序。 - -### 2. 显示所有当前进程 ### - -使用 **-a** 参数。**-a 代表 all**。同时加上x参数会显示没有控制终端的进程。 - - $ ps -ax - -这个命令的结果或许会很长。为获得简练的信息，可以结合less命令和管道来使用。 - - $ ps -ax | less - -![ps all 信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_ax.png) - -### 3. 根据用户过滤进程 ### - -在需要查看特点用户的进程是情况下，我们可以使用 **-u** 参数。比如我们要查看用户'pungki'的进程，可以通过下面的命令 - - $ ps -u pungki - -![通过user过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps__u.png) - -### 4. 通过cpu和内存使用来过滤进程 ### - -可以使用 **aux 参数**,来显示全面的信息: - - $ ps -aux | less - -![显示全面信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux.png) - -当结果很长时，我们可以使用管道和less命令来筛选。 -默认的结果集是未排好序的。可以通过 **--sort**命令好排序。 - -根据 **CPU 使用**来升序排序 - - $ ps -aux --sort -pcpu | less - -![根据cpu使用排序](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux_sort_cpu.png) - -根据 **内存使用** 来升序排序 - - $ ps -aux --sort -pmem | less - -![根据内存使用来排序](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_aux_sort_mem.png) - -我们也可以通过管道显示前10个结果： - - $ ps -aux --sort -pcpu,+pmem | head -n 10 - -### 5. 通过进程name和id过滤 ### - -使用 **-C 参数**，后面跟你要找的进程的name。比如想显示一个名为getty的进程的信息，就可以使用下面的命令： - - $ ps -C getty - -![通过进程name和id过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_C.png) - -如果想要看到更多的细节，我们可以使用-f参数来查看格式化的信息列表： - - $ ps -f -C getty - -![通过进程name和id过滤](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_C_f.png) - -### 6. 根据线程来过滤进程 ### - -如果我们想知道特定进程的线程，可以使用**-L 参数**，后面加上特定的PID。 - - $ ps -L 1213 - -![根据线程来过滤进程](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_L.png) - -### 7. 分层显示进程 ### - -使用 **-axjf** 参数。 - - $ps -axjf - -![分层显示进程](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_axjf.png) - -或者可以使用另一个命令。 - - $ pstree - -![分层显示进程](http://blog.linoxide.com/wp-content/uploads/2014/10/pstree.png) - -### 8. 显示安全信息 ### - -如果想要查看现在有谁登入了你的server。可以使用ps命令加上相关参数: - - $ ps -eo pid,user,args - -**参数 -e** 显示所有进程信息 **-o 参数**控制输出。**Pid**,**User 和 Args**参数显示**PID,运行应用的用户**和**运行的应用**。 - -![显示安全信息](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_security_1.png) - -能够与**-e 参数** 一起使用的关键字是**args, cmd, comm, command, fname, ucmd, ucomm, lstart, bsdstart and start**。 - -### 9. 格式化输出root用户创建的进程 ### - -系统管理员想要查看由root用户运行的进程和这个进程的其他相关信息时，可以通过下面的命令: - - $ ps -U root -u root u - -**-U 参数**用来选择特定的用户ID(在userlist中存在的用户名或ID)。用户ID用来标识创建进程的用户。 - -While the **-u paramater** will select by effective user ID (EUID) -**-u** 参数用来筛选有效的用户ID。 - - -最后的**u**参数用来确定结果的输出格式，由**User, PID, %CPU, %MEM, VSZ, RSS, TTY, STAT, START, TIME and COMMAND**这几列组成。 - -这里有上面的命令的输出结果 - -![show real and effective User ID](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_root_real_effective_ID.png) - -### 10. 使用PS实时监控进程状态 ### - -ps 命令会显示你系统当前的进程状态，但是这个结果是静态的。 -当有一种情况，我们需要想上面第四点中提到的通过CPU和内存的使用率来过滤进程。并且我们希望结果能够每秒更新一次。为此，我们可以**将ps命令和watch命令结合起来**。 - - $ watch -n 1 ‘ps -aux --sort -pmem, -pcpu’ - -![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_1.png) - -并且可以通过**head**命令还进行限制。 - - $ watch -n 1 ‘ps -aux --sort -pmem, -pcpu | head 20’ - -![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_2.png) - -这里的动态查看不想top或者htop命令。**但是使用ps的好处是**你能够定义显示的字段。你能够选择你想查看的字段。 - -举个例子，**如果你只先看名为'pungki'用户的信息**，你可以使用下面的命令： - - $ watch -n 1 ‘ps -aux -U pungki u --sort -pmem, -pcpu | head 20’ - -![combine ps with watch](http://blog.linoxide.com/wp-content/uploads/2014/10/ps_watch_3.png) - -### 结论 ### - -你可能会使用ps命令来监控你的Linux系统。但是事实上，你可以通过ps命令的参数来生成各种你需要的报表。 - -ps命令的另一个优势是ps是系统默认安装的。因此你只要用就行了。 - -可以通过 man ps来查看更多的参数。 - --------------------------------------------------------------------------------- - -via: http://linoxide.com/how-tos/linux-ps-command-examples/ - -作者：[Pungki Arianto][a] -译者：[johnhoow](https://github.com/johnhoow) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linoxide.com/author/pungki/ From 4b4cead2c4becf09db39d1ef7aa4a14ca352258f Mon Sep 17 00:00:00 2001 From: disylee Date: Mon, 26 Jan 2015 01:22:59 +0800 Subject: [PATCH 030/207] translated --- ... C or C++ program with Nemiver debugger.md | 0 ... C or C++ program with Nemiver debugger.md | 126 ++++++++++++++++++ 2 files changed, 126 insertions(+) rename {sources/tech => translated}/20150104 How to debug a C or C++ program with Nemiver debugger.md (100%) create mode 100644 translated/tech/20150104 How to debug a C or C++ program with Nemiver debugger.md diff --git a/sources/tech/20150104 How to debug a C or C++ program with Nemiver debugger.md b/translated/20150104 How to debug a C or C++ program with Nemiver debugger.md similarity index 100% rename from sources/tech/20150104 How to debug a C or C++ program with Nemiver debugger.md rename to translated/20150104 How to debug a C or C++ program with Nemiver debugger.md diff --git a/translated/tech/20150104 How to debug a C or C++ program with Nemiver debugger.md b/translated/tech/20150104 How to debug a C or C++ program with Nemiver debugger.md new file mode 100644 index 0000000000..b5dc4c34a7 --- /dev/null +++ b/translated/tech/20150104 How to debug a C or C++ program with Nemiver debugger.md @@ -0,0 +1,126 @@ +使用Nemiver调试器找出C/C++程序中的bug +================================================================================ + +如果你读过[my post on GDB][1],你就会明白我认为一个调试器对一段C/C++程序来说意味着多么的重要和有用。然而，如果一个像GDB的命令行对你而言听起来更像一个问题而不是一个解决方案，那么你也许会对Nemiver更感兴趣。[Nemiver][2] 是一款基于GTK＋的独立图形化用于C/C＋＋程序的调试器，同时它以GDB作为其后端。最令人佩服的是其速度和稳定性，Nemiver时一个非常可靠，具备许多优点的调试工具。 + +### Nemiver的安装 ### + +基于Debian发行版，它的安装时非常直接简单如下： + + $ sudo apt-get install nemiver + +在Arch Linux中安装如下： + + $ sudo pacman -S nemiver + +在Fedora中安装如下： + + $ sudo yum install nemiver + +如果你选择自己变异，[GNOME website][3]中最新源码包可用。 + +最令人欣慰的是，它能够很好地与GNOME环境像结合。 + +### Nemiver的基本用法 ### + +启动Nemiver的命令： + + $ nemiver + +你也可以通过执行一下命令来启动： + + $ nemiver [path to executable to debug] + +你会注意到如果在调试模式下执行编译（－g标志表示GCC）将会更有帮助。 + +还有一个优点是Nemiver的快速加载，所以你应该可以马上看到主屏幕的默认布局。 + + + + + +![](https://farm9.staticflickr.com/8679/15535277554_d320f6692c_c.jpg) + +默认情况下，断点通常位于主函数的第一行。这样就可以空出时间让你去认识调试器的基本功能： + +![](https://farm9.staticflickr.com/8669/16131832596_bc68ae18a8_o.jpg) + +- Next line (mapped to F6) +- Step inside a function (F7) +- Step out of a function (Shift+F7) +- 下一行 （映射到F6） +- 执行内部行数（F7） +- 执行外部函数（Shift+F7） ## 我不确定这个保留哪个都翻译出来了 ## + +但是由于我个人的喜好是“Run to cursor（运行至光标）”，该选项使你的程序运行精确至你光标下的行，并且默认映射到F11. + +下一步，断点通常是容易使用的。最快捷的方式是使用F8设置一个断点在相应的行。但是Nemiver也有一个更富在的菜单在“Debug”项，这允许你在一个特定的函数，行数，二进制位置文件的位置，或者类似一个异常，分支或者exec的事件。 + +![](https://farm8.staticflickr.com/7579/16157622315_d680a63896_z.jpg) + + +你也可以通过追踪来查看一个变量。在“Debug”选项，你可以通过命名来匹配一个表达式来检查。然后也可以通过将其添加到列表中以方便访问。这可能是最有用的一个功能虽然我从未因为浓厚的兴趣将鼠标悬停在一个变量来获取它的值。值得注意的是，将鼠标放置在相应位置时不生效的。如果想要让它更好地工作，Nemiver是可以看到结构并给所有成员的变量赋值。 + +![](https://farm8.staticflickr.com/7465/15970310470_7ed020c613.jpg) + + +谈到方便地访问信息，我也非常欣赏这个程序的平面布局。默认情况下，代码在上个部分，标签在下半部分。这授予你访问中断输出、文本追踪、断点列表、注册地址、内存映射和变量控制。但是注意到在“Edit”“Preferences”“Layout”下你可以选择不同的布局，包括动态修改。 + +![](https://farm9.staticflickr.com/8606/15971551549_00e4cdd32e_c.jpg) + +![](https://farm8.staticflickr.com/7525/15535277594_026fef17c1_z.jpg) + + +自然而然，一旦你设置了所有短点，观察点和布局，您可以在“File”下很方便地保存以免你不小心关掉Nemiver。 + + +### Nemiver的高级用法 ### + + +到目前为止，我们讨论的都是Nemiver的基本特征，例如，你马上开始喝调试一个简单的程序需要什么。如果你有更高的药求，特别是对于一些更佳复杂的程序，你应该会对接下来提到的这些特征更感兴趣。 + + +#### 调试一个正在运行的进程 #### + + +Nemiver允许你连接到一个正在运行的进程进行调试。在“File”菜单，你可以过滤出正在运行的进程，并连接到这个进程。 + +![](https://farm9.staticflickr.com/8593/16155720571_00e4cdd32e_z.jpg) + + +#### 通过TCP连接远程调试一个程序 #### + +Nemiver支持远程调试，当你在一台远程机器设置一个轻量级调试服务器，你可以通过调试服务器启动Nemiver从另一台机器去调试承载远程服务器上的目标。如果出于某些原因，你不能在远程机器上吗很好地驾驭Nemiver或者GDB，那么远程调试对于你来说将非常有用。在“File”菜单下，指定二进制文件、共享库的地址和端口。 + +![](https://farm8.staticflickr.com/7469/16131832746_c47dee4ef1.jpg) + +#### 使用你的GDB二进制进行调试 #### + +如果你想自行通过Nemiver进行编译，你可以在“Edit（编辑）”“Preferences（首选项）”“Debug（调试）”下给GDB制定一个新的位置。如果你想在Nemiver使用GDB的定制版本，那么这个选项对你来说是非常实用的。 + + +#### 循序一个子进程或者父进程 #### + +Nemiver是可以兼容一个子进程或者附近成的。想激活这个功能，请到“Debugger”下面的“Preferences（首选项）”。 + +![](https://farm8.staticflickr.com/7512/16131832716_5724ff434c_z.jpg) + +总而言之，Nemiver大概是我最喜欢的没有IDE的调试程序。在我看来，它甚至可以击败GDB，并且[命令行][4]程序对我本身来说更接地气。所以，如果你从未使用过的话，我会强烈推荐你使用。我只能庆祝我们团队背后给了我这么一个可靠、稳定的程序。 + +你对Nemiver有什么见解？你是否也考虑它作为独立的调试工具？或者仍然坚持使用IDE？让我们在评论中探讨吧。 + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/debug-program-nemiver-debugger.html + +作者：[Adrien Brochard][a] +译者：[disylee](https://github.com/disylee) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/adrien +[1]:http://xmodulo.com/gdb-command-line-debugger.html +[2]:https://wiki.gnome.org/Apps/Nemiver +[3]:https://download.gnome.org/sources/nemiver/0.9/ +[4]:http://xmodulo.com/recommend/linuxclibook From 7acbc7034b255f8583ef39e526ab69569c0a5a9b Mon Sep 17 00:00:00 2001 From: runningwater Date: Mon, 26 Jan 2015 10:12:17 +0800 Subject: [PATCH 031/207] Update 20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md --- ...Can Write a Single ISO to 20 USB Drives Simultaneously.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md b/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md index c1d1106e03..a23c070ac7 100644 --- a/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md +++ b/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md @@ -1,3 +1,4 @@ +(translating by runningwater) This App Can Write a Single ISO to 20 USB Drives Simultaneously ================================================================================ **If I were to ask you to burn a single Linux ISO to 17 USB thumb drives how would you go about doing it?** @@ -49,11 +50,11 @@ Bugs and pull requests can be longed on the GitHub page for the project, which i via: http://www.omgubuntu.co.uk/2015/01/gnome-multiwriter-iso-usb-utility 作者：[Joey-Elijah Sneddon][a] -译者：[译者ID](https://github.com/译者ID) +译者：[runningwater](https://github.com/runningwater) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:https://plus.google.com/117485690627814051450/?rel=author [1]:https://github.com/hughsie/gnome-multi-writer/ -[2]:https://github.com/hughsie/gnome-multi-writer/ \ No newline at end of file +[2]:https://github.com/hughsie/gnome-multi-writer/ From b591981031badf8363f09bcc6d8d4fbc65035ac1 Mon Sep 17 00:00:00 2001 From: runningwater Date: Mon, 26 Jan 2015 10:14:25 +0800 Subject: [PATCH 032/207] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=B8=AD=20by=20runn?= =?UTF-8?q?ingwater?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pp Can Write a Single ISO to 20 USB Drives Simultaneously.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md b/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md index a23c070ac7..130311ef12 100644 --- a/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md +++ b/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md @@ -1,4 +1,4 @@ -(translating by runningwater) +(translating by runningwater ) This App Can Write a Single ISO to 20 USB Drives Simultaneously ================================================================================ **If I were to ask you to burn a single Linux ISO to 17 USB thumb drives how would you go about doing it?** From a69c9e40e05455cfaaa89cb53846a1e2f7f89441 Mon Sep 17 00:00:00 2001 From: Ping Date: Mon, 26 Jan 2015 10:47:15 +0800 Subject: [PATCH 033/207] Translated 20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md --- ...gure a MySQL user from the command line.md | 108 ------------------ ...gure a MySQL user from the command line.md | 107 +++++++++++++++++ 2 files changed, 107 insertions(+), 108 deletions(-) delete mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md create mode 100644 translated/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md b/sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md deleted file mode 100644 index c021158400..0000000000 --- a/sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md +++ /dev/null @@ -1,108 +0,0 @@ -Ping Translating - -Linux FAQs with Answers--How to create and configure a MySQL user from the command line -================================================================================ -> **Question**: I would like to create a new user account on MySQL server, and apply appropriate permissions and resource limits to the account. How can I create and configure a MySQL user from the command line? - -To access a MySQL server, you need to log in to the server using a user account. Each MySQL user account has a number of attributes associated with it, such as user name, password, as well as privileges and resource limits. Privileges are user-specific permissions defining what you can do inside a MySQL server, while resource limits set the limitations on the amount of server resource allowed for for the user. Creating or updating a MySQL user involves managing all these attributes of the user account. - -Here is how to create and configure a MySQL user on Linux. - -You first log in to MySQL server as the root. - - $ mysql -u root -p - -When prompted for authentication, enter the MySQL root password. - -![](https://farm8.staticflickr.com/7482/16024190060_fff53d8840_b.jpg) - -### Create a MySQL User ### - -To create a new user with username 'myuser' and password 'mypassword', use the following command. - - mysql> CREATE USER 'myuser'@'localhost' IDENTIFIED BY 'mypassword'; - -Once a user is created, all its account details including an encrypted password, privileges and resource limits are stored in a table called **user** in a special database named **mysql**. - -To verify that the account is created successfully, run: - - mysql> SELECT host, user, password FROM mysql.user WHERE user='myuser'; - -### Grant Privileges to MySQL User ### - -A newly created MySQL user comes with zero access privilege, which means that you cannot do anything inside MySQL server. You need to grant necessary privileges to the user. Some of available privileges are the following. - -- **ALL**: all privileges available. -- **CREATE**: create databases, tables or indices. -- **LOCK_TABLES**: lock databases. -- **ALTER**: alter tables. -- **DELETE**: delete tables. -- **INSERT**: insert tables or columns. -- **SELECT**: select tables or columns. -- **CREATE_VIEW**: create views. -- **SHOW_DATABASES**: show databases. -- **DROP**: drop daabases, tables or views. - -To grant a particular privilege to user 'myuser', use the following command. - - mysql> GRANT ON . TO 'myuser'@'localhost'; - -In the above, is expressed as a comma-separated list of privileges. If you want to grant privileges for any database (or table), place an asterisk (*) in the database (or table) name. - -For example, to grant CREATE and INSERT privileges for all databases/tables: - - mysql> GRANT CREATE, INSERT ON *.* TO 'myuser'@'localhost'; - -To verify the granted privileges of the user: - - mysql> SHOW GRANTS FOR 'myuser'@'localhost'; - -![](https://farm8.staticflickr.com/7556/16209665261_923282bddd_c.jpg) - -To grant all privileges to all databases/tables: - - mysql> GRANT ALL ON *.* TO 'myuser'@'localhost'; - -You can also remove existing privileges from a user. To revoke existing privileges from the account 'myuser', use the following command. - - mysql> REVOKE ON .
FROM 'myuser'@'localhost'; - -### Add Resource Limits to MySQL User ### - -In MySQL, you can place limits on MySQL resource usage for individual users. The available resource limits are the following. - -- **MAX_QUERIES_PER_HOUR**: number of allowed queries per hour. -- **MAX_UPDATES_PER_HOUR**: number of allowed updates per hour. -- **MAX_CONNECTIONS_PER_HOUR**: number of allowed logins per hour. -- **MAX_USER_CONNECTIONS**: number of simultaneous connections to the server. - -To add a resource limit to the account 'myuser', use the following command. - - mysql> GRANT USAGE ON .
TO 'myuser'@'localhost' WITH ; - -In , you can specify multiple resource limits separated by space. - -For example, to add MAX_QUERIES_PER_HOUR and MAX_CONNECTIONS_PER_HOUR resource limits: - - mysql> GRANT USAGE ON *.* TO 'myuser'@'localhost' WITH MAX_QUERIES_PER_HOUR 30 MAX_CONNECTIONS_PER_HOUR 6; - -To verify the resource limits of the user: - - mysql> SHOW GRANTS FOR 'myuser'@'localhost; - -![](https://farm8.staticflickr.com/7537/16025443759_5cb4177bc6_c.jpg) - -The last important step after creating and configuring a MySQL user is to run: - - mysql> FLUSH PRIVILEGES; - -so that the changes take effect. Now the MySQL user account is good to go! - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/create-configure-mysql-user-command-line.html - -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 \ No newline at end of file diff --git a/translated/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md b/translated/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md new file mode 100644 index 0000000000..9318d87821 --- /dev/null +++ b/translated/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md @@ -0,0 +1,107 @@ +Linux有问必答： 如何通过命令行创建和设置一个MySQL用户 +================================================================================ + +> **问题**：我想要在MySQL服务器上创建一个新的用户帐号，并且赋予他适当的权限和资源限制。如何通过命令行的方式来创建并且设置一个MySQL用户呢？ + +要访问一个MySQL服务器，你需要使用一个用户帐号登录其中方可进行。每个MySQL用户帐号都有许多与之相关连的属性，例如用户名、密码以及权限和资源限制。"权限"定义了特定用户能够在MySQL服务器中做什么，而"资源限制"为用户设置了一系列服务器资源的使用许可。创建或更新一个用户涉及到了对用户帐号所有属性的管理。 + +下面展示了如何在Linux中创建和设置一个MySQL用户。 + +首先以root身份登录到MySQL服务器中。 + + $ mysql -u root -p + +当验证提示出现的时候，输入MySQL的root帐号的密码。 + +![](https://farm8.staticflickr.com/7482/16024190060_fff53d8840_b.jpg) + +### 创建一个MySQL用户 ### + +使用如下命令创建一个用户名和密码分别为"myuser"和"mypassword"的用户。 + + mysql> CREATE USER 'myuser'@'localhost' IDENTIFIED BY 'mypassword'; + +一旦用户被创建后，包括加密的密码、权限和资源限制在内的所有帐号细节都会被存储在一个名为**user**的表中，这个表则存在与**mysql**这个特殊的数据库里。 + +运行下列命令，验证帐号是否创建成功 + + mysql> SELECT host, user, password FROM mysql.user WHERE user='myuser'; + +### 赋予MySQL用户权限 ### + +一个新建的MySQL用户没有任何访问权限，这就意味着你不能在MySQL数据库中进行任何操作。你得赋予用户必要的权限。以下是一些可用的权限： + +- **ALL**: 所有可用的权限 +- **CREATE**: 创建库、表和索引 +- **LOCK_TABLES**: 锁定表. +- **ALTER**: 修改表. +- **DELETE**: 删除表. +- **INSERT**: 插入表或列. +- **SELECT**: 选择表或列. +- **CREATE_VIEW**: 创建视图. +- **SHOW_DATABASES**: 展示数据库. +- **DROP**: 删除库、表和视图. + +运行以下命令赋予"myuser"用户特定权限。 + + mysql> GRANT ON .
TO 'myuser'@'localhost'; + +以上命令中，`` 代表着用逗号分隔的权限列表。如果你想要将权限赋予任意数据库（或表），那么使用星号（*）来代替数据库（或表）的名字。 + +例如，为所有数据库/表赋予 CREATE 和 INSERT 权限： + + mysql> GRANT CREATE, INSERT ON *.* TO 'myuser'@'localhost'; + +验证给用户赋予的全权限： + + mysql> SHOW GRANTS FOR 'myuser'@'localhost'; + +![](https://farm8.staticflickr.com/7556/16209665261_923282bddd_c.jpg) + +将全部的权限赋予所有数据库/表： + + mysql> GRANT ALL ON *.* TO 'myuser'@'localhost'; + +你也可以将用户现有的权限删除。使用以下命令废除"myuser"帐号的现有权限： + + mysql> REVOKE ON .
FROM 'myuser'@'localhost'; + +### 为用户添加资源限制 ### + +在MySQL中，你可以为单独的用户设置MySQL的资源使用限制。可用的资源限制如下： + +- **MAX_QUERIES_PER_HOUR**: 允许的每小时最大请求数量. +- **MAX_UPDATES_PER_HOUR**: 允许的每小时最大更新数量. +- **MAX_CONNECTIONS_PER_HOUR**: 允许的每小时最大连接（译者注：[其与 MySQL全局变量： max_user_connections 共同决定用户到数据库的同时连接数量](http://dev.mysql.com/doc/refman/5.0/en/user-resources.html)）数量. +- **MAX_USER_CONNECTIONS**: 对服务器的同时连接量. + +使用以下命令为"myuser"帐号增加一个资源限制： + + mysql> GRANT USAGE ON .
TO 'myuser'@'localhost' WITH ; + +在 `` 中你可以指定多个使用空格分隔开的资源限制。 + +例如，增加 MAX_QUERIES_PER_HOUR 和 MAX_CONNECTIONS_PER_HOUR 资源限制： + + mysql> GRANT USAGE ON *.* TO 'myuser'@'localhost' WITH MAX_QUERIES_PER_HOUR 30 MAX_CONNECTIONS_PER_HOUR 6; + +验证用户的资源限制： + + mysql> SHOW GRANTS FOR 'myuser'@'localhost; + +![](https://farm8.staticflickr.com/7537/16025443759_5cb4177bc6_c.jpg) + +创建和设置一个MySQL用户最后的一个重要步骤： + + mysql> FLUSH PRIVILEGES; + +如此一来更改便生效了。现在MySQL用户帐号就可以使用了。 + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/create-configure-mysql-user-command-line.html + +译者：[Ping](http://weibo.com/370321376) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 \ No newline at end of file From a8a749726c0afdfc1be3b4c6deafa65791ca2cf4 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 26 Jan 2015 11:31:56 +0800 Subject: [PATCH 034/207] =?UTF-8?q?20150126-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...26 4 lvcreate Command Examples on Linux.md | 120 +++++++++++++ ...ning up Ubuntu 14.10,14.04,13.10 system.md | 163 ++++++++++++++++++ ...Without Rebooting on CentOS 7 or RHEL 7.md | 90 ++++++++++ 3 files changed, 373 insertions(+) create mode 100644 sources/tech/20150126 4 lvcreate Command Examples on Linux.md create mode 100644 sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md create mode 100644 sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md diff --git a/sources/tech/20150126 4 lvcreate Command Examples on Linux.md b/sources/tech/20150126 4 lvcreate Command Examples on Linux.md new file mode 100644 index 0000000000..ae7e177116 --- /dev/null +++ b/sources/tech/20150126 4 lvcreate Command Examples on Linux.md @@ -0,0 +1,120 @@ +4 lvcreate Command Examples on Linux +================================================================================ +Logical volume management (LVM) is a widely-used technique and extremely flexible disk management scheme. It basically contain three basic command : + +a. Creates the physical volumes using **pvcreate** +b. Create the volume group and add partition into volume group using **vgcreate** +c. Create a new logical volume using **lvcreate** + +![](http://www.ehowstuff.com/wp-content/uploads/2015/01/lvm-diagram1.jpg) + +The following examples focus on the command to create a logical volume in an existing volume group, **lvcreate**. **lvcreate** is the command do allocating logical extents from the free physical extent pool of that volume group. Normally logical volumes use up any space available on the underlying physical volumes on a next-free basis. Modifying the logical volume will frees and reallocates space in the physical volumes. The following **lvcreate** command has been tested on linux CentOS 5, CentOS 6, CentOS 7, RHEL 5, RHEl 6 and RHEL 7 version. + +### 4 lvcreate Command Examples on Linux : ### + +1. The following command creates a logical volume 15 gigabytes in size in the volume group vg_newlvm : + + [root@centos7 ~]# lvcreate -L 15G vg_newlvm + +2. The following command creates a 2500 MB linear logical volume named centos7_newvol in the volume group +vg_newlvm, creating the block device /dev/vg_newlvm/centos7_newvol : + + [root@centos7 ~]# lvcreate -L 2500 -n centos7_newvol vg_newlvm + +3. You can use the -l argument of the **lvcreate** command to specify the size of the logical volume in extents. You can also use this argument to specify the percentage of the volume group to use for the logical volume. The following command creates a logical volume called centos7_newvol that uses 50% of the total space in volume group vg_newlvm : + + [root@centos7 ~]# lvcreate -l 50%VG -n centos7_newvol vg_newlvm + +4. The following command creates a logical volume called centos7_newvol that uses all of the unallocated space in the volume group vg_newlvm : + + [root@centos7 ~]# lvcreate --name centos7_newvol -l 100%FREE vg_newlvm + +To see more **lvcreate** command options, issue the following command : + + [root@centos7 ~]# lvcreate --help + +---------- + + lvcreate: Create a logical volume + + lvcreate + [-A|--autobackup {y|n}] + [-a|--activate [a|e|l]{y|n}] + [--addtag Tag] + [--alloc AllocationPolicy] + [--cachemode CacheMode] + [-C|--contiguous {y|n}] + [-d|--debug] + [-h|-?|--help] + [--ignoremonitoring] + [--monitor {y|n}] + [-i|--stripes Stripes [-I|--stripesize StripeSize]] + [-k|--setactivationskip {y|n}] + [-K|--ignoreactivationskip] + {-l|--extents LogicalExtentsNumber[%{VG|PVS|FREE}] | + -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]} + [-M|--persistent {y|n}] [--major major] [--minor minor] + [-m|--mirrors Mirrors [--nosync] [{--mirrorlog {disk|core|mirrored}|--corelog}]] + [-n|--name LogicalVolumeName] + [--noudevsync] + [-p|--permission {r|rw}] + [--[raid]minrecoveryrate Rate] + [--[raid]maxrecoveryrate Rate] + [-r|--readahead ReadAheadSectors|auto|none] + [-R|--regionsize MirrorLogRegionSize] + [-T|--thin [-c|--chunksize ChunkSize] + [--discards {ignore|nopassdown|passdown}] + [--poolmetadatasize MetadataSize[bBsSkKmMgG]]] + [--poolmetadataspare {y|n}] + [--thinpool ThinPoolLogicalVolume{Name|Path}] + [-t|--test] + [--type VolumeType] + [-v|--verbose] + [-W|--wipesignatures {y|n}] + [-Z|--zero {y|n}] + [--version] + VolumeGroupName [PhysicalVolumePath...] + + lvcreate + { {-s|--snapshot} OriginalLogicalVolume[Path] | + [-s|--snapshot] VolumeGroupName[Path] -V|--virtualsize VirtualSize} + {-T|--thin} VolumeGroupName[Path][/PoolLogicalVolume] + -V|--virtualsize VirtualSize} + [-c|--chunksize] + [-A|--autobackup {y|n}] + [--addtag Tag] + [--alloc AllocationPolicy] + [-C|--contiguous {y|n}] + [-d|--debug] + [--discards {ignore|nopassdown|passdown}] + [-h|-?|--help] + [--ignoremonitoring] + [--monitor {y|n}] + [-i|--stripes Stripes [-I|--stripesize StripeSize]] + [-k|--setactivationskip {y|n}] + [-K|--ignoreactivationskip] + {-l|--extents LogicalExtentsNumber[%{VG|FREE|ORIGIN}] | + -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]} + [--poolmetadatasize MetadataVolumeSize[bBsSkKmMgG]] + [-M|--persistent {y|n}] [--major major] [--minor minor] + [-n|--name LogicalVolumeName] + [--noudevsync] + [-p|--permission {r|rw}] + [-r|--readahead ReadAheadSectors|auto|none] + [-t|--test] + [--thinpool ThinPoolLogicalVolume[Path]] + [-v|--verbose] + [--version] + [PhysicalVolumePath...] + +-------------------------------------------------------------------------------- + +via: http://www.ehowstuff.com/4-lvcreate-command-examples-on-linux/ + +作者：[skytech][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.ehowstuff.com/author/mhstar/ \ No newline at end of file diff --git a/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md b/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md new file mode 100644 index 0000000000..d87948bc59 --- /dev/null +++ b/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md @@ -0,0 +1,163 @@ +Cleaning up Ubuntu 14.10,14.04,13.10 system +================================================================================ +We have already discussed [Cleaning up a Ubuntu GNU/Linux system][1] and this tutorial is updated with new ubuntu versions and more tools added. + +If you want to clean your ubuntu machine you need to follow these simple steps to remove all unnecessary junk files. + +### Remove partial packages ### + +This is yet another built-in feature, but this time it is not used in Synaptic Package Manager. It is used in the Terminal. Now, in the Terminal, key in the following command + + sudo apt-get autoclean + +Then enact the package clean command. What this commnad does is to clean remove .deb packages that apt caches when you install/update programs. To use the clean command type the following in a terminal window: + + sudo apt-get clean + +You can then use the autoremove command. What the autoremove command does is to remove packages installed as dependencies after the original package is removed from the system. To use autoremove tye the following in a terminal window: + + sudo apt-get autoremove + +### Remove unnecessary locale data ### + +For this we need to install localepurge.Automagically remove unnecessary locale data.This is just a simple script to recover diskspace wasted for unneeded locale files and localized man pages. It will automagically be invoked upon completion of any apt installation run. + +Install localepurge in Ubuntu + + sudo apt-get install localepurge + +After installing anything with apt-get install, localepurge will remove all translation files and translated man pages in languages you cannot read. + +If you want to configure localepurge you need to edit /etc/locale.nopurge + +This can save you several megabytes of disk space, depending on the packages you have installed. + +Example:- + +I am trying to install dicus using apt-get + +sudo apt-get install discus + +after end of this installation you can see something like below + +localepurge: Disk space freed in /usr/share/locale: 41860K + +### Remove "orphaned" packages ### + +If you want to remove orphaned packages you need to install deborphan package. + +Install deborphan in Ubuntu + + sudo apt-get install deborphan + +### Using deborphan ### + +Open Your terminal and enter the following command + + sudo deborphan | xargs sudo apt-get -y remove --purge + +### Remove "orphaned" packages Using GtkOrphan ### + +GtkOrphan (a Perl/Gtk2 application for debian systems) is a graphical tool which analyzes the status of your installations, looking for orphaned libraries. It implements a GUI front-end for deborphan, adding the package-removal capability. + +### Install GtkOrphan in Ubuntu ### + +Open the terminal and run the following command + + sudo apt-get install gtkorphan + +#### Screenshot #### + +![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/41.png) + +### Remove Orphan packages using Wajig ### + +simplified Debian package management front end.Wajig is a single commandline wrapper around apt, apt-cache, dpkg,/etc/init.d scripts and more, intended to be easy to use and providing extensive documentation for all of its functions. + +With a suitable sudo configuration, most (if not all) package installation as well as creation tasks can be done from a user shell. Wajig is also suitable for general system administration.A Gnome GUI command ‘gjig' is also included in the package. + +### Install Wajig in Ubuntu ### + +Open the terminal and run the following command + + sudo apt-get install wajig + +### Debfoster --- Keep track of what you did install ### + +debfoster maintains a list of installed packages that were explicitly requested rather than installed as a dependency. Arguments are entirely optional, debfoster can be invoked per se after each run of dpkg and/or apt-get. + +Alternatively you can use debfoster to install and remove packages by specifying the packages on the command line. Packages suffixed with a --- are removed while packages without a suffix are installed. + +If a new package is encountered or if debfoster notices that a package that used to be a dependency is now an orphan, it will ask you what to do with it. If you decide to keep it, debfoster will just take note and continue. If you decide that this package is not interesting enough it will be removed as soon as debfoster is done asking questions. If your choices cause other packages to become orphaned more questions will ensue. + +### Install debfoster in Ubuntu ### + +Open the terminal and run the following command + + sudo apt-get install debfoster + +### Using debfoster ### + +to create the initial keepers file use the following command + + sudo debfoster -q + +you can always edit the file /var/lib/debfosterkeepers which defines the packages you want to remain on your system. + +to edit the keepers file type + + sudo vi /var/lib/debfoster/keepers + +To force debfoster to remove all packages that aren't listed in this list or dependencies of packages that are listed in this list.It will also add all packages in this list that aren't installed. So it makes your system comply with this list. Do this + + sudo debfoster -f + +To keep track of what you installed additionally do once in a while : + + sudo debfoster + +### xdiskusage -- Check where the space on your hard drive goes ### + +Displays a graphic of your disk usage with du.xdiskusage is a user-friendly program to show you what is using up all your disk space. It is based on the design of the "xdu" program written by Phillip C. Dykstra. Changes have been made so it runs "du" for you, and can display the free space left on the disk, and produce a PostScript version of the display.xdiskusage is nice if you want to easily see where the space on your hard drive goes. + +### Install xdiskusage in Ubuntu ### + + sudo apt-get install xdiskusage + +If you want to open this application you need to use the following command + + sudo xdiskusage + +![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/5.png) + +Once it opens you should see similar to the following screen + +### Bleachbit ### + +BleachBit quickly frees disk space and tirelessly guards your privacy. Free cache, delete cookies, clear Internet history, shred temporary files, delete logs, and discard junk you didn't know was there. Designed for Linux and Windows systems, it wipes clean a thousand applications including Firefox, Internet Explorer, Adobe Flash, Google Chrome, Opera, Safari,and more. Beyond simply deleting files, BleachBit includes advanced features such as shredding files to prevent recovery, wiping free disk space to hide traces of files deleted by other applications, and vacuuming Firefox to make it faster. Better than free, BleachBit is open source. + +### Install Bleachbit in ubuntu ### + +Open the terminal and run the following command + + sudo apt-get install bleachbit + +![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/6.png) + +### Using Ubuntu-Tweak ### + +You can also Use [Ubuntu-Tweak][2] To clean up your system + +-------------------------------------------------------------------------------- + +via: http://www.ubuntugeek.com/cleaning-up-a-ubuntu-gnulinux-system-updated-with-ubuntu-14-10-and-more-tools-added.html + +作者：[ruchi][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.ubuntugeek.com/author/ubuntufix +[1]:http://www.ubuntugeek.com/cleaning-up-all-unnecessary-junk-files-in-ubuntu.html +[2]:http://www.ubuntugeek.com/www.ubuntugeek.com/install-ubuntu-tweak-on-ubuntu-14-10.html \ No newline at end of file diff --git a/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md b/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md new file mode 100644 index 0000000000..2e6886bddf --- /dev/null +++ b/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md @@ -0,0 +1,90 @@ +How to Add a New Hard Disk Without Rebooting on CentOS 7/ RHEL 7 +================================================================================ +Normally when you have added new storage to a running Virtual machine, you probably won’t see the new storage automatically. This is because the SCSI bus to which the storage devices are connected needs to be rescanned to make the new hardware visible. The is one simple command to rescan the SCSI Bus and add SCSI Devices. The following steps has been tested on CentOS 7 and RHEL 7. + +1. Add the new 20GB from the ESXi or vCenter : + +![](http://www.ehowstuff.com/wp-content/uploads/2015/01/Create-new-LVM-CentOS7-1.png) + +2. Show current disk and partition : + + [root@centos7 ~]# fdisk -l + +---------- + + Disk /dev/sda: 32.2 GB, 32212254720 bytes, 62914560 sectors + Units = sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disk label type: dos + Disk identifier: 0x0006b96a + + Device Boot Start End Blocks Id System + /dev/sda1 * 2048 1026047 512000 83 Linux + /dev/sda2 1026048 62914559 30944256 8e Linux LVM + + Disk /dev/mapper/centos-swap: 2147 MB, 2147483648 bytes, 4194304 sectors + Units = sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + + + Disk /dev/mapper/centos-root: 29.5 GB, 29536288768 bytes, 57688064 sectors + Units = sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + +3. Identify host bus number : + + [root@centos7 ~]# ls /sys/class/scsi_host/ + host0 host1 host2 + +4. Rescan the SCSI Bus to Add a SCSI Devices : + + [root@centos7 ~]# echo "- - -" > /sys/class/scsi_host/host0/scan + [root@centos7 ~]# echo "- - -" > /sys/class/scsi_host/host1/scan + [root@centos7 ~]# echo "- - -" > /sys/class/scsi_host/host2/scan + +5. Verify the disk and partiton and make sure 20GB has been added. In this case, the following line appeared “Disk /dev/sdb: 21.5 GB, 21474836480 bytes, 41943040 sectors” and confirmed that 20GB has been added without reboot the server : + + [root@centos7 ~]# fdisk -l + + Disk /dev/sda: 32.2 GB, 32212254720 bytes, 62914560 sectors + Units = sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disk label type: dos + Disk identifier: 0x0006b96a + + Device Boot Start End Blocks Id System + /dev/sda1 * 2048 1026047 512000 83 Linux + /dev/sda2 1026048 62914559 30944256 8e Linux LVM + + Disk /dev/mapper/centos-swap: 2147 MB, 2147483648 bytes, 4194304 sectors + Units = sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + + + Disk /dev/mapper/centos-root: 29.5 GB, 29536288768 bytes, 57688064 sectors + Units = sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + + + Disk /dev/sdb: 21.5 GB, 21474836480 bytes, 41943040 sectors + Units = sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + +-------------------------------------------------------------------------------- + +via: http://www.ehowstuff.com/how-to-add-a-new-hard-disk-without-rebooting-on-centos-7-rhel-7/ + +作者：[skytech][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.ehowstuff.com/author/mhstar/ \ No newline at end of file From de7ac71f92b4a05335c473f47c901763eccd5d38 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 26 Jan 2015 11:56:20 +0800 Subject: [PATCH 035/207] =?UTF-8?q?20150126-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Processes Of A Specific User With slay.md | 50 +++++ ...Installing Cisco Packet tracer in Linux.md | 197 ++++++++++++++++++ 2 files changed, 247 insertions(+) create mode 100644 sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md create mode 100644 sources/tech/20150126 Installing Cisco Packet tracer in Linux.md diff --git a/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md b/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md new file mode 100644 index 0000000000..ea6695de1f --- /dev/null +++ b/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md @@ -0,0 +1,50 @@ +How To Kill All Processes Of A Specific User With ‘slay’ +================================================================================ +**slay** written by **Chris Ausbrooks** is a command line tool that can be used to kill all running processes of a specific user. slay will be useful to system administrators who finds out certain users are running process they shouldn’t have. + +slay is available in the official repositories of most distros. + +To install + +### Ubuntu and it’s derivatives ### + + sudo apt-get install slay + +### Arch Linux and Its derivatives ### + + sudo pacman -S slay + +### Fedora and its derivatives ### + + sudo yum install slay + +### Usage ### + +You need administrative rights to use slay, + +to kill all processes of a specific user all you need is: + + sudo slay + +For example; if I want to kill all processes of a user named **amitooo** + + ~ sudo slay amitooo + slay: Done. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/slay-amitoo-kpenee.png) + +You should see feedback for slay when done slaying. + +Enjoy. + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/kill-processes-specific-user-slay/ + +作者：[ Enock Seth Nyamador][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/seth/ \ No newline at end of file diff --git a/sources/tech/20150126 Installing Cisco Packet tracer in Linux.md b/sources/tech/20150126 Installing Cisco Packet tracer in Linux.md new file mode 100644 index 0000000000..edac7a7490 --- /dev/null +++ b/sources/tech/20150126 Installing Cisco Packet tracer in Linux.md @@ -0,0 +1,197 @@ +Installing Cisco Packet tracer in Linux +================================================================================ +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Main_picture.png) + +### What is Cisco Packet tracer ? ### + +**Cisco Packet tracer** is a powerful network simulator tool which used to trained while we do some Cisco certifications. It provide us good Interface view for every router’s, and networking devices which with many options same as using the physical machines we can use unlimited devices in a network. We can create multiple network in single project to get trained like a professionals. packet tracer will provide us with simulated application layer protocols such as **HTTP**, **DNS**, Routing with **RIP**, **OSPF**, **EIGRP** etc. + +Now it has been released including **ASA 5505 firewall** with command line configurations. Packet tracer available commonly for Windows, but not for Linux distributions. Here we can download and get install Cisco package tracer. + +#### Newly released version of Cisco packet tracer: #### + +The next Cisco Packet Tracer version will be Cisco Packet Tracer 6.2 currently it’s under development. + +### My Environment Setup: ### + +**Hostname** : desktop1.unixmen.com + +**IP address** : 192.168.0.167 + +**Operating system** : Ubuntu 14.04 LTS Desktop + + # hostname + + # ifconfig | grep inet + + # lsb_release -a + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_001.png) + +### Step 1: First we need to download the Cisco Packet tracer. ### + +To download Packet Tracer from official website we need to have a token, sign into Cisco NetSpace and select CCNA > Cisco Packet Tracer from the Offerings menu to start the download. If we don’t have a token you can get from below link which i have uploaded in Dropbox. + +Official Website: [https://www.netacad.com/][1] + +Many of them don’t have a token to download packet tracer. For that i have uploaded it in dropbox you can get packet tracer from below URL. + +[Download Cisco Packet Tracer 6.1.1][2] + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_002.png) + +### Step 2: Install Java: ### + +To get install packet tracer we need to have install Java, To get install java we can use the default or add the PPA repository and update the package cache to get install java. + +Install the default jre using + + # sudo apt-get install default-jre + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_003.png) + +(or) + +Use the below step to get install Java Run-time and set the Environment. + +Download Java from official website : [Download Java][3] + + # tar -zxvf jre-8u31-linux-x64.tar.gz + + # sudo mkdir -p /usr/lib/jvm + + # sudo mv -v jre1.8.0_31 /usr/lib/jvm/ + + # cd /usr/lib/jvm/ + + # sudo update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jvm/jre1.8.0_31/bin/java" 1 + + # sudo update-alternatives --set "java" "/usr/lib/jvm/jre1.8.0_31/bin/java" + +Set the environment for java by editing the profile file and add the location. While we adding in profile file java will available for every user’s in our machine. + + # sudo vi /etc/profile + +Add the following entries to the bottom of your /etc/profile file: + + export JAVA_HOME=/usr/lib/jvm/jre1.8.0_31 + export PATH=$PATH:/usr/java/jre1.8.0_31/bin + +Run the below command to activate java path immediately. + + # . /etc/profile + +Check for the Java version and Environment: + + # echo $JAVA_HOME + + # java -version + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_004.png) + +### Step 3: Enable 32bit architecture support: ### + +For Packet tracer we need some of 32bit packages. To get install 32bit packages we need to install some of dependencies using below commands. + + # sudo dpkg --add-architecture i386 + # sudo apt-get update + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_005.png) + + # sudo apt-get install libc6:i386 + + # sudo apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0 + + # sudo apt-get install libnss3-1d:i386 libqt4-qt3support:i386 libssl1.0.0:i386 libqtwebkit4:i386 libqt4-scripttools:i386 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_006.png) + +### Step 4: Extract and install the package: ### + +Extract the downloaded package using tar command. + + # mv Cisco\ Packet\ Tracer\ 6.1.1\ Linux.tar.gz\?dl\=0 Cisco_Packet_tracer.tar.gz + + # tar -zxvf Cisco_Packet_tracer.tar.gz + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_007.png) + +Navigate to the extracted directory + + # cd PacketTracer611Student + +Now it’s time to start the installation , Installation is very simple and just take few seconds. + + # sudo ./install + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_008.png) + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_009.png) + +To working with Package tracer we need to set the environment for that Cisco have provided the environment script, We need to run the script using root user to set the environment variable. + + # sudo ./set_ptenv.sh + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_010.png) + +That’s it for installation step’s. next we need to create a Desktop Icon for Packet tracer. + +Create the Desktop Icon by creating desktop file under. + + # sudo su + + # cd /usr/share/applications + + # sudo vim packettracer.desktop + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_011.png) + +Append the Below content to the file using vim editor or your favourite one. + + [Desktop Entry] + Name= Packettracer + Comment=Networking + GenericName=Cisco Packettracer + Exec=/opt/packettracer/packettracer + Icon=/usr/share/icons/packettracer.jpeg + StartupNotify=true + Terminal=false + Type=Application + +Save and quit using wq! + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_012.png) + +### Step 5: Run the packet tracer ### + + # sudo packettracer + +That’s it we have successfully installed the packet tracer in Linux, These above steps are suitable for every debian based Linux distributions. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_013.png) + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/pkt_014.png) + +### Resources ### + +Home page:[Netacad][4] + +### Conclusion: ### + +Here we have seen how to install packet tracer in Linux distribution, Hope you have find a way to get install your favorite Simulator in Linux. + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/installing-cisco-packet-tracer-linux/ + +作者：[babin][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/babin/ +[1]:https://www.netacad.com/ +[2]:https://www.dropbox.com/s/5evz8gyqqvq3o3v/Cisco%20Packet%20Tracer%206.1.1%20Linux.tar.gz?dl=0 +[3]:http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html +[4]:https://www.netacad.com/ \ No newline at end of file From a7e8a8e2bd1b40c1610452fde52d2594d453b8f8 Mon Sep 17 00:00:00 2001 From: KayGuoWhu Date: Mon, 26 Jan 2015 12:05:24 +0800 Subject: [PATCH 036/207] translating by KayGuoWhu --- sources/talk/20150121 If a 32-bit integer overflows.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/talk/20150121 If a 32-bit integer overflows.md b/sources/talk/20150121 If a 32-bit integer overflows.md index bf7c447f25..fc8c375919 100644 --- a/sources/talk/20150121 If a 32-bit integer overflows.md +++ b/sources/talk/20150121 If a 32-bit integer overflows.md @@ -1,3 +1,4 @@ +KayGuoWhu translating If a 32-bit integer overflows, can we use a 40-bit structure instead of a 64-bit long one? --------- From d9b0be7d67f69a5a2e7a9d6da36ff40a7d623ecd Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Mon, 26 Jan 2015 13:06:34 +0800 Subject: [PATCH 037/207] translating --- ...26 How To Kill All Processes Of A Specific User With slay.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md b/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md index ea6695de1f..4a733e3d8f 100644 --- a/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md +++ b/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md @@ -1,3 +1,5 @@ +Translating---geekpi + How To Kill All Processes Of A Specific User With ‘slay’ ================================================================================ **slay** written by **Chris Ausbrooks** is a command line tool that can be used to kill all running processes of a specific user. slay will be useful to system administrators who finds out certain users are running process they shouldn’t have. From c10708718cbda8d46ce64228dfa83534ddcfd632 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Mon, 26 Jan 2015 13:14:48 +0800 Subject: [PATCH 038/207] translated --- ... Processes Of A Specific User With slay.md | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) rename {sources => translated}/tech/20150126 How To Kill All Processes Of A Specific User With slay.md (50%) diff --git a/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md b/translated/tech/20150126 How To Kill All Processes Of A Specific User With slay.md similarity index 50% rename from sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md rename to translated/tech/20150126 How To Kill All Processes Of A Specific User With slay.md index 4a733e3d8f..ce796cbeef 100644 --- a/sources/tech/20150126 How To Kill All Processes Of A Specific User With slay.md +++ b/translated/tech/20150126 How To Kill All Processes Of A Specific User With slay.md @@ -1,43 +1,41 @@ -Translating---geekpi - -How To Kill All Processes Of A Specific User With ‘slay’ +如何用‘slay’杀掉指定用户的所有进程 ================================================================================ -**slay** written by **Chris Ausbrooks** is a command line tool that can be used to kill all running processes of a specific user. slay will be useful to system administrators who finds out certain users are running process they shouldn’t have. +**slay** 是**Chris Ausbrooks**写的一款用于杀掉指定用户所有运行进程的命令行工具。slay对系统管理员而言在找出那些不应该运行进程的用户是很有用的。 -slay is available in the official repositories of most distros. +slay在大多数发行版中都有官方仓库。 -To install +安装 -### Ubuntu and it’s derivatives ### +### Ubuntu 和它的衍生版 ### sudo apt-get install slay -### Arch Linux and Its derivatives ### +### Arch Linux 和它的衍生版 ### sudo pacman -S slay -### Fedora and its derivatives ### +### Fedora 和它的衍生版 ### sudo yum install slay -### Usage ### +### 用法 ### -You need administrative rights to use slay, +你应该有管理员权限来使用slay， -to kill all processes of a specific user all you need is: +要杀掉指定用户的进程，你就要： sudo slay -For example; if I want to kill all processes of a user named **amitooo** +比如：我想杀掉用户**amitooo**的所有进程。 ~ sudo slay amitooo slay: Done. ![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/slay-amitoo-kpenee.png) -You should see feedback for slay when done slaying. +当slay运行完成后，你应该就可以看到反馈了。 -Enjoy. +享受吧。 -------------------------------------------------------------------------------- From fb769c5ba47b287b37b941b829cadcf50d45c1a0 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Mon, 26 Jan 2015 13:17:48 +0800 Subject: [PATCH 039/207] translating --- ...d a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md b/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md index 2e6886bddf..d5c4ea4794 100644 --- a/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md +++ b/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md @@ -1,3 +1,5 @@ +Translating---geekpi + How to Add a New Hard Disk Without Rebooting on CentOS 7/ RHEL 7 ================================================================================ Normally when you have added new storage to a running Virtual machine, you probably won’t see the new storage automatically. This is because the SCSI bus to which the storage devices are connected needs to be rescanned to make the new hardware visible. The is one simple command to rescan the SCSI Bus and add SCSI Devices. The following steps has been tested on CentOS 7 and RHEL 7. From 8c42525e549f8398ae97ad36831f57e37c599deb Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Mon, 26 Jan 2015 13:27:28 +0800 Subject: [PATCH 040/207] translated --- ...l Processes Of A Specific User With slay.md | 2 +- ... Without Rebooting on CentOS 7 or RHEL 7.md | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) rename {sources => translated}/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md (77%) diff --git a/translated/tech/20150126 How To Kill All Processes Of A Specific User With slay.md b/translated/tech/20150126 How To Kill All Processes Of A Specific User With slay.md index ce796cbeef..897c4c16c7 100644 --- a/translated/tech/20150126 How To Kill All Processes Of A Specific User With slay.md +++ b/translated/tech/20150126 How To Kill All Processes Of A Specific User With slay.md @@ -42,7 +42,7 @@ slay在大多数发行版中都有官方仓库。 via: http://www.unixmen.com/kill-processes-specific-user-slay/ 作者：[ Enock Seth Nyamador][a] -译者：[译者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/) 荣誉推出 diff --git a/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md b/translated/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md similarity index 77% rename from sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md rename to translated/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md index d5c4ea4794..104f05e0a7 100644 --- a/sources/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md +++ b/translated/tech/20150126 How to Add a New Hard Disk Without Rebooting on CentOS 7 or RHEL 7.md @@ -1,14 +1,12 @@ -Translating---geekpi - -How to Add a New Hard Disk Without Rebooting on CentOS 7/ RHEL 7 +如何不用重启在CentOS 7/ RHEL 7中添加一块新硬盘 ================================================================================ -Normally when you have added new storage to a running Virtual machine, you probably won’t see the new storage automatically. This is because the SCSI bus to which the storage devices are connected needs to be rescanned to make the new hardware visible. The is one simple command to rescan the SCSI Bus and add SCSI Devices. The following steps has been tested on CentOS 7 and RHEL 7. +通常在你在虚拟机中添加一块新硬盘时，你可能会看到新硬盘没有自动加载。这是因为连接到硬盘的SCSI总线需要重新扫描来使得新硬盘可见。这里有一个简单的命令来重新扫描SCSI总线和SCSI设备。下面这几步在CentOS 7 和RHEL 7 中测试过。 -1. Add the new 20GB from the ESXi or vCenter : +1. 在ESXi或者vCenter中添加一块新的20G硬盘： ![](http://www.ehowstuff.com/wp-content/uploads/2015/01/Create-new-LVM-CentOS7-1.png) -2. Show current disk and partition : +2. 显示当前磁盘分区： [root@centos7 ~]# fdisk -l @@ -36,18 +34,18 @@ Normally when you have added new storage to a running Virtual machine, you proba Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes -3. Identify host bus number : +3. 确定主机总线号 [root@centos7 ~]# ls /sys/class/scsi_host/ host0 host1 host2 -4. Rescan the SCSI Bus to Add a SCSI Devices : +4. 重新扫描SCSI总线来添加设备 [root@centos7 ~]# echo "- - -" > /sys/class/scsi_host/host0/scan [root@centos7 ~]# echo "- - -" > /sys/class/scsi_host/host1/scan [root@centos7 ~]# echo "- - -" > /sys/class/scsi_host/host2/scan -5. Verify the disk and partiton and make sure 20GB has been added. In this case, the following line appeared “Disk /dev/sdb: 21.5 GB, 21474836480 bytes, 41943040 sectors” and confirmed that 20GB has been added without reboot the server : +5. 验证磁盘和分区并确保20GB硬盘已经添加了。在本例中，出现了下面这行 “Disk /dev/sdb: 21.5 GB, 21474836480 bytes, 41943040 sectors” 并且确认新盘添加后没有重启服务器： [root@centos7 ~]# fdisk -l @@ -84,7 +82,7 @@ Normally when you have added new storage to a running Virtual machine, you proba via: http://www.ehowstuff.com/how-to-add-a-new-hard-disk-without-rebooting-on-centos-7-rhel-7/ 作者：[skytech][a] -译者：[译者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/) 荣誉推出 From 30323a0989ae3d4397c0f890f6663769e2a5413e Mon Sep 17 00:00:00 2001 From: Ping Date: Mon, 26 Jan 2015 14:44:36 +0800 Subject: [PATCH 041/207] Translated sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl --- ...How to set a custom HTTP header in curl.md | 46 ------------------- ...How to set a custom HTTP header in curl.md | 44 ++++++++++++++++++ 2 files changed, 44 insertions(+), 46 deletions(-) delete mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md create mode 100644 translated/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md b/sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md deleted file mode 100644 index f52527cd8a..0000000000 --- a/sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md +++ /dev/null @@ -1,46 +0,0 @@ -Ping Translating - -Linux FAQs with Answers--How to set a custom HTTP header in curl -================================================================================ -> **Question**: I am trying to fetch a URL with curl command, but want to set a few custom header fields in the outgoing HTTP request. How can I use a custom HTTP header with curl? - -curl is a powerful command-line tool that can transfer data to and from a server over network. It supports a number of transfer protocols, notably HTTP/HTTPS, and many others such as FTP/FTPS, RTSP, POP3/POP3S, SCP, IMAP/IMAPS, etc. When you send out an HTTP request for a URL with curl, it uses a default HTTP header with only essential header fields (e.g., User-Agent, Host, and Accept). - -![](https://farm8.staticflickr.com/7568/16225032086_fb8f1c508a_b.jpg) - -In some cases, however, you may want to override the default header or even add a custom header field in an HTTP request. For example, you may want to override "Host" field to test a [load balancer][1], or spoof "User-Agent" string to get around browser-specific access restriction. In other cases, you may be accessing a website which requires a specific cookie, or testing a REST-ful API with various custom parameters in the header. - -To handle all these cases, curl provides an easy way to fully control the HTTP header of outgoing HTTP requests. The parameter you want to use is "-H" or equivalently "--header". - -The "-H" option can be specified multiple times with curl command to define more than one HTTP header fields. - -For example, the following command sets three HTTP header fields, i.e., overriding "Host" field, and add two fields ("Accept-Language" and "Cookie"). - - $ curl -H 'Host: 157.166.226.25' -H 'Accept-Language: es' -H 'Cookie: ID=1234' http://cnn.com - -![](https://farm8.staticflickr.com/7520/16250111432_de39638ec0_c.jpg) - -For standard HTTP header fields such as "User-Agent", "Cookie", "Host", there is actually another way to setting them. The curl command offers designated options for setting these header fields: - -- **-A (or --user-agent)**: set "User-Agent" field. -- **-b (or --cookie)**: set "Cookie" field. -- **-e (or --referer)**: set "Referer" field. - -For example, the following two commands are equivalent. Both of them change "User-Agent" string in the HTTP header. - - $ curl -H "User-Agent: my browser" http://cnn.com - $ curl -A "my browser" http://cnn.com - -wget is another command-line tool which you can use to fetch a URL similar to curl, and wget also allows you to use a custom HTTP header. Check out [this post][2] for details on wget command. - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/custom-http-header-curl.html - -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://xmodulo.com/haproxy-http-load-balancer-linux.html -[2]:http://xmodulo.com/how-to-use-custom-http-headers-with-wget.html \ No newline at end of file diff --git a/translated/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md b/translated/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md new file mode 100644 index 0000000000..7c382558eb --- /dev/null +++ b/translated/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md @@ -0,0 +1,44 @@ +Linux有问必答：如何在curl中设置自定义的HTTP头 +================================================================================ +> **问题**：我正尝试使用curl命令获取一个URL，但除此之外我还想在传出的HTTP请求中设置一些自定义的头部字段。我如何能够在curl中使用自定义的HTTP头呢？ + +curl是一个强大的命令行工具，它可以通过网络将信息传递给服务器或者从服务器获取数据。他支持很多的传输协议，尤其是HTTP/HTTPS以及其他诸如FTP/FTPS， RTSP， POP3/POP3S, SCP, IMAP/IMAPS协议等。当你使用curl向一个URL发送HTTP请求的时候，它会使用一个默认只包含必要的头部字段（如：User-Agent, Host, and Accept）的HTTP头。 + +![](https://farm8.staticflickr.com/7568/16225032086_fb8f1c508a_b.jpg) + +在一些个例中，或许你想要在一个HTTP请求中覆盖掉默认的HTTP头或者添加一个新的自定义头部字段。例如，你或许想要重写“HOST”字段来测试一个[负载均衡][1]，或者通过重写"User-Agent"字符串来欺骗特定浏览器以解决其访问限制的问题。 + +为了解决所有这些问题，curl提供了一个简单的方法来完全控制传出HTTP请求的HTTP头。你需要的这个参数是“-H” 或者 “--header”。 + +为了定义多个HTTP头部字段，"-H"选项可以在curl命令中被多次指定。 + +例如：以下命令设置了3个HTTP头部字段。也就是说，重写了“HOST”字段，并且添加了两个字段（"Accept-Language" 和 "Cookie"） + + $ curl -H 'Host: 157.166.226.25' -H 'Accept-Language: es' -H 'Cookie: ID=1234' http://cnn.com + +![](https://farm8.staticflickr.com/7520/16250111432_de39638ec0_c.jpg) + +对于"User-Agent", "Cookie", "Host"这类标准的HTTP头部字段，通常会有另外一种设置方法。curl命令提供了特定的选项来对这些头部字段进行设置： + +- **-A (or --user-agent)**: 设置 "User-Agent" 字段. +- **-b (or --cookie)**: 设置 "Cookie" 字段. +- **-e (or --referer)**: 设置 "Referer" 字段. + +例如，以下两个命令是等效的。这两个命令同样都对HTTP头的"User-Agent"字符串进行了更改。 + + $ curl -H "User-Agent: my browser" http://cnn.com + $ curl -A "my browser" http://cnn.com + +wget是另外一个类似于curl，可以用来获取URL的命令行工具。并且wget也一样允许你使用一个自定义的HTTP头。点击[这里][2]查看wget命令的详细信息。 + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/custom-http-header-curl.html + +译者：[Ping](http://mr-ping.com) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://xmodulo.com/haproxy-http-load-balancer-linux.html +[2]:http://xmodulo.com/how-to-use-custom-http-headers-with-wget.html \ No newline at end of file From fa73025dc787a11b28f5c225df8d2b532221e24a Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 26 Jan 2015 15:24:25 +0800 Subject: [PATCH 042/207] =?UTF-8?q?20150126-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0126 CD Audio Grabbers--Graphical Based.md | 128 ++++++++++++++++++ ...ving your log files to RAM Using Ramlog.md | 112 +++++++++++++++ ...A TCP or UDP Network Monitoring Utility.md | 64 +++++++++ 3 files changed, 304 insertions(+) create mode 100644 sources/share/20150126 CD Audio Grabbers--Graphical Based.md create mode 100644 sources/tech/20150126 Improve system performance by moving your log files to RAM Using Ramlog.md create mode 100644 sources/tech/20150126 iptraf--A TCP or UDP Network Monitoring Utility.md diff --git a/sources/share/20150126 CD Audio Grabbers--Graphical Based.md b/sources/share/20150126 CD Audio Grabbers--Graphical Based.md new file mode 100644 index 0000000000..5dcfa26cca --- /dev/null +++ b/sources/share/20150126 CD Audio Grabbers--Graphical Based.md @@ -0,0 +1,128 @@ +CD Audio Grabbers - Graphical Based +================================================================================ +CD audio grabbers are designed to extract ("rip") the raw digital audio (in a format commonly called CDDA) from a compact disc to a file or other output. This type of software enables a user to encode the digital audio into a variety of formats, and download and upload disc info from freedb, an internet compact disc database. + +Is copying CDs legal? Under US copyright law, converting an original CD to digital files for personal use has been cited as qualifying as 'fair use'. However, US copyright law does not explicitly allow or forbid making copies of a personally-owned audio CD, and case law has not yet established what specific scenarios are permitted as fair use. The copyright position is much clearer in the UK. From 2014 it become legal for UK citizens to make copies of CDs, MP3s, DVD, Blu-rays and e-books. This only applies if the individual owns the physical media being ripped, and the copy is made only for their own private use. For other countries in the European Union, member nations can allow a private copy exception too. + +If you are not sure what the position is for the country you live in, please check your local copyright law to make sure that you are on the right side of the law before using the software featured in this two page article. + +To some extent, it may seem a bit of a chore to rip CDs. Streaming services like Spotify and Google Play Music offer access to a huge library of music in a convenient form, and without having to rip your CD collection. However, if you already have a large CD collection, it is still desirable to be able to convert your CDs to enjoy on mobile devices like smartphones, tablets, and portable MP3 players. + +This two page article highlights my favorite audio CD grabbers. I pick the best four graphical audio grabbers, and the best four console audio grabbers. All of the utilities are released under an open source license. + +---------- + +![](http://www.linuxlinks.com/portal/content2/png/freac.png) + +![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-freac.png) + +fre:ac is an open source audio converter and CD ripper that supports a wide range of popular formats and encoders. The utility currently converts between MP3, MP4/M4A, WMA, Ogg Vorbis, FLAC, AAC, WAV and Bonk formats. It comes with several different presents for the LAME encoder. + +#### Features include: #### + +- Easy to learn and use +- Converter for MP3, MP4/M4A, WMA, Ogg Vorbis, FLAC, AAC, WAV and Bonk formats +- Integrated CD ripper with CDDB/freedb title database support +- Multi-core optimized encoders to speed up conversions on modern PCs +- Full Unicode support for tags and file names +- Easy to learn and use, still offers expert options when you need them +- Joblists +- Can use Winamp 2 input plugins +- Multilingual user interface available in 41 languages + +- Website: [freac.org][1] +- Developer: Robert Kausch +- License: GNU GPL v2 +- Version Number: 20141005 + +---------- + +![](http://www.linuxlinks.com/portal/content2/png/Audex.png) + +![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Audex.png) + +Audex is an easy to use open source audio CD ripping application. Whilst it is in a fairly early stage of development, this KDE desktop tool is stable, slick and simple to use. + +The assistant is able to create profiles for LAME, OGG Vorbis (oggenc), FLAC, FAAC (AAC/MP4) and RIFF WAVE. Beyond the assistant you can define your own profile, which means, that Audex works together with commmand line encoders in general. + +#### Features include: #### + +- Extract with CDDA Paranoia +- Extract and encode run parallel +- Filename editing with local and remote CDDB/FreeDB database +- Submit new entries to CDDB/FreeDB database +- Metadata correction tools like capitalize etc +- Multi-profile extraction (with one commandline-encoder per profile) +- Fetch covers from the internet and store them in the database +- Create playlists, cover and template-based-info files in target directory +- Create extraction and encoding protocols +- Transfer files to a FTP-server +- Internationalization support + +- Website: [kde.maniatek.com/audex][2] +- Developer: Marco Nelles +- License: GNU GPL v3 +- Version Number: 0.79 + +---------- + +![](http://www.linuxlinks.com/portal/content2/png/SoundJuicer.png) + +![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-SoundJuicer.png) + +Sound Juicer is a lean CD ripper using GTK+ and GStreamer. It extracts audio from CDs and converts it into audio files. Sound Juicer can also play audio tracks directly from the CD, offering a preview before ripping. + +It supports any audio codec supported by a GStreamer plugin, including MP3, Ogg Vorbis, FLAC, and uncompressed PCM formats. + +It is an established part of the GNOME desktop environment. + +#### Features include: #### + +- Automatic track tagging via CDDB +- Encoding to ogg / vorbis, FLAC and raw WAV +- Easy to configure encoding path +- Multiple genres +- Internationalization support + +- Website: [burtonini.com][3] +- Developer: Ross Burton +- License: GNU GPL v2 +- Version Number: 3.14 + +---------- + +![](http://www.linuxlinks.com/portal/content2/png/ripperX.png) + +![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-ripperX.png) + +ripperX is an open source graphical interface for ripping CD audio tracks and encoding them to Ogg, MP2, MP3, or FLAC formats. It's goal is to be easy to use, requiring only a few mouse clicks to convert an entire album. It supports CDDB lookups for album and track information. + +It uses cdparanoia to convert (i.e. "rip") CD audio tracks to WAV files, and then calls the Vorbis/Ogg encoder oggenc to convert the WAV to an OGG file. It can also call flac to perform lossless compression on the WAV file, resulting in a FLAC file. + +#### Features include: #### + +- Very simple to use +- Rip audio CD tracks into WAV, MP3, OGG, or FLAC files +- Supports CDDB lookups +- Supports ID3v2 tags +- Pause the ripping process + +- Website: [sourceforge.net/projects/ripperx][4] +- Developer: Marc André Tanner +- License: MIT/X Consortium License +- Version Number: 2.8.0 + +-------------------------------------------------------------------------------- + +via: http://www.linuxlinks.com/article/20150125043738417/AudioGrabbersGraphical.html + +作者：Frazer Kline +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://www.freac.org/ +[2]:http://kde.maniatek.com/audex/ +[3]:http://burtonini.com/blog/computers/sound-juicer +[4]:http://sourceforge.net/projects/ripperx/ \ No newline at end of file diff --git a/sources/tech/20150126 Improve system performance by moving your log files to RAM Using Ramlog.md b/sources/tech/20150126 Improve system performance by moving your log files to RAM Using Ramlog.md new file mode 100644 index 0000000000..db03257941 --- /dev/null +++ b/sources/tech/20150126 Improve system performance by moving your log files to RAM Using Ramlog.md @@ -0,0 +1,112 @@ +Improve system performance by moving your log files to RAM Using Ramlog +================================================================================ +Ramlog act as a system daemon. On startup it creates ramdisk, it copies files from /var/log into ramdisk and mounts ramdisk as /var/log. All logs after that will be updated on ramdisk. Logs on harddrive are kept in folder /var/log.hdd which is updated when ramlog is restarted or stopped. On shutdown it saves log files back to harddisk so logs are consistent. Ramlog 2.x is using tmpfs by default, ramfs and kernel ramdisk are suppored as well. Program rsync is used for log synchronization. + +Note: Logs not saved to harddrive are lost in case of power outage or kernel panic. + +Install ramlog if you have enough of free memory and you want to keep your logs on ramdisk. It is good for notebook users, for systems with UPS or for systems running from flash -- to save some write cycles. + +How it works and what it does: + +1.Ramlog starts among the first daemons (it depends on other daemons you have installed). + +2.Directory /var/log.hdd is created and hardlinked to /var/log. + +3.In case tmpfs (default) or ramfs is used, it is mounted over /var/log + +If kernel ramdisk is used, ramdisk created in /dev/ram9 and it is mounted to /var/log, by default ramlog takes all ramdisk memory specified by kernel argument "ramdisk_size". + +5.All other daemons are started and all logs are updated in ramdisk. Logrotate works on ramdisk as well. + +6.In case ramlog is restarted (by default it is one time per day), directory /var/log.hdd is synchronized with /var/log using rsync. Frequency of the automatic log saves can be controller via cron, by default, the ramlog file is placed into /etc/cron.daily + +7.On shutdown ramlog shuts among the last daemons. + +8. During ramlog stop phase files from /var/log.hdd are synchronized with /var/log +Then /var/log is unmounted, /var/log.hdd is unmounted as well and empty directory /var/log.hdd is deleted. + +**Note:- This article is for advanced users only** + +### Install Ramlog in Ubuntu ### + +First you need to download the .deb package from [here][1] using the following command + + wget http://www.tremende.com/ramlog/download/ramlog_2.0.0_all.deb + +Now you should be having ramlog_2.0.0_all.deb package install this package using the following command + + sudo dpkg -i ramlog_2.0.0_all.deb + +This will complete the installation now you need to run the following commands + + sudo update-rc.d ramlog start 2 2 3 4 5 . stop 99 0 1 6 . + +#Now update sysklogd in init levels, so it is stopped properly before ramlog is stopped: + + sudo update-rc.d -f sysklogd remove + + sudo update-rc.d sysklogd start 10 2 3 4 5 . stop 90 0 1 6 . + +Now you need to restart your system + + sudo reboot + +After rebooting you need to run ‘ramlog getlogsize' to determine the size of your actual /var/log.Add about 40% to that number to ensure your ramdisk has sufficient size -- this will be the ramdisk size + +Edit your boot manager config file such as /etc/grub.conf, /boot/grub/menu.lst or /etc/lilo.conf and add update the actual kernel by adding kernel paramter ‘ramdisk_size=xxx' where xxx is calculated ramdisk size + +### Configuring Ramlog ### + +Ramlog configuration file is located in /etc/default/ramlog on deb based systems and you can set there below variables: + +Variable (with default value): + +Description: + + RAMDISKTYPE=0 + # Values: + # 0 -- tmpfs (can be swapped) -- default + # 1 -- ramfs (no max size in older kernels, + # cannot be swapped, not SELinux friendly) + # 2 -- old kernel ramdisk + TMPFS_RAMFS_SIZE= + #Maximum size of memory to be used by tmpfs or ramfs. + # The value can be percentage of total RAM or size in megabytes -- for example: + # TMPFS_RAMFS_SIZE=40% + # TMPFS_RAMFS_SIZE=100m + # Empty value means default tmpfs/ramfs size which is 50% of total RAM. + # For more options please check ‘man mount', section ‘Mount options for tmpfs' + # (btw -- ramfs supports size limit in newer kernels + # as well despite man says there are no mount options) + # It has only effect if RAMDISKTYPE=0 or 1 + KERNEL_RAMDISK_SIZE=MAX + #Kernel ramdisk size in kilobytes or MAX to use entire ramdisk. + #It has only effect if RAMDISKTYPE=2 + LOGGING=1 + # 0=off, 1=on Logs can be found in /var/log/ramdisk + LOGNAME=ramlog + # name of the ramlog log file (makes sense if LOGGING=1) + VERBOSE=1 + # 0=off, 1=on (if 1, teststartstop puts detials + # to the logs and it is called after start or stop fails) + +### How to uninstall Ubuntu ### + +Open the terminal and run the following command + + sudo dpkg -P ramlog + +Note: If ramlog was running before you uninstalled it, you should reboot your box to finish uninstallation procedure. + +-------------------------------------------------------------------------------- + +via: http://www.ubuntugeek.com/improve-system-performance-by-moving-your-log-files-to-ram-using-ramlog.html + +作者：[ruchi][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.ubuntugeek.com/author/ubuntufix +[1]:http://www.tremende.com/ramlog/download/ramlog_2.0.0_all.deb \ No newline at end of file diff --git a/sources/tech/20150126 iptraf--A TCP or UDP Network Monitoring Utility.md b/sources/tech/20150126 iptraf--A TCP or UDP Network Monitoring Utility.md new file mode 100644 index 0000000000..cc6badecc2 --- /dev/null +++ b/sources/tech/20150126 iptraf--A TCP or UDP Network Monitoring Utility.md @@ -0,0 +1,64 @@ +iptraf: A TCP/UDP Network Monitoring Utility +================================================================================ +[iptraf][1] is an ncurses-based IP LAN monitor that generates various network statistics including TCP info, UDP counts, ICMP and OSPF information, Ethernet load info, node stats, IP checksum errors, and others. + +Its ncurses-based user interface also saves users from remembering command line switches. + +### Features ### + +- An IP traffic monitor that shows information on the IP traffic passing over your network. Includes TCP flag information, packet and byte counts, ICMP details, OSPF packet types. +- General and detailed interface statistics showing IP, TCP, UDP, ICMP, non-IP and other IP packet counts, IP checksum errors, interface activity, packet size counts. +- A TCP and UDP service monitor showing counts of incoming and outgoing packets for common TCP and UDP application ports +- A LAN statistics module that discovers active hosts and shows statistics showing the data activity on them +- TCP, UDP, and other protocol display filters, allowing you to view only traffic you’re interested in. +- Logging +- Supports Ethernet, FDDI, ISDN, SLIP, PPP, and loopback interface types. +- Utilizes the built-in raw socket interface of the Linux kernel, allowing it to be used over a wide range of supported network cards. +- Full-screen, menu-driven operation. + +To install + +### Ubuntu and it’s derivatives ### + + sudo apt-get install iptraf + +### Arch Linux and Its derivatives ### + + sudo pacman -S iptra + +### Fedora and its derivatives ### + + sudo yum install iptraf + +### Usage ### + +If the **iptraf** command is issued without any command-line options, the program comes up in interactive mode, with the various facilities accessed through the main menu. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/iptraf_1.png) + +Menu for easy navigation. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/iptraf_2.png) + +Selecting interfaces to monitor. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/iptraf_3.png) + +Traffic from interface **ppp0** + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/iptraf_4.png) + +Enjoy! + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/iptraf-tcpudp-network-monitoring-utility/ + +作者：[Enock Seth Nyamador][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/seth/ +[1]:http://iptraf.seul.org/about.html \ No newline at end of file From f069f6bca7d4d8057d9d96b4e8c2188b37f70dcb Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Mon, 26 Jan 2015 16:52:38 +0800 Subject: [PATCH 043/207] Translating by ZTinoZ --- ...x Commands Interview Questions & Answers.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md index 2b1fa24d92..7e73344c2d 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -78,29 +78,29 @@ 答: # find /var \! -atime -90 -**问:14 在整个目录树下查找核心文件并Search for core files in the entire directory tree and delete them as found without prompting for confirmation** +**问:14 在整个目录树下查找核心文件，如发现则删除它们且不提示确认信息。** 答: # find / -name core -exec rm {} \; **问:15 strings命令有什么作用？** -答: strings命令用来extract and display the legible contents of a non-text file. +答: strings命令用来提取和显示非文本文件的清晰内容。 -**问:16 What is the use tee filter ?** +**问:16 tee filter有什么作用 ?** -答: The tee filter is used to send an output to more than one destination. It can send one copy of the output to a file and another to the screen (or some other program) if used with pipe. +答: tee filter用来向多个目标发送输出内容。它可以向一个文件发送一份输出的拷贝并且如果使用管道的话可以在屏幕上（或一些其它程序）输出其它内容。 linuxtechi@localhost:~$ ll /etc | nl | tee /tmp/ll.out -In the above example, the output from ll is numbered and captured in /tmp/ll.out file. The output is also displayed on the screen. +在以上例子中，从ll输出的是在 /tmp/ll.out 文件中被捕获的，输出同样在屏幕上显示了出来。 -**问:17 What would the command export PS1 = ”$LOGNAME@`hostname`:\$PWD: do ?** +**问:17 export PS1 = ”$LOGNAME@`hostname`:\$PWD: 这条命令是在做什么？** -答: The export command provided will change the login prompt to display username, hostname, and the current working directory. +答: 这条export命令会更改登录提示符来显示用户名、本机名和当前工作目录。 -**问:18 What would the command ll | awk ‘{print $3,”owns”,$9}’ do ?** +**问:18 ll | awk ‘{print $3,”owns”,$9}’ 这条命令是在做什么？** -答: The ll command provided will display file names and their owners. +答: 这条ll命令会显示这些文件的文件名和它们的拥有者。 **问:19 What is the use of at command in linux ?** From 27e6ee1ab9b7f86e3e39447f3f606d04e73642c7 Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Mon, 26 Jan 2015 20:32:48 +0800 Subject: [PATCH 044/207] =?UTF-8?q?20150126=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...illion Users Stolen from Dating Website.md | 50 +++++++++++++++++++ ...Integrate Linux Kernel 3.19 Branch Soon.md | 33 ++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md create mode 100644 sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md diff --git a/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md b/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md new file mode 100644 index 0000000000..449f159b00 --- /dev/null +++ b/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md @@ -0,0 +1,50 @@ +Data of 20 Million Users Stolen from Dating Website +---------- +*Info includes Gmail, Hotmail and Yahoo emails* + +![Details could belong to users of online dating website Topface](http://i1-news.softpedia-static.com/images/news2/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179-2.jpg) + +#A database containing details of more than 20 million users of an online dating website has been allegedly stolen by a hacker. + +It is unclear at the moment if the information has been dumped into the public domain, but someone using the online alias “Mastermind” claims to have it, according to a post on an undisclosed paste site. + +#List contains hundreds of domains from all over the world + +The individual claims that the details are 100% valid and Daniel Ingevaldson, Chief Technology Officer at Easy Solutions, said in a blog post on Sunday that the list included email addresses from Hotmail, Yahoo and Gmail. + +Easy Solutions is a US-based company that provides security products for detecting and preventing cyber fraud across different computer platforms. + +According to Ingevaldson, the list contains over 7 million credentials from Hotmail, 2.5 million from Yahoo, and 2.2 million from Gmail.com. + +It is unclear if “credentials” refers to usernames and passwords that can be used to access the email accounts or the account of the dating website. Also, it is unknown whether the database stored the passwords in a secure manner or if they were available in plain text. + +An email address is often used as the username for an online service, to which the user can log in with a unique password. However, password recycling is a common practice for many users and the same string could be used to sign in to multiple online accounts. + +“The list appears to be international in nature with hundreds of domains listed from all over the world. Hackers and fraudsters are likely to leverage stolen credentials to commit fraud not on the original hacked site, but to use them to exploit password re-use to automatically scan and compromise other sites including banking, travel and email providers,” [says Ingevaldson](1). + +#More information is expected to emerge + +According to our sources, the affected website is Topface, an online dating location that touts over 90 million users. The business is headquartered in Sankt Petersburg, Russia, and it advertises that more than 50% of its users are from outside Russia. + +We contacted Topface to confirm or deny whether they suffered a breach recently that could have resulted in exposing a database this big; we are yet to receive an answer from the company. + +The credentials could have been stolen without perpetrators needing to gain unauthorized access, as Easy Solutions draws attention to the fact that email phishing may also have been used to get the info straight from the clients of the website. + +Easy Solutions could not be contacted through the online form available on its website, but we tried alternative communication and are currently waiting for more details. + +-------------------------------------------------------------------------------- + +via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179.shtml + +本文发布时间:26 Jan 2015, 10:20 GMT + +作者：[Ionut Ilascu][a] + +译者：[译者ID](https://github.com/译者ID) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/ionut-ilascu +[1]:http://newblog.easysol.net/dating-site-breached/ \ No newline at end of file diff --git a/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md b/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md new file mode 100644 index 0000000000..1fa678a6c1 --- /dev/null +++ b/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md @@ -0,0 +1,33 @@ +Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon +---- +*A new kernel branch is being tracked by Ubuntu* + +![Ubuntu 15.04 shortcuts](http://i1-news.softpedia-static.com/images/news2/Ubuntu-15-04-to-Integrate-Linux-Kernel-3-19-Branch-Soon-471121-2.jpg) + +#The Linux kernel is one of the most important components in a distribution and Ubuntu users are interested to know what will be used in the stable edition for the 15.04 branch, which is scheduled to arrive in a couple of months. + +The Ubuntu and the Linux kernel development cycles are not in sync and it's hard to anticipate what version will eventually land in Ubuntu 15.04. For now, Ubuntu 15.04 (Vivid Vervet) is using Linux kernel 3.18, but the developers are already looking to implement the 3.19 branch. + +"Our Vivid kernel remains based on the v3.18.2 upstream stable kernel, but we'll be rebasing to v3.18.3 shortly. We'll also be re-basing our unstable branch to v3.19-rc5 and get that uploaded to our team PPA soon," [said](1) Canonical's Joseph Salisbury. + +Linux kernel 3.19 is still under development and it will take a few weeks to see a stable version, but it's enough time to implement it in Ubuntu and test it properly. It won't be possible to get the 3.20 branch, for example, even if it launches before the April 23. + +You can [download Ubuntu 15.04](2) right now from Softpedia and give it a spin. It's a daily build and it contains all the improvements made so far to the distribution. + +-------------------------------------------------------------------------------- + +via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179.shtml + +本文发布时间:25 Jan 2015, 20:39 GMT + +作者：[Silviu Stahie][a] + +译者：[译者ID](https://github.com/译者ID) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/silviu-stahie +[1]:https://lists.ubuntu.com/archives/ubuntu-devel/2015-January/038644.html +[2]:http://linux.softpedia.com/get/Linux-Distributions/Ubuntu-Vivid-Vervet-103651.shtml \ No newline at end of file From 08913fe46b0c50b3b1c6f5acbd27ffa58f11e360 Mon Sep 17 00:00:00 2001 From: Medusar <939958749@qq.com> Date: Mon, 26 Jan 2015 21:28:10 +0800 Subject: [PATCH 045/207] translated translated --- ...How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename translated/tech/{How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md => 20150122 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md} (100%) diff --git a/translated/tech/How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md b/translated/tech/20150122 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md similarity index 100% rename from translated/tech/How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md rename to translated/tech/20150122 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md From ebaeee7b0ada477ecb337c4ea9ddcdd6f7124413 Mon Sep 17 00:00:00 2001 From: Medusar <939958749@qq.com> Date: Mon, 26 Jan 2015 21:35:39 +0800 Subject: [PATCH 046/207] apply for tranlasting --- .../tech/20150123 How to make a file immutable on Linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150123 How to make a file immutable on Linux.md b/sources/tech/20150123 How to make a file immutable on Linux.md index 3eb0394bd1..7d46d1de68 100644 --- a/sources/tech/20150123 How to make a file immutable on Linux.md +++ b/sources/tech/20150123 How to make a file immutable on Linux.md @@ -1,3 +1,5 @@ +Translating by Medusar + How to make a file immutable on Linux ================================================================================ Suppose you want to write-protect some important files on Linux, so that they cannot be deleted or tampered with by accident or otherwise. In other cases, you may want to prevent certain configuration files from being overwritten automatically by software. While changing their ownership or permission bits on the files by using chown or chmod is one way to deal with this situation, this is not a perfect solution as it cannot prevent any action done with root privilege. That is when chattr comes in handy. @@ -69,4 +71,4 @@ via: http://xmodulo.com/make-file-immutable-linux.html 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[a]:http://xmodulo.com/author/nanni \ No newline at end of file +[a]:http://xmodulo.com/author/nanni From 35df6c2eb4290be50d2e4e8a54f8bd5860ef3b9d Mon Sep 17 00:00:00 2001 From: Medusar <939958749@qq.com> Date: Mon, 26 Jan 2015 21:56:18 +0800 Subject: [PATCH 047/207] apply for translating --- sources/tech/20150123 How to make a file immutable on Linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/tech/20150123 How to make a file immutable on Linux.md b/sources/tech/20150123 How to make a file immutable on Linux.md index 7d46d1de68..3fd0e4bd01 100644 --- a/sources/tech/20150123 How to make a file immutable on Linux.md +++ b/sources/tech/20150123 How to make a file immutable on Linux.md @@ -1,4 +1,4 @@ -Translating by Medusar +Translating by Medusar How to make a file immutable on Linux ================================================================================ From a40444a97d3551542a7513ef137cad7cad0a26f1 Mon Sep 17 00:00:00 2001 From: Medusar <939958749@qq.com> Date: Mon, 26 Jan 2015 22:25:03 +0800 Subject: [PATCH 048/207] apply for tranlasting --- sources/tech/20150123 How to make a file immutable on Linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/tech/20150123 How to make a file immutable on Linux.md b/sources/tech/20150123 How to make a file immutable on Linux.md index 3fd0e4bd01..7d46d1de68 100644 --- a/sources/tech/20150123 How to make a file immutable on Linux.md +++ b/sources/tech/20150123 How to make a file immutable on Linux.md @@ -1,4 +1,4 @@ -Translating by Medusar +Translating by Medusar How to make a file immutable on Linux ================================================================================ From 0bdc48e49b26136a687d5fc64b5ceaf499eae46f Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 26 Jan 2015 22:46:58 +0800 Subject: [PATCH 049/207] PUB:20141210 How to use Evernote from the command line on Linux.md @geekpi --- ...Evernote from the command line on Linux.md | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) rename {translated/tech => published}/20141210 How to use Evernote from the command line on Linux.md (61%) diff --git a/translated/tech/20141210 How to use Evernote from the command line on Linux.md b/published/20141210 How to use Evernote from the command line on Linux.md similarity index 61% rename from translated/tech/20141210 How to use Evernote from the command line on Linux.md rename to published/20141210 How to use Evernote from the command line on Linux.md index a243e67fc4..e02e9db712 100644 --- a/translated/tech/20141210 How to use Evernote from the command line on Linux.md +++ b/published/20141210 How to use Evernote from the command line on Linux.md @@ -1,10 +1,10 @@ 如何在Linux的命令行中使用Evernote ================================================================================ -这周让我们继续什么学习如个使用Linux命令行管理和组织信息。在命令行中管理[你的个人花费][1]后，我建议你在命令行中管理你的笔记，特别地是，当你笔记放在Evernote中时。为防止你从来没有听说过，[Evernote][2]专门有一个用户有好的在线服务用来在不同的设备间同步笔记。除了提供花哨的基于Web的API，Evernote还发布了在Windows、Mac、[Android][3]和iOS上的客户端。然而至今还没有官方的Linux客户端可用。老实说在众多的非官方Linux程序中，一个程序一出现就吸引了所有的命令行爱好者：[Geeknote][4] +这周让我们继续学习如何使用Linux命令行管理和组织信息。在命令行中管理[你的个人花费][1]后，我建议你在命令行中管理你的笔记，特别是当你用Evernote记录笔记时。要是你从来没有听说过它，[Evernote][2] 专门有一个用户友好的在线服务可以在不同的设备间同步笔记。除了提供花哨的基于Web的API，Evernote还发布了在Windows、Mac、[Android][3]和iOS上的客户端。然而至今还没有官方的Linux客户端可用。老实说在众多的非官方Linux客户端中，有一个程序一出现就吸引了所有的命令行爱好者，它就是[Geeknote][4]。 ### Geeknote 的安装 ### -Geeknote使用Python开发的。因此，在开始之前请确保你已经安装了Python（最好是2.7的版本）和git。 +Geeknote是使用Python开发的。因此，在开始之前请确保你已经安装了Python（最好是2.7的版本）和git。 #### 在 Debian、 Ubuntu 和 Linux Mint 中 #### @@ -26,38 +26,38 @@ Geeknote使用Python开发的。因此，在开始之前请确保你已经安装 ### Geeknote 的基本使用 ### -一旦你安装玩Geeknote后，你应该将Geeknote与你的Evernote账号关联： +一旦你安装完Geeknote后，你应该将Geeknote与你的Evernote账号关联： $ geeknote login -接着输入你的emial地址、密码、和你的二步验证码。如果你没有后者，忽略它并按下回车。 +接着输入你的email地址、密码和你的二步验证码。如果你没有后者的话，忽略它并按下回车。 ![](https://farm8.staticflickr.com/7525/15761947888_7bc71bf216_o.jpg) -很明显，你需要一个Evernote账号来完成这些，因此先去注册。 +显然你需要一个Evernote账号来完成这些，因此先去注册吧。 -一旦完成这一切之后，你就可以开始了，创建新的笔记并编辑它们。 +完成这些之后，你就可以开始创建新的笔记并编辑它们了。 -但是首先，你需要设置你最喜欢的文本编辑器： +不过首先，你还需要设置你最喜欢的文本编辑器： $ geeknote settings --editor vim -接着，常规创建一条新笔记的语法是： +然后，一般创建一条新笔记的语法是： $ geeknote create --title [title of the new note] (--content [content] --tags [comma-separated tags] --notebook [comma-separated notebooks]) -上面的命令中，只有‘title’是必须的，它会与一条新笔记的标题相关联。其他的标注可以为笔记添加额外的元数据：添加标签来与你的笔记关联、指定放在那个笔记本里。同样，如果你的标题或者内容还有空格，不要忘记将它们放在引号中。 +上面的命令中，只有‘title’是必须的，它会与一条新笔记的标题相关联。其他的标注可以为笔记添加额外的元数据：添加标签来与你的笔记关联、指定放在那个笔记本里。同样，如果你的标题或者内容中有空格，不要忘记将它们放在引号中。 比如: $ geeknote create --title "My note" --content "This is a test note" --tags "finance, business, important" --notebook "Family" -通常上，下一步就是编辑你的笔记。语法很相似： +然后，你可以编辑你的笔记。语法很相似： $ geeknote edit --note [title of the note to edit] (--title [new title] --tags [new tags] --notebook [new notebooks]) -注意可选的参数如标题、标签和笔记本，用来修改笔记的元数据。比如，你可以用下面的命令重命名笔记： +注意可选的参数如新的标题、标签和笔记本，用来修改笔记的元数据。你也可以用下面的命令重命名笔记： $ geeknote edit --note [old title] --title [new title] @@ -65,13 +65,13 @@ Geeknote使用Python开发的。因此，在开始之前请确保你已经安装 $ geeknote find --search [text-to-search] --tags [comma-separated tags] --notebook [comma-separated notebooks] --date [date-or-date-range] --content-search -默认上，上面的命令会通过标题搜索笔记。 用"--content-search"选项，就可以搜索它们的内容。 +默认地上面的命令会通过标题搜索笔记。 用"--content-search"选项，就可以按内容搜索。 比如： $ geeknote find --search "*restaurant" --notebooks "Family" --date 31.03.2014-31.08.2014 -显示制定标题的笔记： +显示指定标题的笔记： $ geeknote show [title] @@ -89,13 +89,13 @@ Geeknote使用Python开发的。因此，在开始之前请确保你已经安装 小心这是真正的删除。它会从云存储中删除这条笔记。 -最后有很多的选项来管理标签和笔记本。我想最有用的是显示笔记本列表。 +最后有很多的选项来管理标签和笔记本。我想最有用的就是显示笔记本列表。 $ geeknote notebook-list ![](https://farm8.staticflickr.com/7472/15762063420_43e3ee17da_o.jpg) -下面的非常相像。你可以猜到，可以用下面的命令列出所有的标签： +下面的命令非常相像。你可以猜到，可以用下面的命令列出所有的标签： $ geeknote tag-list @@ -107,27 +107,25 @@ Geeknote使用Python开发的。因此，在开始之前请确保你已经安装 $ geeknote tag-create --title [tag title] -一旦你了解了窍门，很明显语法是非常连贯且明确的。 +一旦你了解了窍门，很明显这些语法是非常自然明确的。 如果你想要了解更多，不要忘记查看[官方文档][6]。 ### 福利 ### -As a bonus, Geeknote comes with the utility gnsync, which allows for file synchronization between your Evernote account and your local computer. However, I find its syntax a bit dry: -福利的是，Geeknote自带的gnsync工具可以让你在Evernote和本地计算机之间同步。然而，我发现它的语法有点枯燥： +作为福利，Geeknote自带的gnsync工具可以让你在Evernote和本地计算机之间同步。不过，我发现它的语法有点枯燥： $ gnsync --path [where to sync] (--mask [what kind of file to sync] --format [in which format] --logpath [where to write the log] --notebook [which notebook to use]) -下面是这些的意义。 - +下面是这些参数的意义。 - **--path /home/adrien/Documents/notes/**: 与Evernote同步笔记的位置。 -- **--mask "*.txt"**: 只同步纯文本文件。默认上，gnsync会尝试同步所有文件。 +- **--mask "*.txt"**: 只同步纯文本文件。默认gnsync会尝试同步所有文件。 - **--format markdown**: 你希望它们是纯文本或者markdown格式（默认是纯文本）。 - **--logpath /home/adrien/gnsync.log**: 同步日志的位置。为防出错，gnsync会在那里写入日志信息。 -- **--notebook "Family"**: 同步哪个笔记本中的笔记。如果你那里留空，程序会创建一个以你同步文件夹命令的笔记本。 +- **--notebook "Family"**: 同步哪个笔记本中的笔记。如果留空，程序会创建一个以你同步文件夹命令的笔记本。 -总结来说，Geeknote是一款花哨的Evernote的命令行客户端。我个人不常使用Evernote，但它仍然很漂亮和有用。命令行一方面让它变得很极客且很容易与shell脚本结合。同样，还有Git上fork出来的Geeknote，在ArchLinux AUR上称为[geeknote-improved-git][7]，貌似它有更多的特性和比其他分支更积极的开发。但在我看来，还很值得再看看。 +总的来说，Geeknote是一款漂亮的Evernote的命令行客户端。我个人不常使用Evernote，但它仍然很漂亮和有用。命令行一方面让它变得很极客且很容易与shell脚本结合。此外，在Git上还有Geeknote的一个分支项目，在ArchLinux AUR上称为[geeknote-improved-git][7]，貌似它有更多的特性和比其他分支更积极的开发。我觉得值得去看看。 你认为Geeknote怎么样？ 有什么你想用的么？或者你更喜欢使用传统的程序？在评论区中让我们知道。 @@ -137,7 +135,7 @@ via: http://xmodulo.com/evernote-command-line-linux.html 作者：[Adrien Brochard][a] 译者：[geekpi](https://github.com/geekpi) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 6f887cd259fa4ba28b9ff91d2649d6d8ac0047fc Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 26 Jan 2015 22:58:11 +0800 Subject: [PATCH 050/207] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @disylee --- ... C or C++ program with Nemiver debugger.md | 111 ------------------ 1 file changed, 111 deletions(-) delete mode 100644 translated/20150104 How to debug a C or C++ program with Nemiver debugger.md diff --git a/translated/20150104 How to debug a C or C++ program with Nemiver debugger.md b/translated/20150104 How to debug a C or C++ program with Nemiver debugger.md deleted file mode 100644 index fb3f313038..0000000000 --- a/translated/20150104 How to debug a C or C++ program with Nemiver debugger.md +++ /dev/null @@ -1,111 +0,0 @@ -hi ! 让我来翻译 - -How to debug a C/C++ program with Nemiver debugger -================================================================================ -If you read [my post on GDB][1], you know how important and useful a debugger I think can be for a C/C++ program. However, if a command line debugger like GDB sounds more like a problem than a solution to you, you might be more interested in Nemiver. [Nemiver][2] is a GTK+-based standalone graphical debugger for C/C++ programs, using GDB as its back-end. Admirable for its speed and stability, Nemiver is a very reliable debugger filled with goodies. - -### Installation of Nemiver ### - -For Debian based distributions, it should be pretty straightforward: - - $ sudo apt-get install nemiver - -For Arch Linux: - - $ sudo pacman -S nemiver - -For Fedora: - - $ sudo yum install nemiver - -If you prefer compiling yourself, the latest sources are available from [GNOME website][3]. - -As a bonus, it integrates very well with the GNOME environment. - -### Basic Usage of Nemiver ### - -Start Nemiver with the command: - - $ nemiver - -You can also summon it with an executable with: - - $ nemiver [path to executable to debug] - -Note that Nemiver will be much more helpful if the executable is compiled in debug mode (the -g flag with GCC). - -A good thing is that Nemiver is really fast to load, so you should instantly see the main screen in the default layout. - -![](https://farm9.staticflickr.com/8679/15535277554_d320f6692c_c.jpg) - -By default, a breakpoint has been placed in the first line of the main function. This gives you the time to recognize the basic debugger functions: - -![](https://farm9.staticflickr.com/8669/16131832596_bc68ae18a8_o.jpg) - -- Next line (mapped to F6) -- Step inside a function (F7) -- Step out of a function (Shift+F7) - -But maybe my personal favorite is the option "Run to cursor" which makes the program run until a precise line under your cursor, and is by default mapped to F11. - -Next, the breakpoints are also easy to use. The quick way to lay a breakpoint at a line is using F8. But Nemiver also has a more complex menu under "Debug" which allows you to set up a breakpoint at a particular function, line number, location of binary file, or even at an event like an exception, a fork, or an exec. - -![](https://farm8.staticflickr.com/7579/16157622315_d680a63896_z.jpg) - -You can also watch a variable by tracking it. In "Debug" you can inspect an expression by giving its name and examining it. It is then possible to add it to the list of controlled variable for easy access. This is probably one of the most useful aspects as I have never been a huge fan of hovering over a variable to get its value. Note that hovering does work though. And to make it even better, Nemiver is capable of watching a struct, and giving you the values of all the member variables. - -![](https://farm8.staticflickr.com/7465/15970310470_7ed020c613.jpg) - -Talking about easy access to information, I also really appreciate the layout of the program. By default, the code is in the upper half and the tabs in the lower part. This grants you access to a terminal for output, a context tracker, a breakpoints list, register addresses, memory map, and variable control. But note that under "Edit" "Preferences" "Layout" you can select different layouts, including a dynamic one for you to modify. - -![](https://farm9.staticflickr.com/8606/15971551549_00e4cdd32e_c.jpg) - -![](https://farm8.staticflickr.com/7525/15535277594_026fef17c1_z.jpg) - -And naturally, once you set up all your breakpoints, watch-points, and layout, you can save your session under “File” for easy retrieval in case you close Nemiver. - -### Advanced Usage of Nemiver ### - -So far, we talked about the basic features of Nemiver, i.e., what you need to get started and debug simple programs immediately. If you have more advanced needs, and especially more complex programs, you might be more interested in some of these features mentioned here. - -#### Debugging a running process #### - -Nemiver allows you to attach to a running process for debugging. Under the "File" menu, you can filter the list of running processes, and connect to a process. - -![](https://farm9.staticflickr.com/8593/16155720571_00e4cdd32e_z.jpg) - -#### Debugging a program remotely over a TCP connection #### - -Nemiver supports remote-debugging, where you set up a lightweight debug server on a remote machine, and launch Nemiver from another machine to debug a remote target hosted by the debug server. Remote debugging can be useful if you cannot run full-fledged Nemiver or GDB on the remote machine for some reason. Under the "File" menu, specify the binary, shared library location, and the address and port. - -![](https://farm8.staticflickr.com/7469/16131832746_c47dee4ef1.jpg) - -#### Using your own GDB binary to debug #### - -In case you compiled Nemiver yourself, you can specify a new location for GDB under "Edit" "Preferences" "Debug". This option can be useful if you want to use a custom version of GDB in Nemiver for some reason. - -#### Follow a child or parent process #### - -Nemiver is capable of following a child or parent process in case your program forks. To enable this feature, go to "Preferences" under "Debugger" tab. - -![](https://farm8.staticflickr.com/7512/16131832716_5724ff434c_z.jpg) - -To conclude, Nemiver is probably my favorite program for debugging without an IDE. It even beats GDB in my opinion, and [command line][4] programs generally have a good grip on me. So if you have never used it, I really recommend it. I can only congratulate the team behind it for giving us such a reliable and stable program. - -What do you think of Nemiver? Would you consider it for standalone debugging? Or do you still stick to an IDE? Let us know in the comments. - --------------------------------------------------------------------------------- - -via: http://xmodulo.com/debug-program-nemiver-debugger.html - -作者：[Adrien Brochard][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://xmodulo.com/author/adrien -[1]:http://xmodulo.com/gdb-command-line-debugger.html -[2]:https://wiki.gnome.org/Apps/Nemiver -[3]:https://download.gnome.org/sources/nemiver/0.9/ -[4]:http://xmodulo.com/recommend/linuxclibook From 5b57f85a743b663d1819318f89b548ee48fc138e Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 26 Jan 2015 23:15:52 +0800 Subject: [PATCH 051/207] PUB:20141204 How To Run Linux Programs From The Terminal In Background Mode @su-kaiyao --- ...ms From The Terminal In Background Mode.md | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) rename {translated/tech => published}/20141204 How To Run Linux Programs From The Terminal In Background Mode.md (57%) diff --git a/translated/tech/20141204 How To Run Linux Programs From The Terminal In Background Mode.md b/published/20141204 How To Run Linux Programs From The Terminal In Background Mode.md similarity index 57% rename from translated/tech/20141204 How To Run Linux Programs From The Terminal In Background Mode.md rename to published/20141204 How To Run Linux Programs From The Terminal In Background Mode.md index a045e9f7fd..b346272331 100644 --- a/translated/tech/20141204 How To Run Linux Programs From The Terminal In Background Mode.md +++ b/published/20141204 How To Run Linux Programs From The Terminal In Background Mode.md @@ -1,29 +1,29 @@ -如何从终端以后台模式运行Linux程序 +如何在终端下以后台模式运行Linux程序 === ![Linux Terminal Window.](http://0.tqn.com/y/linux/1/W/r/G/1/terminal.JPG) -Linux终端窗口。 +*Linux终端窗口* -这是一个简短但是非常有用的教程：它向你展示从终端运行Linux应用程序的同时，如何保证终端仍然在控制之中。 +这是一个简短但是非常有用的教程：它向你展示从终端运行Linux应用程序的同时，如何保证终端仍然可以操作。 -在Linux中有许多方式可以打开一个终端，这主要取决于你分类的选择和桌面环境。 +在Linux中有许多方式可以打开一个终端，这主要取决于你的发行版的选择和桌面环境。 -使用Ubuntu，你可以使用CTRL + ALT + T组合键打开一个终端。你也可以点击超级键(Windows键)打开一个终端窗口。在键盘上，[打开Ubuntu Dash][1]，然后搜索"TERM"。点击"Term"图标将会打开一个终端窗口。 +使用Ubuntu的话，你可以使用CTRL + ALT + T组合键打开一个终端。你也可以点击超级键(Windows键)打开一个终端窗口。在键盘上，[打开Ubuntu Dash][1]，然后搜索"TERM"。点击"Term"图标将会打开一个终端窗口。 -其他诸如XFCE, KDE, LXDE, Cinnamon和MATE的桌面环境，你将会在菜单中发现终端。还有一些分类会把终端图标放在入口处，或者在面板上放置终端启动器。 +其他诸如XFCE, KDE, LXDE, Cinnamon和MATE的桌面环境，你将会在菜单中发现“终端”这个应用。还有一些发行版会把终端图标放在菜单项，或者在面板上放置终端启动器。 -你可以在终端输入一个程序的名字来启动一个应用。举例，你可以通过输入"firefox"启动火狐浏览器。 +你可以在终端里面输入一个程序的名字来启动一个应用。举例，你可以通过输入"firefox"启动火狐浏览器。 -从终端运行程序的好处是一可以包含额外的选项。 +从终端运行程序的好处是可以使用额外的选项。 -举个例子，如果你输入下面的命令，一个新的火狐浏览器将会打开，而且默认的搜索引擎将会搜索引用之间的术语： +举个例子，如果你输入下面的命令，一个新的火狐浏览器将会打开，而且默认的搜索引擎将会搜索引号之间的词语： firefox -search "Linux.About.Com" -你会发现，如果你运行火狐浏览器，应用程序将被打开，并且控制将会回到终端，这将意味着你可以继续在终端工作。 +你会发现，如果你运行火狐浏览器，应用程序打开后，控制权将会回到终端（重新出现了命令提示符），这将意味着你可以继续在终端工作。 -通常情况下，如果你通过终端运行一个程序，程序将被打开，并且直到那个程序关闭结束，你将不会重新获得终端的控制权。这是因为你是在前台打开程序的。 +通常情况下，如果你通过终端运行一个程序，程序打开后，并且直到那个程序关闭结束，你都将不会获得终端的控制权。这是因为你是在前台打开程序的。 想要从终端运行一个程序，并且立即将终端的控制权返回给你，你需要以后台进程的方式打开程序。 @@ -31,11 +31,11 @@ Linux终端窗口。 libreoffice & -在终端中仅仅提供程序的名字，应用程序可能运行不了。如果程序不存在于一个设置了路径变量的文件夹中，你需要指定完成的路径名来运行程序。 +在终端中仅仅提供程序的名字，应用程序可能运行不了。如果程序不存在于一个设置在PATH 环境变量的文件夹中，你需要指定完整的路径名来运行程序。 /path/to/yourprogram & -如果你并不确定一个程序是否存在于Linux文件结构，使用find或者locate命令来查询应用程序。 +如果你并不确定一个程序是否存在于Linux文件系统中，使用find或者locate命令来查找该应用程序。 找一个文件的语法如下： @@ -45,7 +45,7 @@ Linux终端窗口。 find / -name firefox -输出会很快掠过，所以你可以以管道的方式控制输出的多少： +输出会很快滚动出很多，所以你可以以管道的方式控制输出的多少： find / -name firefox | more @@ -57,26 +57,25 @@ find命令将会返回因权限拒绝而发生错误的文件夹数量，这些 sudo find / -name firefox | more -如果你知道你想寻找的文件在你的当前文件夹结构中，你可以一个点代替先前的斜线，如下： +如果你知道你想寻找的文件在你的当前文件夹中，你可以一个点代替先前的斜线，如下： sudo find . -name firefox | more -你可能不需要sudo来提升权限。如果你在home文件夹结构中寻找文件，sudo就不需要。 +你可能不需要sudo来提升权限。如果你在home文件夹中寻找文件，sudo就不需要。 一些应用程序需要提升用户权限来运行，你可能得到一个缺少权限的错误，除非你使用一个具有足够权限的用户，或者使用sudo提升你的权限。 -下面是一个小花招。如果你运行一个程序，而且它需要提升权限来运行，输入下面命令： +下面是一个小花招。如果你运行一个程序，而且它需要提升权限来运行，输入下面命令来提升权限重新执行： sudo !! --- -via: http://linux.about.com/od/commands/fl/How-To-Run-Linux-Programs-From-T -he-Terminal-In-Background-Mode.htm +via: http://linux.about.com/od/commands/fl/How-To-Run-Linux-Programs-From-The-Terminal-In-Background-Mode.htm 作者：[Gary Newell][a] 译者：[su-kaiyao](https://github.com/su-kaiyao) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中> 国](http://linux.cn/) 荣誉推出 From ede062c16382f58bf115f10a0ca08d5b5f263792 Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 26 Jan 2015 23:37:16 +0800 Subject: [PATCH 052/207] PUB:20141205 10 free Commands to Check Memory Usage in Linux @su-kaiyao --- ...Commands to Check Memory Usage in Linux.md | 62 +++++++------------ 1 file changed, 23 insertions(+), 39 deletions(-) rename {translated/tech => published}/20141205 10 free Commands to Check Memory Usage in Linux.md (75%) diff --git a/translated/tech/20141205 10 free Commands to Check Memory Usage in Linux.md b/published/20141205 10 free Commands to Check Memory Usage in Linux.md similarity index 75% rename from translated/tech/20141205 10 free Commands to Check Memory Usage in Linux.md rename to published/20141205 10 free Commands to Check Memory Usage in Linux.md index fe56c55f93..e95227288c 100644 --- a/translated/tech/20141205 10 free Commands to Check Memory Usage in Linux.md +++ b/published/20141205 10 free Commands to Check Memory Usage in Linux.md @@ -1,24 +1,22 @@ -10个检测Linux内存使用情况的‘free’命令 +检测 Linux 内存使用情况的 free 命令的10个例子 === -**Linux**是最有名的开源操作系统之一，它拥有着极其巨大的指令集。确定**物理内存**和**交换内存**所有可用空间的最重要，也是唯一的方法是使用“**free**”命令。 +**Linux**是最有名的开源操作系统之一，它拥有着极其巨大的命令集。确定**物理内存**和**交换内存**所有可用空间的最重要、也是唯一的方法是使用“**free**”命令。 -Linux “**free**”命令通过给出**Linux/Unix**操作系统中内核已使用的**buffers**情况，来提供**物理内存**和**交换内存**的总使用量和可用量。 +Linux “**free**”命令可以给出类**Linux/Unix**操作系统中**物理内存**和**交换内存**的总使用量、可用量及内核使用的**缓冲区**情况。 ![10 Linux Free Command Examples](http://www.tecmint.com/wp-content/uploads/2012/09/Linux-Free-commands.png) -这篇文章提供一些带有参数选项的“**free**”命令，这些命令对于你更好地利用你的内存会有帮助。 +这篇文章提供一些各种参数选项的“**free**”命令，这些命令对于你更好地利用你的内存会有帮助。 ### 1. 显示你的系统内存 ### -free命令用于检测**物理内存**和**交换内存**已使用量和可用量（单位为**KB**）。下面演示命令的使用情况。 +free命令用于检测**物理内存**和**交换内存**已使用量和可用量（默认单位为**KB**）。下面演示命令的使用情况。 # free - total used free shared buffers cach -ed - Mem: 1021628 912548 109080 0 120368 6555 -48 + total used free shared buffers cached + Mem: 1021628 912548 109080 0 120368 655548 -/+ buffers/cache: 136632 884996 Swap: 4194296 0 4194296 @@ -28,21 +26,18 @@ ed # free -b - total used free shared buffers cach -ed - Mem: 1046147072 934420480 111726592 0 123256832 6712811 -52 + total used free shared buffers cached + Mem: 1046147072 934420480 111726592 0 123256832 671281152 -/+ buffers/cache: 139882496 906264576 Swap: 4294959104 0 4294959104 ### 3. 以千字节为单位显示内存 ### -加上**-k**参数的free命令，以(KB)**千字节**为单位显示内存大小。 +加上**-k**参数的free命令（默认单位，所以可以不用使用它），以(KB)**千字节**为单位显示内存大小。 # free -k - total used free shared buffers cach -ed + total used free shared buffers cached Mem: 1021628 912520 109108 0 120368 655548 -/+ buffers/cache: 136604 885024 Swap: 4194296 0 4194296 @@ -53,10 +48,8 @@ ed # free -m - total used free shared buffers cach -ed - Mem: 997 891 106 0 117 6 -40 + total used free shared buffers cached + Mem: 997 891 106 0 117 640 -/+ buffers/cache: 133 864 Swap: 4095 0 4095 @@ -66,8 +59,7 @@ ed # free -g total used free shared buffers cached - Mem: 0 0 0 0 0 - 0 + Mem: 0 0 0 0 0 0 -/+ buffers/cache: 0 0 Swap: 3 0 3 @@ -77,10 +69,8 @@ ed # free -t - total used free shared buffers cache -d - Mem: 1021628 912520 109108 0 120368 6555 -48 + total used free shared buffers cached + Mem: 1021628 912520 109108 0 120368 655548 -/+ buffers/cache: 136604 885024 Swap: 4194296 0 4194296 Total: 5215924 912520 4303404 @@ -91,10 +81,8 @@ d # free -o - total used free shared buffers cache -d - Mem: 1021628 912520 109108 0 120368 6555 -48 + total used free shared buffers cached + Mem: 1021628 912520 109108 0 120368 655548 Swap: 4194296 0 4194296 ### 8. 定期时间间隔更新内存状态 ### @@ -103,10 +91,8 @@ d # free -s 5 - total used free shared buffers cach -ed - Mem: 1021628 912368 109260 0 120368 6555 -48 + total used free shared buffers cached + Mem: 1021628 912368 109260 0 120368 655548 -/+ buffers/cache: 136452 885176 Swap: 4194296 0 4194296 @@ -116,10 +102,8 @@ ed # free -l - total used free shared buffers cach -ed - Mem: 1021628 912368 109260 0 120368 6555 -48 + total used free shared buffers cached + Mem: 1021628 912368 109260 0 120368 655548 Low: 890036 789064 100972 High: 131592 123304 8288 -/+ buffers/cache: 136452 885176 @@ -139,7 +123,7 @@ via: http://www.tecmint.com/check-memory-usage-in-linux/ 作者：[Ravi Saive][a] 译者：[su-kaiyao](https://github.com/su-kaiyao) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中> 国](http://linux.cn/) 荣誉推出 From 42cca97ee1b0475dfe096a54cc7a2fcba88895b5 Mon Sep 17 00:00:00 2001 From: runningwater Date: Mon, 26 Jan 2015 23:52:17 +0800 Subject: [PATCH 053/207] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...gle ISO to 20 USB Drives Simultaneously.md | 60 ------------------- ...gle ISO to 20 USB Drives Simultaneously.md | 59 ++++++++++++++++++ 2 files changed, 59 insertions(+), 60 deletions(-) delete mode 100644 sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md create mode 100644 translated/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md diff --git a/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md b/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md deleted file mode 100644 index 130311ef12..0000000000 --- a/sources/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md +++ /dev/null @@ -1,60 +0,0 @@ -(translating by runningwater ) -This App Can Write a Single ISO to 20 USB Drives Simultaneously -================================================================================ -**If I were to ask you to burn a single Linux ISO to 17 USB thumb drives how would you go about doing it?** - -Code savvy folks would write a little bash script to automate the process, and a large number would use a GUI tool like the USB Startup Disk Creator to burn the ISO to each drive in turn, one by one. But the rest of us would fast conclude that neither method is ideal. - -### Problem > Solution ### - -![GNOME MultiWriter in action](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/gnome-multi-writer.jpg) - -GNOME MultiWriter in action - -Richard Hughes, a GNOME developer, faced a similar dilemma. He wanted to create a number of USB drives pre-loaded with an OS, but wanted a tool simple enough for someone like his dad to use. - -His response was to create a **brand new app** that combines both approaches into one easy to use tool. - -It’s called “[GNOME MultiWriter][1]” and lets you write a single ISO or IMG to multiple USB drives at the same time. - -It nixes the need to customize or create a command line script and relinquishes the need to waste an afternoon performing an identical set of actions on repeat. - -All you need is this app, an ISO, some thumb-drives and lots of empty USB ports. - -### Use Cases and Installing ### - -![The app can be installed on Ubuntu](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/mutli-writer-on-ubuntu.jpg) - -The app can be installed on Ubuntu - -The app has a pretty defined usage scenario, that being situations where USB sticks pre-loaded with an OS or live image are being distributed. - -That being said, it should work just as well for anyone wanting to create a solitary bootable USB stick, too — and since I’ve never once successfully created a bootable image from Ubuntu’s built-in disk creator utility, working alternatives are welcome news to me! - -Hughes, the developer, says it **supports up to 20 USB drives**, each being between 1GB and 32GB in size. - -The drawback (for now) is that GNOME MultiWriter is not a finished, stable product. It works, but at this early blush there are no pre-built binaries to install or a PPA to add to your overstocked software sources. - -If you know your way around the usual configure/make process you can get it up and running in no time. On Ubuntu 14.10 you may also need to install the following packages first: - - sudo apt-get install gnome-common yelp-tools libcanberra-gtk3-dev libudisks2-dev gobject-introspection - -If you get it up and running, give it a whirl and let us know what you think! - -Bugs and pull requests can be longed on the GitHub page for the project, which is where you’ll also found tarball downloads for manual installation. - -- [GNOME MultiWriter on Github][2] - --------------------------------------------------------------------------------- - -via: http://www.omgubuntu.co.uk/2015/01/gnome-multiwriter-iso-usb-utility - -作者：[Joey-Elijah Sneddon][a] -译者：[runningwater](https://github.com/runningwater) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:https://plus.google.com/117485690627814051450/?rel=author -[1]:https://github.com/hughsie/gnome-multi-writer/ -[2]:https://github.com/hughsie/gnome-multi-writer/ diff --git a/translated/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md b/translated/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md new file mode 100644 index 0000000000..098350741f --- /dev/null +++ b/translated/share/20150106 This App Can Write a Single ISO to 20 USB Drives Simultaneously.md @@ -0,0 +1,59 @@ +支持同时把单个 ISO 文件写入 20 个 USB 驱动盘的应用程序 +================================================================================ +**我的问题是如何把一个Linux ISO 文件烧录到 17 个 USB 拇指驱动盘？** + +精通代码的会写一个 bash 脚本来自动化处理，而大部分的人会使用像 USB 启动盘创建器这样的图形用户界面工具来把 ISO 文件一个一个的烧录到驱动盘中。但剩下的还有一些人会很快得出结论，两种方法都不太理想。 + +### 问题 > 解决 ### + +![GNOME MultiWriter in action](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/gnome-multi-writer.jpg) + +GNOME MultiWriter 在运行当中 + +Richard Hughes，一个 GNOME 开发者，也面临着类似的困境。他要创建一批预装操作系统的 USB 驱动盘，需要一个足够简单的工具，使得像他父亲这样的用户也能使用。 + +他的反应是开发**品牌性的新应用程序**，使上面的两种方法合二为一，创造出易用的一款工具。 + +它的名字就叫 “[GNOME MultiWriter][1]”。同时可以把单个的 ISO 或 IMG 文件写入多个 USB 驱动盘。 + +它不支持个性化自定义或命令行执行的功能，使用它就可以省掉浪费一下午的时间来对相同的操作的重复动作。 + +您需要的就是这一款应用程序、一个 ISO 镜像文件、一些拇指驱动盘以用许多空 USB 接口。 + +### 用例和安装 ### + +![The app can be installed on Ubuntu](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/mutli-writer-on-ubuntu.jpg) + +该应用程序可以在 Ubuntu 上安装 + +这款应用程序的定义使用场景很不错，正适合使用于预装正要发布的操作系统或 live 映像的 USB 棒上。 + +那就是说，任何人想要创建一个单独可启动的 USB 棒的话，也是一样的适用 - 因我用 Ubuntu 的内置磁盘创建工具来创建可引导的映像从来没有一次成功过的，所以这方案对我来说是个好消息！ + +它的开发者 Hughes 说它**最高能支持20个 USB驱动盘**，每个盘的大小在 1GB 到 32GB之间。 + +GNOME MultiWriter 不好的地方（到现在为止）就是它还没有一个完结、稳定的成品。它是能工作，但在早期的时候，还没有可安装的二进制版本或可添加到你庞大软件源的 PPA。 + +如果您知道通常的 configure/make 的操作流程的话，可以获取其源码并随时都可以编译运行。在 Ubuntu14.10 系统上，你可能还需要首先安装以下软件包： + + sudo apt-get install gnome-common yelp-tools libcanberra-gtk3-dev libudisks2-dev gobject-introspection + +如果您得到并运行起来，已经玩转的话，给我们分享下您的感受！ + +此项目托管在 GitHub 上，盼望对其提出问题缺陷和发起 pull 请求，在上面也可以找到压缩包下载，进行手动安装。 + +- [Github 上的 GNOME MultiWriter][2] + +-------------------------------------------------------------------------------- + +via: http://www.omgubuntu.co.uk/2015/01/gnome-multiwriter-iso-usb-utility + +作者：[Joey-Elijah Sneddon][a] +译者：[runningwater](https://github.com/runningwater) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:https://plus.google.com/117485690627814051450/?rel=author +[1]:https://github.com/hughsie/gnome-multi-writer/ +[2]:https://github.com/hughsie/gnome-multi-writer/ From 60eb4d92980528450bcaec26cd6e873e0cb52ef7 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Tue, 27 Jan 2015 08:30:00 +0800 Subject: [PATCH 054/207] Update 20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 准备翻译这篇文章。 --- .../20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md b/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md index d87948bc59..2c4ee5b2d6 100644 --- a/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md +++ b/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md @@ -1,3 +1,5 @@ +FSSLC Translating ! + Cleaning up Ubuntu 14.10,14.04,13.10 system ================================================================================ We have already discussed [Cleaning up a Ubuntu GNU/Linux system][1] and this tutorial is updated with new ubuntu versions and more tools added. @@ -160,4 +162,4 @@ via: http://www.ubuntugeek.com/cleaning-up-a-ubuntu-gnulinux-system-updated-with [a]:http://www.ubuntugeek.com/author/ubuntufix [1]:http://www.ubuntugeek.com/cleaning-up-all-unnecessary-junk-files-in-ubuntu.html -[2]:http://www.ubuntugeek.com/www.ubuntugeek.com/install-ubuntu-tweak-on-ubuntu-14-10.html \ No newline at end of file +[2]:http://www.ubuntugeek.com/www.ubuntugeek.com/install-ubuntu-tweak-on-ubuntu-14-10.html From 7b9ed3b38f79b4e94b3acfe35062cc0b908dac94 Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 27 Jan 2015 10:15:20 +0800 Subject: [PATCH 055/207] PUB:20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server @GOLinux --- ...et engine and webserver) on Ubuntu 14.10 Server.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename {translated/tech => published}/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md (93%) diff --git a/translated/tech/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md b/published/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md similarity index 93% rename from translated/tech/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md rename to published/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md index f9d13170de..200f28f0be 100644 --- a/translated/tech/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md +++ b/published/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md @@ -11,9 +11,9 @@ Jetty被广泛用于多种项目和产品，都可以在开发环境和生产环 - 灵活和可扩展 - 小足迹 - 可嵌入 -- 异步 +- 异步支持 - 企业弹性扩展 -- Apache和Eclipse双重许可 +- Apache和Eclipse双重许可证 ### ubuntu 14.10 server上安装Jetty 9 ### @@ -71,10 +71,9 @@ Java将会安装到/usr/lib/jvm/java-8-openjdk-i386，同时在该目录下会 #### ** ERROR: JETTY_HOME not set, you need to set it or install in a standard location #### -你需要确保在/etc/default/jetty文件中设置了正确的Jetty家目录路径， -你可以使用以下URL来测试jetty +你需要确保在/etc/default/jetty文件中设置了正确的Jetty家目录路径，你可以使用以下URL来测试jetty。 -Jetty现在应该运行在8085端口，打开浏览器并访问http://serverip:8085，你应该可以看到Jetty屏幕。 +Jetty现在应该运行在8085端口，打开浏览器并访问http://服务器IP:8085，你应该可以看到Jetty屏幕。 #### Jetty服务检查 #### @@ -96,7 +95,7 @@ via: http://www.ubuntugeek.com/install-jetty-9-java-servlet-engine-and-webserver 作者：[ruchi][a] 译者：[GOLinux](https://github.com/GOLinux) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 2037d825cc4d12cdf10859634c043f416aea96e1 Mon Sep 17 00:00:00 2001 From: shipsw Date: Tue, 27 Jan 2015 13:29:10 +0800 Subject: [PATCH 056/207] Auditd - Tool for Security Auditing on Linux Server Auditd - Tool for Security Auditing on Linux Server --- ...104 Auditd--Tool for Security Auditing on Linux Server.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md b/sources/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md index 9375385927..e5b148a4df 100644 --- a/sources/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md +++ b/sources/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md @@ -1,3 +1,6 @@ +Translating by shipsw + + Auditd - Tool for Security Auditing on Linux Server ================================================================================ First of all , we wish all our readers **Happy & Prosperous New YEAR 2015** from our Linoxide team. So lets start this new year explaining about Auditd tool. @@ -200,4 +203,4 @@ via: http://linoxide.com/how-tos/auditd-tool-security-auditing/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://linoxide.com/author/pungki/ -[1]:http://linoxide.com/tools/wajig-package-management-debian/ \ No newline at end of file +[1]:http://linoxide.com/tools/wajig-package-management-debian/ From 71bd0f676a25dfe7d07e7080276a8633891c0f68 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Tue, 27 Jan 2015 15:37:39 +0800 Subject: [PATCH 057/207] =?UTF-8?q?20150127-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...How to limit network bandwidth on Linux.md | 90 +++++++++++++++++++ ...27 Install Jetty Web Server On CentOS 7.md | 78 ++++++++++++++++ ...ID--A Graphical Wi-Fi Scanner for Linux.md | 61 +++++++++++++ 3 files changed, 229 insertions(+) create mode 100644 sources/tech/20150127 How to limit network bandwidth on Linux.md create mode 100644 sources/tech/20150127 Install Jetty Web Server On CentOS 7.md create mode 100644 sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md diff --git a/sources/tech/20150127 How to limit network bandwidth on Linux.md b/sources/tech/20150127 How to limit network bandwidth on Linux.md new file mode 100644 index 0000000000..1deaa38b49 --- /dev/null +++ b/sources/tech/20150127 How to limit network bandwidth on Linux.md @@ -0,0 +1,90 @@ +How to limit network bandwidth on Linux +================================================================================ +If you often run multiple networking applications on your Linux desktop, or share bandwidth among multiple computers at home, you will want to have a better control over bandwidth usage. Otherwise, when you are downloading a big file with a downloader, your interactive SSH session may become sluggish to the point where it's unusable. Or when you sync a big folder over Dropbox, your roommate may complain that video streaming at her computer gets choppy. + +In this tutorial, I am going to describe two different ways to rate limit network traffic on Linux. + +### Rate Limit an Application on Linux ### + +One way to rate limit network traffic is via a command-line tool called [trickle][1]. The trickle command allows you to shape the traffic of any particular program by "pre-loading" a rate-limited socket library at run-time. A nice thing about trickle is that it runs purely in user-space, meaning you don't need root privilege to restrict the bandwidth usage of a program. To be compatible with trickle, the program must use socket interface with no statically linked library. trickle can be handy when you want to rate limit a program which does not have a built-in bandwidth control functionality. + +To install trickle on Ubuntu, Debian and their derivatives: + + $ sudo apt-get install trickle + +To install trickle on Fedora or CentOS/RHEL (with [EPEL repository][2]): + + $ sudo yum install trickle + +Basic usage of trickle is as follows. Simply put, you prepend trickle (with rate) in front of the command you are trying to run. + + $ trickle -d -u + +This will limit the download and upload rate of to specified values (in KBytes/s). + +For example, set the maximum upload bandwidth of your scp session to 100 KB/s: + + $ trickle -u 100 scp backup.tgz alice@remote_host.com: + +If you want, you can set the maximum download speed (e.g., 300 KB/s) of your Firefox browser by creating a [custom launcher][3] with the following command. + + trickle -d 300 firefox %u + +Finally, trickle can run in a daemon mode, where it can restrict the "aggregate" bandwidth usage of all running programs launched via trickle. To launch trickle as a daemon (i.e., trickled): + + $ sudo trickled -d 1000 + +Once the trickled daemon is running in the background, you can launch other programs via trickle. If you launch one program with trickle, its maximum download rate is 1000 KB/s. If you launch another program with trickle, each of them will be rate limited to 500 KB/s, etc. + +### Rate Limit a Network Interface on Linux ### + +Another way to control your bandwidth resource is to enforce bandwidth limit on a per-interface basis. This is useful when you are sharing your upstream Internet connection with someone else. Like anything else, Linux has a tool for you. [wondershaper][4] exactly does that: rate-limit a network interface. + +wondershaper is in fact a shell script which uses [tc][5] to define traffic shaping and QoS for a specific network interface. Outgoing traffic is shaped by being placed in queues with different priorities, while incoming traffic is rate-limited by packet dropping. + +In fact, the stated goal of wondershaper is much more than just adding bandwidth cap to an interface. wondershaper tries to maintain low latency for interactive sessions such as SSH while bulk download or upload is going on. Also, it makes sure that bulk upload (e.g., Dropbox sync) does not suffocate download, and vice versa. + +To install wondershaper on Ubuntu, Debian and their derivatives: + + $ sudo apt-get install wondershaper + +To install wondershaper on Fedora or CentOS/RHEL (with [EPEL repository][6]): + + $ sudo yum install wondershaper + +Basic usage of wondershaper is as follows. + + $ sudo wondershaper + +For example, to set the maximum download/upload bandwidth for eth0 to 1000Kbit/s and 500Kbit/s, respectively: + + $ sudo wondershaper eth0 1000 500 + +You can remove the rate limit by running: + + $ sudo wondershaper clear eth0 + +If you are interested in how wondershaper works, you can read its shell script (/sbin/wondershaper). + +### Conclusion ### + +In this tutorial, I introduced two different ways to control your bandwidth usages on Linux desktop, on per-application or per-interface basis. Both tools are extremely user-friendly, offering you a quick and easy way to shape otherwise unconstrained traffic. For those of you who want to know more about rate control on Linux, refer to [the Linux bible][7]. + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/limit-network-bandwidth-linux.html + +作者：[Dan Nanni][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/nanni +[1]:http://monkey.org/~marius/trickle +[2]:http://xmodulo.com/how-to-set-up-epel-repository-on-centos.html +[3]:http://xmodulo.com/create-desktop-shortcut-launcher-linux.html +[4]:http://lartc.org/wondershaper/ +[5]:http://lartc.org/manpages/tc.txt +[6]:http://xmodulo.com/how-to-set-up-epel-repository-on-centos.html +[7]:http://www.lartc.org/lartc.html \ No newline at end of file diff --git a/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md b/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md new file mode 100644 index 0000000000..0cfb868498 --- /dev/null +++ b/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md @@ -0,0 +1,78 @@ +Install Jetty Web Server On CentOS 7 +================================================================================ +[Jetty][1] is a pure Java-based HTTP **(Web) server** and Java Servlet container. Jetty is now often used for machine to machine communications, usually within larger software frameworks. But the other Web Servers are usually associated with serving documents to humans. Jetty is developed as a free and open source project as part of the Eclipse Foundation. The web server is used in products such as Apache ActiveMQ, Alfresco, Apache Geronimo, Apache Maven, Apache Spark, Google App Engine, Eclipse, FUSE, Twitter’s Streaming API and Zimbra. + +This article explains ‘How to install jetty web server in your CentOS server’. + +**First of all we have to install java JDK, By the following command:** + + yum -y install java-1.7.0-openjdk wget + +**After the JDK installation, We will download the latest version of Jetty:** + + wget http://download.eclipse.org/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz + +**Extract and move the the downloaded package to /opt:** + + tar zxvf jetty-distribution-9.2.5.v20141112.tar.gz -C /opt/ + +**Rename the file name to jetty:** + + mv /opt/jetty-distribution-9.2.5.v20141112/ /opt/jetty + +**Create a user called jetty:** + + useradd -m jetty + +**Change the ownership of jetty:** + + chown -R jetty:jetty /opt/jetty/ + +**Make a Symlink jetty.sh to /etc/init.d directory to create a start up script file:** + + ln -s /opt/jetty/bin/jetty.sh /etc/init.d/jetty + +**Add script:** + + chkconfig --add jetty + +**Make the jetty web server auto starts on system boot:** + + chkconfig --level 345 jetty on + +**Open /etc/default/jetty in your favorite editor and replace port and listening address desired value:** + + vi /etc/default/jetty + +---------- + + JETTY_HOME=/opt/jetty + JETTY_USER=jetty + JETTY_PORT=8080 + JETTY_HOST=50.116.24.78 + JETTY_LOGS=/opt/jetty/logs/ + +**We finished the installation, Now you have to start the jetty service.** + + service jetty start + +All done! + +Now you can access jetty web sever in **http://:8080** + +That’s it! + +Cheers!! + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/install-jetty-web-server-centos-7/ + +作者：[Jijo][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/jijo/ +[1]:http://eclipse.org/jetty/ \ No newline at end of file diff --git a/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md b/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md new file mode 100644 index 0000000000..2a004ed174 --- /dev/null +++ b/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md @@ -0,0 +1,61 @@ +LinSSID – A Graphical Wi-Fi Scanner for Linux +================================================================================ +### Introduction ### + +As you may know, **LinSSID** is a simple graphical software that can be used to find the wireless networks available.It is completely open source, written in C++ using Linux wireless tools, Qt5, and Qwt 6.1., and is similar to **Inssider** (MS Windows) in terms of look and functionality. + +### Installation ### + +You can install it either using source, or using a PPA if you use DEB based systems such as Ubuntu, and LinuxMint etc. + +You can download and install LinSSID using source packages from [this link][1]. + +Here, we will install and test this software on Ubuntu 14.04 LTS using PPA. + +Add the LinSSID PPA, and install it by typing. + + sudo add-apt-repository ppa:wseverin/ppa + sudo apt-get update + sudo apt-get install linssid + +### Usage ### + +Once you installed, launch it either from menu or unity. + +You”ll be asked to enter the administrative user password of your system. + +![Password required for iwlist scan_001](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Password-required-for-iwlist-scan_001.png) + +This is how LinSSID interface looks. + +![LinSSID_002](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/LinSSID_002.png) + +Now, select the network interface you used to connect to the Wireless networks, for example wlan0 in my case. Click the Play button to search the list of available wi-fi networks. + +After a new seconds, LinSSID will display the wi-fi networks. + +![LinSSID_003](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/LinSSID_003.png) + +As you see in the above screenshot, LinSSID displays the details of SSID names, MAC Id, Channel, Privacy, Cipher, Signal, and Protocol etc. Ofcourse, you can make LinSSID to display more options such as Security, bandwidth details etc. To do that, go to **View** menu, and select the desired option. Also, it displays the graphs of signal strength by channel and over time. Additionally, It works both on 2.4Ghz, and 5Ghz channels. + +That’s it. Hope this tool will useful for you. + +Cheers!! + +Reference Links: + +- [LinSSID Homepage][2] + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/linssid-graphical-wi-fi-scanner-linux/ + +作者：[SK][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/sk/ +[1]:http://sourceforge.net/projects/linssid/files/ +[2]:http://sourceforge.net/projects/linssid/ \ No newline at end of file From 0da40258cd79b4928f2016f4eb08c274e8944627 Mon Sep 17 00:00:00 2001 From: tinyeyeser Date: Tue, 27 Jan 2015 16:20:59 +0800 Subject: [PATCH 058/207] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=B8=AD=20by?= =?UTF-8?q?=E5=B0=8F=E7=9C=BC=E5=84=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...126 Data of 20 Million Users Stolen from Dating Website.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md b/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md index 449f159b00..2a1dea8478 100644 --- a/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md +++ b/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md @@ -1,3 +1,5 @@ +翻译中 by小眼儿 + Data of 20 Million Users Stolen from Dating Website ---------- *Info includes Gmail, Hotmail and Yahoo emails* @@ -47,4 +49,4 @@ via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-W 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://news.softpedia.com/editors/browse/ionut-ilascu -[1]:http://newblog.easysol.net/dating-site-breached/ \ No newline at end of file +[1]:http://newblog.easysol.net/dating-site-breached/ From 4afd140f709a9e6a4430b5fdb00aa71351704b64 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Tue, 27 Jan 2015 16:28:04 +0800 Subject: [PATCH 059/207] =?UTF-8?q?20150127-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../talk/20150127 Windows 10 versus Linux.md | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 sources/talk/20150127 Windows 10 versus Linux.md diff --git a/sources/talk/20150127 Windows 10 versus Linux.md b/sources/talk/20150127 Windows 10 versus Linux.md new file mode 100644 index 0000000000..e2cdfc14c1 --- /dev/null +++ b/sources/talk/20150127 Windows 10 versus Linux.md @@ -0,0 +1,31 @@ +Windows 10 versus Linux +================================================================================ +![](https://farm4.staticflickr.com/3852/14863156322_e4edbae70e_t.jpg) + +Windows 10 seemed to dominate the headlines today, even in many Linux circles. Leading the pack is Brian Fagioli at betanews.com saying Windows 10 is ringing the death knell for Linux desktops. Microsoft announced today that Windows 10 will be free for loyal Windows users and Steven J. Vaughan-Nichols said it's the newest Open Source company. Then Matt Hartley compares Windows 10 to Ubuntu and Jesse Smith reviews Windows 10 from a Linux user's perspective. + +**Windows 10** was the talk around water coolers today with Microsoft's [announcement][1] that it would be free for Windows 7 and up users. Here in Linuxland, that didn't go unnoticed. Brian Fagioli at betanews.com, a self-proclaimed Linux fan, said today, "Windows 10 closes the door entirely. The year of the Linux desktop will never happen. Rest in peace." [Fagioli explained][2] that Microsoft listened to user complaints and not only addressed them but improved way beyond that. He said Linux missed the boat by failing to capitalize on the Windows 8 unpopularity and ultimate failure. Then he concluded that we on the fringe must accept our "shattered dreams" thanks to Windows 10. + +**H**owever, Jesse Smith, of Distrowatch.com fame, said Microsoft isn't making it easy to find the download, but it is possible and he did it. The installer was simple enough except for the partitioner, which was quite limited and almost scary. After finally getting into Windows 10, Smith said the layout was "sparce" without a lot of the distractions folks hated about 7. The menu is back and the start screen is gone. A new package manager looks a lot like Ubuntu's and Android's according to Smith, but requires an online Microsoft account to use. [Smith concludes][3] in part, "Windows 10 feels like a beta for an early version of Android, a consumer operating system that is designed to be on-line all the time. It does not feel like an operating system I would use to get work done." + +**S**mith's [full article][4] compares Windows 10 to Linux quite a bit, but Matt Hartley today posted an actual Windows 10 vs Linux report. [He said][5] both installers were straightforward and easy Windows still doesn't dual boot easily and Windows provides encryption by default but Ubuntu offers it as an option. At the desktop Hartley said Windows 10 "is struggling to let go of its Windows 8 roots." He thought the Windows Store looks more polished than Ubuntu's but didn't really like the "tile everything" approach to newly installed apps. In conclusion, Hartley said, "The first issue is that it's going to be a free upgrade for a lot of Windows users. This means the barrier to entry and upgrade is largely removed. Second, it seems this time Microsoft has really buckled down on listening to what their users want." + +**S**teven J. Vaughan-Nichols today said that Microsoft is the newest Open Source company; not because it's going to be releasing Windows 10 as a free upgrade but because Microsoft is changing itself from a software company to a software as a service company. And, according to Vaughan-Nichols, Microsoft needs Open Source to do it. They've been working on it for years beginning with Novell/SUSE. Not only that, they've been releasing software as Open Source as well (whatever the motives). [Vaughan-Nichols concluded][6], "Most people won't see it, but Microsoft -- yes Microsoft -- has become an open-source company." + +-------------------------------------------------------------------------------- + +via: http://ostatic.com/blog/windows-10-versus-linux + +作者：[Susan Linton][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://ostatic.com/member/susan-linton +[1]:https://news.google.com/news/section?q=microsoft+windows+10+free&ie=UTF-8&oe=UTF-8 +[2]:http://betanews.com/2015/01/25/windows-10-is-the-final-nail-in-the-coffin-for-the-linux-desktop/ +[3]:http://blowingupbits.com/2015/01/an-outsiders-perspective-on-windows-10-preview/ +[4]:http://blowingupbits.com/2015/01/an-outsiders-perspective-on-windows-10-preview/ +[5]:http://www.datamation.com/open-source/windows-vs-linux-the-2015-version-1.html +[6]:http://www.zdnet.com/article/microsoft-the-open-source-company/ \ No newline at end of file From 00c9b5043f4935e6f9516c50fbc0325c15acc711 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Tue, 27 Jan 2015 16:48:43 +0800 Subject: [PATCH 060/207] =?UTF-8?q?20150127-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Tricks to Secure and Customize Websites.md | 422 ++++++++++++++++++ 1 file changed, 422 insertions(+) create mode 100644 sources/tech/20150127 25 Useful Apache '.htaccess' Tricks to Secure and Customize Websites.md diff --git a/sources/tech/20150127 25 Useful Apache '.htaccess' Tricks to Secure and Customize Websites.md b/sources/tech/20150127 25 Useful Apache '.htaccess' Tricks to Secure and Customize Websites.md new file mode 100644 index 0000000000..e9e8ecb4eb --- /dev/null +++ b/sources/tech/20150127 25 Useful Apache '.htaccess' Tricks to Secure and Customize Websites.md @@ -0,0 +1,422 @@ +25 Useful Apache ‘.htaccess’ Tricks to Secure and Customize Websites +================================================================================ +Websites are important parts of our lives. They serve the means to expand businesses, share knowledge and lots more. Earlier restricted to providing only static contents, with introduction of dynamic client and server side scripting languages and continued advancement of existing static language like html to html5, adding every bit of dynamicity is possible to the websites and what left is expected to follow soon in near future. + +With websites, comes the need of a unit that can display these websites to a huge set of audience all over the globe. This need is fulfilled by the servers that provide means to host a website. This includes a list of servers like: Apache HTTP Server, Joomla, and WordPress that allow one to host their websites. + +![Apache htaccess Tricks](http://www.tecmint.com/wp-content/uploads/2015/01/htaccess-tricks.jpg) +25 htaccess Tricks + +One who wants to host a website can create a local server of his own or can contact any of above mentioned or any another server administrator to host his website. But the actual issue starts from this point. Performance of a website depends mainly on following factors: + +- Bandwidth consumed by the website. +- How secure is the website against hackers. +- Optimism when it comes to data search through the database +- User-friendliness when it comes to displaying navigation menus and providing more UI features. + +Alongside this, various factors that govern success of servers in hosting websites are: + +- Amount of data compression achieved for a particular website. +- Ability to simultaneously serve multiple clients asking for a same or different website. +- Securing the confidential data entered on the websites like: emails, credit card details and so on. +- Allowing more and more options to enhance dynamicity to a website. + +This article deals with one such feature provided by the servers that help enhance performance of websites along with securing them from bad bots, hotlinks etc. i.e. ‘.htaccess‘ file. + +### What is .htaccess? ### + +htaccess (or hypertext access) are the files that provide options for website owners to control the server environment variables and other parameters to enhance functionality of their websites. These files can reside in any and every directory in the directory tree of the website and provide features to the directory and the files and folders inside it. + +What are these features? Well these are the server directives i.e. the lines that instruct server to perform a specific task, and these directives apply only to the files and folders inside the folder in which this file is placed. These files are hidden by default as all Operating System and the web servers are configured to ignore them by default but making the hidden files visible can make you see this very special file. What type of parameters can be controlled is the topic of discussion of subsequent sections. + +Note: If .htaccess file is placed in /apache/home/www/Gunjit/ directory then it will provide directives for all the files and folders in that directory, but if this directory contains another folder namely: /Gunjit/images/ which again has another .htaccess file then the directives in this folder will override those provided by the master .htaccess file (or file in the folder up in hierarchy). + +### Apache Server and .htaccess files ### + +Apache HTTP Server colloquially called Apache was named after a Native American Tribe Apache to respect its superior skills in warfare strategy. Build on C/C++ and XML it is cross-platform web server which is based on NCSA HTTPd server and has a key role in growth and advancement of World Wide Web. + +Most commonly used on UNIX, Apache is available for wide variety of platforms including FreeBSD, Linux, Windows, Mac OS, Novel Netware etc. In 2009, Apache became the first server to serve more than 100 million websites. + +Apache server has one .htaccess file per user in www/ directory. Although these files are hidden but can be made visible if required. In www/ directory there are a number of folders each pertaining to a website named on user’s or owner’s name. Apart from this you can have one .htaccess file in each folder which configured files in that folder as stated above. + +How to configure htaccess file on Apache server is as follows… + +### Configuration on Apache Server ### + +There can be two cases: + +#### Hosting website on own server #### + +In this case, if .htaccess files are not enabled, you can enable .htaccess files by simply going to httpd.conf (Default configuration file for Apache HTTP Daemon) and finding the section. + + + +And locate the line that says… + + AllowOverride None + +And correct it to. + + AllowOverride All + +Now, on restarting Apache, .htaccess will work. + +#### Hosting website on different hosting provider server #### + +In this case it is better to consult the hosting admin, if they allow access to .htaccess files. + +### 25 ‘.htaccess’ Tricks of Apache Web Server for Websites ### + +#### 1. How to enable mod_rewrite in .htaccess file #### + +mod_rewrite option allows you to use redirections and hiding your true URL with redirecting to some other URL. This option can prove very useful allowing you to replace the lengthy and long URL’s to short and easy to remember ones. + +To allow mod_rewrite just have a practice to add the following line as the first line of your .htaccess file. + + Options +FollowSymLinks + +This option allows you to follow symbolic links and thus enable the mod_rewrite option on the website. Replacing the URL with short and crispy one is presented later on. + +#### 2. How to Allow or Deny Access to Websites #### + +htaccess file can allow or deny access of website or a folder or files in the directory in which it is placed by using order, allow and deny keywords. + +**Allowing access to only 192.168.3.1 IP** + + Order Allow, Deny + Deny from All + Allow from 192.168.3.1 + + OR + + Order Allow, Deny + Allow from 192.168.3.1 + +Order keyword here specifies the order in which allow, deny access would be processed. For the above ‘Order’ statement, the Allow statements would be processed first and then the deny statements would be processed. + +**Denying access to only one IP Address** + +The below lines provide the means to allow access of the website to all the users accept one with IP Address: 192.168.3.1. + + rder Allow, Deny + Deny from 192.168.3.1 + Allow from All + + OR + + + Order Deny, Allow + Deny from 192.168.3.1 + +#### 3. Generate Apache Error documents for different error codes. #### + +Using some simple lines, we can fix the error document that run on different error codes generated by the server when user/client requests a page not available on the website like most of us would have seen the ‘404 Page not found’ page in their web browser. ‘.htaccess’ files specify what action to take in case of such error conditions. + +To do this, the following lines are needed to be added to the ‘.htaccess’ files: + + ErrorDocument + +‘ErrorDocument’ is a keyword, error-code can be any of 401, 403, 404, 500 or any valid error representing code and lastly, ‘path-of-document’ represents the path on the local machine (in case you are using your own local server) or on the server (in case you are using any other’s server to host your website). + +**Example:** + + ErrorDocument 404 /error-docs/error-404.html + +The above line sets the document ‘error-404.html’ placed in error-docs folder to be displayed in case the 404 error is reported by the server for any invalid request for a page by the client. + +rrorDocument 404 "404 Page not found

The page you request is not present. Check the URL you have typed

" + +The above representation is also correct which places the string representing a usual html file. + +#### 4. Setting/Unsetting Apache server environment variables #### + +In .htaccess file you can set or unset the global environment variables that server allow to be modified by the hosters of the websites. For setting or unsetting the environment variables you need to add the following lines to your .htaccess files. + +**Setting the Environment variables** + + SetEnv OWNER “Gunjit Khera” + +Unsetting the Environment variables + + UnsetEnv OWNER + +#### 5. Defining different MIME types for files #### + +MIME (Multipurpose Internet Multimedia Extensions) are the types that are recognized by the browser by default when running any web page. You can define MIME types for your website in .htaccess files, so that different types of files as defined by you can be recognized and run by the server. + + + AddType application/javascript js + AddType application/x-font-ttf ttf ttc + + +Here, mod_mime.c is the module for controlling definitions of different MIME types and if you have this module installed on your system then you can use this module to define different MIME types for different extensions used in your website so that server can understand them. + +#### 6. How to Limit the size of Uploads and Downloads in Apache #### + +.htaccess files allow you the feature to control the amount of data being uploaded or downloaded by a particular client from your website. For this you just need to append the following lines to your .htaccess file: + + php_value upload_max_filesize 20M + php_value post_max_size 20M + php_value max_execution_time 200 + php_value max_input_time 200 + +The above lines set maximum upload size, maximum size of data being posted, maximum execution time i.e. the maximum time the a user is allowed to execute a website on his local machine, maximum time constrain within on the input time. + +#### 7. Making Users to download .mp3 and other files before playing on your website. #### + +Mostly, people play songs on websites before downloading them to check the song quality etc. Being a smart seller you can add a feature that can come in very handy for you which will not let any user play songs or videos online and users have to download them for playing. This is very useful as online playing of songs and videos consumes a lot of bandwidth. + +Following lines are needed to be added to be added to your .htaccess file: + + AddType application/octet-stream .mp3 .zip + +#### 8. Setting Directory Index for Website #### + +Most of website developers would already know that the first page that is displayed i.e. the home page of a website is named as ‘index.html’ .Many of us would have seen this also. But how is this set? + +.htaccess file provides a way to list a set of pages which would be scanned in order when a client requests to visit home page of the website and accordingly any one of the listed set of pages if found would be listed as the home page of the website and displayed to the user. + +Following line is needed to be added to produce the desired effect. + + DirectoryIndex index.html index.php yourpage.php + +The above line specifies that if any request for visiting the home page comes by any visitor then the above listed pages will be searched in order in the directory firstly: index.html which if found will be displayed as the sites home page, otherwise list will proceed to the next page i.e. index.php and so on till the last page you have entered in the list. + +#### 9. How to enable GZip compression for Files to save site’s bandwidth. #### + +This is a common observation that heavy sites generally run bit slowly than light weight sites that take less amount of space. This is just because for a heavy site it takes time to load the huge script files and images before displaying them on the client’s web browser. + +This is a common mechanism that when a browser requests a web page, server provides the browser with that webpage and now to locally display that web page, the browser has to download that page and then run the script inside that page. + +What GZip compression does here is saving the time required to serve a single customer thus increasing the bandwidth. The source files of the website on the server are kept in compressed form and when the request comes from a user then these files are transferred in compressed form which are then uncompressed and executed on the server. This improves the bandwidth constrain. + +Following lines can allow you to compress the source files of your website but this requires mod_deflate.c module to be installed on your server. + + + AddOutputFilterByType DEFLATE text/plain + AddOutputFilterByType DEFLATE text/html + AddOutputFilterByType DEFLATE text/xml + AddOutputFilterByType DEFLATE application/html + AddOutputFilterByType DEFLATE application/javascript + AddOutputFilterByType DEFLATE application/x-javascript + + +#### 10. Playing with the File types. #### + +There are certain conditions that the server assumes by default. Like: .php files are run on the server, similarly .txt files say for example are meant to be displayed. Like this we can make some executable cgi-scripts or files to be simply displayed as the source code on our website instead of being executed. + +To do this observe the following lines from a .htaccess file. + + RemoveHandler cgi-script .php .pl .py + AddType text/plain .php .pl .py + +These lines tell the server that .pl (perl script), .php (PHP file) and .py (Python file) are meant to just be displayed and not executed as cgi-scripts. + +#### 11. Setting the Time Zone for Apache server #### + +The power and importance of .htaccess files can be seen by the fact that this can be used to set the Time Zone of the server accordingly. This can be done by setting a global Environment variable ‘TZ’ of the list of global environment variables that are provided by the server to each of the hosted website for modification. + +Due to this reason only, we can see time on the websites (that display it) according to our time zone. May be some other person hosting his website on the server would have the timezone set according to the location where he lives. + +Following lines set the Time Zone of the Server. + + SetEnv TZ India/Kolkata + +#### 12. How to enable Cache Control on Website #### + +A very interesting feature of browser, most have observed is that on opening one website simultaneously more than one time, the latter one opens fast as compared to the first time. But how is this possible? Well in this case, the browser stores some frequently visited pages in its cache for faster access later on. + +But for how long? Well this answer depends on you i.e. on the time you set in your .htaccess file for Cache control. The .htaccess file can specify the amount of time for which the pages of website can stay in the browser’s cache and after expiration of time, it must revalidate i.e. pages would be deleted from the Cache and recreated the next time user visits the site. + +Following lines implement Cache Control for your website. + + + Header Set Cache-Control "max-age=3600, public" + + + Header Set Cache-Control "public" + Header Set Expires "Sat, 24 Jan 2015 16:00:00 GMT" + + +The above lines allow caching of the pages which are inside the directory in which .htaccess files are placed for 1 hour. + +#### 13. Configuring a single file, the option. #### + +Usually the content in .htaccess files apply to all the files and folders inside the directory in which the file is placed, but you can also provide some special permissions to a special file, like denying access to that file only or so on. + +For this you need to add tag to your file in a way like this: + + + Order allow, deny + Deny from 188.100.100.0 + + +This is a simple case of denying a file ‘conf.html’ from access by IP 188.100.100.0, but you can add any or every feature described for .htaccess file till now including the features yet to be described to the file like: Cache-control, GZip compression. + +This feature is used by most of the servers to secure .htaccess files which is the reason why we are not able to see the .htaccess files on the browsers. How the files are authenticated is demonstrated in subsequent heading. + +#### 14. Enabling CGI scripts to run outside of cgi-bin folder. #### + +Usually servers run CGI scripts that are located inside the cgi-bin folder but, you can enable running of CGI scripts located in your desired folder but just adding following lines to .htaccess file located in the desired folder and if not, then creating one, appending following lines: + + AddHandler cgi-script .cgi + Options +ExecCGI + +#### 15. How to enable SSI on Website with .htaccess #### + +Server side includes as the name suggests would be related to something included at the server side. But what? Generally when we have many pages in our website and we have a navigation menu on our home page that displays links to other pages then, we can enable SSI (Server Size Includes) option that allows all the pages displayed in the navigation menu to be included with the home page completely. + +The SSI allows inclusion of multiple pages as if content they contain is a part of a single page so that any editing needed to be done is done in one file only which saves a lot of disk space. This option is by default enabled on servers but for .shtml files. + +In case you want to enable it for .html files you need to add following lines: + + AddHandler server-parsed .html + +After this following in the html file would lead to SSI. + + + +#### 16. How to Prevent website Directory Listing #### + +To prevent any client being able to list the directories of the website on the server at his local machine add following lines to the file inside the directory you don’t want to get listed. + + Options -Indexes + +#### 17. Changing Default charset and language headers. #### + +.htaccess files allow you to modify the character set used i.e. ASCII or UNICODE, UTF-8 etc. for your website along with the default language used for the display of content. + +Following server’s global environment variables allow you to achieve above feature. + + AddDefaultCharset UTF-8 + DefaultLanguage en-US + +**Re-writing URL’s: Redirection Rules** + +Re-writing feature simply means replacing the long and un-rememberable URL’s with short and easy to remember ones. But, before going into this topic there are some rules and some conventions for special symbols used later on in this article. + +**Special Symbols:** + + Symbol Meaning + ^ - Start of the string + $ - End of the String + | - Or [a|b] – a or b + [a-z] - Any of the letter between a to z + + - One or more occurrence of previous letter + * - Zero or more occurrence of previous letter + ? - Zero or one occurrence of previous letter + +**Constants and their meaning:** + + Constant Meaning + NC - No-case or case sensitive + L - Last rule – stop processing further rules + R - Temporary redirect to new URL + R=301 - Permanent redirect to new URL + F - Forbidden, send 403 header to the user + P - Proxy – grab remote content in substitution section and return it + G - Gone, no longer exists + S=x - Skip next x rules + T=mime-type - Force specified MIME type + E=var:value - Set environment variable var to value + H=handler - Set handler + PT - Pass through – in case of URL’s with additional headers. + QSA - Append query string from requested to substituted URL + +#### 18. Redirecting a non-www URL to a www URL. #### + +Before starting with the explanation, lets first see the lines that are needed to be added to .htaccess file to enable this feature. + + RewriteEngine ON + RewriteCond %{HTTP_HOST} ^abc\.net$ + RewriteRule (.*) http://www.abc.net/$1 [R=301,L] + +The above lines enable the Rewrite Engine and then in second line check all those URL’s that pertain to host abc.net or have the HTTP_HOST environment variable set to “abc.net”. + +For all such URL’s the code permanently redirects them (as R=301 rule is enabled) to the new URL http://www.abc.net/$1 where $1 is the non-www URL having host as abc.net. The non-www URL is the one in bracket and is referred by $1. + +#### 19. Redirecting entire website to https. #### + +Following lines will help you transfer entire website to https: + + RewriteEngine ON + RewriteCond %{HTTPS} !on + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + +The above lines enable the re-write engine and then check the value of HTTPS environment variable. If it is on then re-write the entire pages of the website to https. + +#### 20. A custom redirection example #### + +For example, redirect url ‘http://www.abc.net?p=100&q=20 ‘ to ‘http://www.abc.net/10020pq’. + + RewriteEngine ON + RewriteRule ^http://www.abc.net/([0-9]+)([0-9]+)pq$ ^http://www.abc.net?p=$1&q=$2 + +In above lines, $1 represents the first bracket and $2 represents the second bracket. + +#### 21. Renaming the htaccess file #### + +For preventing the .htaccess file from the intruders and other people from viewing those files you can rename that file so that it is not accessed by client’s browser. The line that does this is: + + AccessFileName htac.cess + +#### 22. How to Prevent Image Hotlinking for your Website #### + +Another problem that is major factor of large bandwidth consumption by the websites is the problem of hot links which are links to your websites by other websites for display of images mostly of your website which consumes your bandwidth. This problem is also called as ‘bandwidth theft’. + +A common observation is when a site displays the image contained in some other site due to this hot-linking your site needs to be loaded and at the stake of your site’s bandwidth, the other site’s images are displayed. To prevent this for like: images such as: .gif, .jpeg etc. following lines of code would help: + + RewriteEngine ON + RewriteCond %{HTTP_REFERER} !^$ + RewriteCond %{HTTP_REFERERER} !^http://(www\.)?mydomain.com/.*$ [NC] + RewriteRule \.(gif|jpeg|png)$ - [F]. + +The above lines check if the HTTP_REFERER is not set to blank or not set to any of the links in your websites. If this is happening then all the images in your page are replaced by 403 forbidden. + +#### 23. How to Redirect Users to Maintenance Page. #### + +In case your website is down for maintenance and you want to notify all your clients that need to access your websites about this then for such cases you can add following lines to your .htaccess websites that allow only admin access and replace the site pages having links to any .jpg, .css, .gif, .js etc. + + RewriteCond %{REQUEST_URI} !^/admin/ [NC] + RewriteCond %{REQUEST_URI} !^((.*).css|(.*).js|(.*).png|(.*).jpg) [NC] + RewriteRule ^(.*)$ /ErrorDocs/Maintainence_Page.html + [NC,L,U,QSA] + +These lines check if the Requested URL contains any request for any admin page i.e. one starting with ‘/admin/’ or any request to ‘.png, .jpg, .js, .css’ pages and for any such requests it replaces that page to ‘ErrorDocs/Maintainence_Page.html’. + +#### 24. Mapping IP Address to Domain Name #### + +Name servers are the servers that convert a specific IP Address to a domain name. This mapping can also be specified in the .htaccess files in the following manner. + + For Mapping L.M.N.O address to a domain name www.hellovisit.com + RewriteCond %{HTTP_HOST} ^L\.M\.N\.O$ [NC] + RewriteRule ^(.*)$ http://www.hellovisit.com/$1 [L,R=301] + +The above lines check if the host for any page is having the IP Address as: L.M.N.O and if so the page is mapped to the domain name http://www.hellovisit.com by the third line by permanent redirection. + +#### 25. FilesMatch Tag #### + +Like tag that is used to apply conditions to a single file, can be used to match to a group of files and apply some conditions to the group of files as below: + + + Order Allow, Deny + Deny from All + + +### Conclusion ### + +The list of tricks that can be done with .htaccess files is much more. Thus, this gives us an idea how powerful this file is and how much security and dynamicity and other features it can give to your website. + +We’ve tried our best to cover as much as htaccess tricks in this article, but incase if we’ve missed any important trick, or you most welcome to post your htaccess ideas and tricks that you know via comments section below – we will include those in our article too… + +-------------------------------------------------------------------------------- + +via: http://www.tecmint.com/apache-htaccess-tricks/ + +作者：[Gunjit Khera][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.tecmint.com/author/gunjitk94/ \ No newline at end of file From 32d3f3d3d248134f677a669ca45c4f938a2e4c79 Mon Sep 17 00:00:00 2001 From: Ping Date: Tue, 27 Jan 2015 16:40:52 +0800 Subject: [PATCH 061/207] Translated by Ping --- ...ers--How to check memory usage on Linux.md | 113 ------------------ ...ers--How to check memory usage on Linux.md | 113 ++++++++++++++++++ 2 files changed, 113 insertions(+), 113 deletions(-) delete mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md create mode 100644 translated/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md b/sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md deleted file mode 100644 index 0ed5ab4394..0000000000 --- a/sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md +++ /dev/null @@ -1,113 +0,0 @@ -Ping Translating - -Linux FAQs with Answers--How to check memory usage on Linux -================================================================================ -> **Question**: I would like to monitor memory usage on my Linux system. What are the available GUI-based or command-line tools for checking current memory usage of Linux? - -When it comes to optimizing the performance of a Linux system, physical memory is the single most important factor. Naturally, Linux offers a wealth of options to monitor the usage of the precious memory resource. Different tools vary in terms of their monitoring granularity (e.g., system-wide, per-process, per-user), interface (e.g., GUI, command-line, ncurses) or running mode (e.g., interactive, batch mode). - -Here is a non-exhaustive list of GUI or command-line tools to choose from to check used and free memory on Linux platform. - -### 1. /proc/meminfo ### - -The simpliest method to check RAM usage is via /proc/meminfo. This dynamically updated virtual file is actually the source of information displayed by many other memory related tools such as free, top and ps tools. From the amount of available/free physical memory to the amount of buffer waiting to be or being written back to disk, /proc/meminfo has everything you want to know about system memory usage. Process-specific memory information is also available from /proc//statm and /proc//status - - $ cat /proc/meminfo - -![](https://farm8.staticflickr.com/7483/15989497899_bb6afede11_b.jpg) - -### 2. atop ### - -The atop command is an ncurses-based interactive system and process monitor for terminal environments. It shows a dynamically-updated summary of system resources (CPU, memory, network, I/O, kernel), with colorized warnings in case of high system load. It also offers a top-like view of processes (or users) along with their resource usage, so that system admin can tell which processes or users are responsible for system load. Reported memory statistics include total/free memory, cached/buffer memory and committed virtual memory. - - $ sudo atop - -![](https://farm8.staticflickr.com/7552/16149756146_893773b84c_b.jpg) - -### 3. free ### - -The free command is a quick and easy way to get an overview of memory usage gleaned from /proc/meminfo. It shows a snapshot of total/free physical memory and swap space of the system, as well as used/free buffer space in the kernel. - - $ free -h -![](https://farm8.staticflickr.com/7531/15988117988_ba8c6b7b63_b.jpg) - -### 4. GNOME System Monitor ### - -GNOME System Monitor is a GUI application that shows a short history of system resource utilization for CPU, memory, swap space and network. It also offers a process view of CPU and memory usage. - - $ gnome-system-monitor - -![](https://farm8.staticflickr.com/7539/15988118078_279f0da494_c.jpg) - -### 5. htop ### - -The htop command is an ncurses-based interactive processor viewer which shows per-process memory usage in real time. It can report resident memory size (RSS), total program size in memory, library size, shared page size, and dirty page size for all running processes. You can scroll the (sorted) list of processes horizontally or vertically. - - $ htop - -![](https://farm9.staticflickr.com/8236/8599814378_de071de408_c.jpg) - -### 6. KDE System Monitor ### - -While GNOME desktop has GNOME System Monitor, KDE desktop has its own counterpart: KDE System Monitor. Its functionality is mostly similar to GNOME version, i.e., showing a real-time history of system resource usage, as well as a process list along with per-process CPU/memory consumption. - - $ ksysguard - -![](https://farm8.staticflickr.com/7479/15991397329_ec5d786ffd_c.jpg) - -### 7. memstat ### - -The memstat utility is useful to identify which executable(s), process(es) and shared libraries are consuming virtual memory. Given a process ID, memstat identifies how much virtual memory is used by the process' associated executable, data, and shared libraries. - - $ memstat -p - -![](https://farm8.staticflickr.com/7518/16175635905_1880e50055_b.jpg) - -### 8. nmon ### - -The nmon utility is an ncurses-based system benchmark tool which can monitor CPU, memory, disk I/O, kernel, filesystem and network resources in interactive mode. As for memory usage, it can show information such as total/free memory, swap space, buffer/cached memory, virtual memory page in/out statistics, all in real time. - - $ nmon - -![](https://farm9.staticflickr.com/8648/15989760117_30f62f4aba_b.jpg) - -### 9. ps ### - -The ps command can show per-process memory usage in real-time. Reported memory usage information includes %MEM (percent of physical memory used), VSZ (total amount of virtual memory used), and RSS (total amount of physical memory used). You can sort the process list by using "--sort" option. For example, to sort in the decreasing order of RSS: - - $ ps aux --sort -rss - -![](https://farm9.staticflickr.com/8602/15989881547_ca40839c19_c.jpg) - -### 10. smem ### - -The [smem][1] command allows you to measure physical memory usage by different processes and users based on information available from /proc. It utilizes proportional set size (PSS) metric to accurately quantify effective memory usage of Linux processes. Memory usage analysis can be exported to graphical charts such as bar and pie graphs. - - $ sudo smem --pie name -c "pss" - -![](https://farm8.staticflickr.com/7466/15614838428_eed7426cfe_c.jpg) - -### 11. top ### - -The top command offers a real-time view of running processes, along with various process-specific resource usage statistics. Memory related information includes %MEM (memory utilization percentage), VIRT (total amount of virtual memory used), SWAP (amount of swapped-out virtual memory), CODE (amount of physical memory allocated for code execution), DATA (amount of physical memory allocated to non-executable data), RES (total amount of physical memory used; CODE+DATA), and SHR (amount of memory potentially shared with other processes). You can sort the process list based on memory usage or size. - -![](https://farm8.staticflickr.com/7464/15989760047_eb8d51d9f2_c.jpg) - -### 12. vmstat ### - -The vmstat command-line utility displays instantaneous and average statistics of various system activities covering CPU, memory, interrupts, and disk I/O. As for memory information, the command shows not only physical memory usage (e.g., tota/used memory and buffer/cache memory), but also virtual memory statistics (e.g., memory paged in/out, swapped in/out). - - $ vmstat -s - -![](https://farm9.staticflickr.com/8582/15988236860_3f142008d2_b.jpg) - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/check-memory-usage-linux.html - -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://xmodulo.com/visualize-memory-usage-linux.html \ No newline at end of file diff --git a/translated/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md b/translated/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md new file mode 100644 index 0000000000..a04fdb1f52 --- /dev/null +++ b/translated/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md @@ -0,0 +1,113 @@ +Linux有问必答：如何检查Linux的内存使用状况 +================================================================================ + +>**问题**：我想要监测Linux系统的内存使用状况。有哪些可用的图形界面或者命令行工具来检查当前内存使用情况？ + +当涉及到Linux系统性能优化的时候，物理内存是一个最重要的因素。自然的，Linux提供了丰富的选择来监测对于珍贵的内存资源的使用。不同的工具，在监测粒度（例如：全系统范围, 每个进程, 每个用户），接口（例如：图形用户界面, 命令行, ncurses）或者运行模式（交互模式, 批量处理模式）上都不尽相同。 + +下面是一个可供选择的但并不全面的图形或命令行工具列表，这些工具用来检查并且释放Linux平台中内存。 + +### 1. /proc/meminfo ### + +一种最简单的方法是通过“/proc/meminfo”来检查内存使用状况。这个动态更新的虚拟文件事实上是许多信息资源的集中展示，这些资源来自于诸如free，top和ps这些与内存相关的工具。从可用/闲置物理内存数量到等待被写入缓存的数量或者已写回磁盘的数量，只要是你想要的关于内存使用的信息，“/proc/meminfo”应有尽有。特定进程的内存信息也可以通过“/proc//statm”和“/proc//status”来获取。 + + $ cat /proc/meminfo + +![](https://farm8.staticflickr.com/7483/15989497899_bb6afede11_b.jpg) + +### 2. atop ### + +atop命令是用于终端环境的基于ncurses的交互系统和进程监测工具。它展示了动态更新的系统资源（中央处理器, 内存, 网络, 输入/输出, 内核）摘要，并且用醒目的颜色将高系统负载的警告信息标注出来。它同样提供了类似于top的线程（或用户）资源使用视图，因此系统管理员可以指出哪个进程或者用户对系统负载负责。内存统计报告包括了总计/闲置内存，缓存的/缓冲的内存 和 提交的虚拟内存。 + + $ sudo atop + +![](https://farm8.staticflickr.com/7552/16149756146_893773b84c_b.jpg) + +### 3. free ### + +free命令是一个用来获得内存使用概况的快速简单的方法，这些信息从“/proc/meminfo”获取。它提供了一个快照用于展示总计/闲置的物理内存和系统交换区，以及已使用/闲置的内核缓冲区。 + + $ free -h + +![](https://farm8.staticflickr.com/7531/15988117988_ba8c6b7b63_b.jpg) + +### 4. GNOME System Monitor ### + +GNOME System Monitor 是一个图形界面应用，它展示了包括中央处理器，内存，交换区和网络在内的系统资源使用率的短暂历史记录。它同时也可以提供一个带有中央处理器和内存使用情况的进程视图。 + + $ gnome-system-monitor + +![](https://farm8.staticflickr.com/7539/15988118078_279f0da494_c.jpg) + +### 5. htop ### + +htop命令是一个基于ncurses的交互处理视图，它实时展示了每个进程的内存使用情况。它可以报告所有运行中进程的常驻内存大小（RSS）、内存中程序的总大小、库大小、共享文件大小、和脏页面大小。你可以横向或者纵向滚动进程列表进行查看。 + + $ htop + +![](https://farm9.staticflickr.com/8236/8599814378_de071de408_c.jpg) + +### 6. KDE System Monitor ### + +就像GNOME桌面拥有GNOME System Monitor一样，KDE桌面也有它自己的对口应用：KDE System Monitor。这个工具的功能与GNOME版本极其相似，也就是说，它同样展示了一个关于系统资源使用情况，以及带有每个进程的中央处理器/内存消耗情况的实时历史记录。 + + $ ksysguard + +![](https://farm8.staticflickr.com/7479/15991397329_ec5d786ffd_c.jpg) + +### 7. memstat ### + +memstat工具对于识别正在消耗虚拟内存的可执行文件、进程和共享库非常有用。给出一个进程识别号，memstat即可识别出与之相关联的可执行文件、数据和共享库究竟使用了多少虚拟内存。 + + $ memstat -p + +![](https://farm8.staticflickr.com/7518/16175635905_1880e50055_b.jpg) + +### 8. nmon ### + +nmon工具是一个基于ncurses系统基准测试工具，它能够以交互方式监测中央处理器、内存、磁盘输入/输出、内核、文件系统以及网络资源。对于内存使用状况而言，它能够展示像总计/闲置内存、交换区、缓冲的/缓存的内存，虚拟内存页面输入输出统计，所有这些都是实时的。 + + $ nmon + +![](https://farm9.staticflickr.com/8648/15989760117_30f62f4aba_b.jpg) + +### 9. ps ### + +ps命令能够实时展示每个进程的内存使用状况。内存使用报告里包括了 %MEM (物理内存使用百分比), VSZ (虚拟内存使用总量), and RSS (物理内存使用总量)。你可以使用“--sort”选项来对进程列表排序。例如，按照RSS降序排序： + + $ ps aux --sort -rss + +![](https://farm9.staticflickr.com/8602/15989881547_ca40839c19_c.jpg) + +### 10. smem ### + +[smem][1]命令允许你测定不同进程和用户的物理内存使用状况，这些信息来源于“/proc”目录。它利用比例设置大小（PSS）指标来精确量化Linux进程的有效内存使用情况。内存使用分析能够扩展成为柱状图或者饼图类的图形化图表。 + + $ sudo smem --pie name -c "pss" + +![](https://farm8.staticflickr.com/7466/15614838428_eed7426cfe_c.jpg) + +### 11. top ### + +top命令提供了一个运行中进程的实时视图，以及特定进程的各种资源使用统计信息。与内存相关的信息包括 %MEM (内存使用率), VIRT (虚拟内存使用总量), SWAP (交换出的虚拟内存使用量), CODE (分配给代码执行的物理内存数量), DATA (分配给无需执行的数据的物理内存数量), RES (物理内存使用总量; CODE+DATA), and SHR (有可能与其他进程共享的内存数量).你能够基于内存使用情况或者大小对进程列表进行排序。 + +![](https://farm8.staticflickr.com/7464/15989760047_eb8d51d9f2_c.jpg) + +### 12. vmstat ### + +vmstat命令行工具显示涵盖了中央处理器、内存、中断和磁盘输入/输出在内的各种系统活动的瞬时和平均统计数据。对于内存信息而言，命令不仅仅展示了物理内存使用情况（例如总计/已使用内存和缓冲的/缓存的内存），还同样展示了虚拟内存统计数据（例如，内存的页输入/输出，交换输入/输出） + + $ vmstat -s + +![](https://farm9.staticflickr.com/8582/15988236860_3f142008d2_b.jpg) + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/check-memory-usage-linux.html + +译者：[Ping](https://github.com/mr-ping) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://xmodulo.com/visualize-memory-usage-linux.html \ No newline at end of file From 164091f5c507fd73180580fe6b9a7603e5f14984 Mon Sep 17 00:00:00 2001 From: Ping Date: Tue, 27 Jan 2015 16:54:56 +0800 Subject: [PATCH 062/207] Ping Translating --- ...0150126 iptraf--A TCP or UDP Network Monitoring Utility.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150126 iptraf--A TCP or UDP Network Monitoring Utility.md b/sources/tech/20150126 iptraf--A TCP or UDP Network Monitoring Utility.md index cc6badecc2..f39d53a47d 100644 --- a/sources/tech/20150126 iptraf--A TCP or UDP Network Monitoring Utility.md +++ b/sources/tech/20150126 iptraf--A TCP or UDP Network Monitoring Utility.md @@ -1,3 +1,5 @@ +Ping -- Translating + iptraf: A TCP/UDP Network Monitoring Utility ================================================================================ [iptraf][1] is an ncurses-based IP LAN monitor that generates various network statistics including TCP info, UDP counts, ICMP and OSPF information, Ethernet load info, node stats, IP checksum errors, and others. @@ -61,4 +63,4 @@ via: http://www.unixmen.com/iptraf-tcpudp-network-monitoring-utility/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://www.unixmen.com/author/seth/ -[1]:http://iptraf.seul.org/about.html \ No newline at end of file +[1]:http://iptraf.seul.org/about.html From 16571b7dff5621e08eb55fa98dd93adf334b599f Mon Sep 17 00:00:00 2001 From: su-kaiyao <1250471161@qq.com> Date: Tue, 27 Jan 2015 17:41:57 +0800 Subject: [PATCH 063/207] =?UTF-8?q?=E5=AF=92=E5=81=87=E5=88=B0=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E9=A2=86=E4=B8=80=E7=AF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...150125 4 Best Modern Open Source Code Editors For Linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md b/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md index d3ed7d6dd9..43ff7e9877 100644 --- a/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md +++ b/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md @@ -1,3 +1,5 @@ +su-kaiyao translating + 4 Best Modern Open Source Code Editors For Linux ================================================================================ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Best_Open_Source_Editors.jpeg) @@ -83,4 +85,4 @@ via: http://itsfoss.com/best-modern-open-source-code-editors-for-linux/ [12]:http://lighttable.com/ [13]:https://github.com/LightTable/LightTable [14]:http://itsfoss.com/notepadqq-notepad-for-linux/ -[15]:http://itsfoss.com/scite-the-notepad-for-linux/ \ No newline at end of file +[15]:http://itsfoss.com/scite-the-notepad-for-linux/ From 68c7c4c0fe65ac2a318172917e03781cfb602f47 Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 27 Jan 2015 20:32:00 +0800 Subject: [PATCH 064/207] PUB:20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian @geekpi --- ...t into command line on Ubuntu or Debian.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) rename {translated/tech => published}/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md (68%) diff --git a/translated/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md b/published/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md similarity index 68% rename from translated/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md rename to published/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md index 64cb1b36e0..93bca3583c 100644 --- a/translated/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md +++ b/published/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md @@ -1,30 +1,30 @@ -Linux 有问必答：如何在Ubuntu或者Debian中启动进入命令行 +Linux 有问必答：如何在Ubuntu或者Debian中启动后进入命令行 ================================================================================ > **提问**：我运行的是Ubuntu桌面，但是我希望启动后临时进入命令行。有什么简便的方法可以启动进入终端？ -Linux桌面自带了一个显示管理器（比如：GDM、KDM、LightDM），它们可以让计算机启动自动进入一个基于GUI的登录环境。然而，如果你要直接启动进入终端怎么办？ 比如，你在排查桌面相关的问题或者想要运行一个不需要GUI的发行程序。 +Linux桌面自带了一个显示管理器（比如：GDM、KDM、LightDM），它们可以让计算机启动自动进入一个基于GUI的登录环境。然而，如果你要直接启动进入终端怎么办？ 比如，你在排查桌面相关的问题或者想要运行一个不需要GUI的应用程序。 -注意你可以通过按下Ctrl+Alt+F1到F6临时从桌面GUI切换到虚拟终端。然而，在本例中你的桌面GUI仍在后台运行，这不同于纯文本模式启动。 +注意虽然你可以通过按下Ctrl+Alt+F1到F6临时从桌面GUI切换到虚拟终端。然而，在这种情况下你的桌面GUI仍在后台运行，这不同于纯文本模式启动。 在Ubuntu或者Debian桌面中，你可以通过传递合适的内核参数在启动时启动文本模式。 ### 启动临时进入命令行 ### -如果你想要禁止桌面GUI并只有一次进入文本模式，你可以使用GRUB菜单。 +如果你想要禁止桌面GUI并临时进入一次文本模式，你可以使用GRUB菜单。 首先，打开你的电脑。当你看到初始的GRUB菜单时，按下‘e’。 ![](https://farm8.staticflickr.com/7490/16112246542_bc1875a397_z.jpg) -接着会进入下一屏，这里你可以修改内核启动选项。向下滚动到以“linux”开始的行，这里就是内核参数的列表。删除列表中的“quiet”和“splash”。在列表中添加“text”。 +接着会进入下一屏，这里你可以修改内核启动选项。向下滚动到以“linux”开始的行，这里就是内核参数的列表。删除参数列表中的“quiet”和“splash”。在参数列表中添加“text”。 ![](https://farm8.staticflickr.com/7471/15493282603_8a70f70af2_z.jpg) -升级的内核选项列表看上去像这样。按下Ctrl+x继续启动。这会一次性以详细模式启动控制台。 +升级的内核选项列表看上去像这样。按下Ctrl+x继续启动。这会以详细模式启动控制台一次（LCTT译注：由于没有保存修改，所以下次重启还会进入 GUI）。 ![](https://farm8.staticflickr.com/7570/15925676530_b11af59243_z.jpg) -永久启动进入命令行。 +### 永久启动进入命令行 ### 如果你想要永久启动进入命令行，你需要[更新定义了内核启动参数GRUB设置][1]。 @@ -32,7 +32,7 @@ Linux桌面自带了一个显示管理器（比如：GDM、KDM、LightDM）， $ sudo vi /etc/default/grub -查找以GRUB_CMDLINE_LINUX_DEFAULT开头的行，并用“#”注释这行。这会禁止初始屏幕，而启动详细模式（也就是说显示详细的的启动过程）。 +查找以GRUB\_CMDLINE\_LINUX\_DEFAULT开头的行，并用“#”注释这行。这会禁止初始屏幕，而启动详细模式（也就是说显示详细的的启动过程）。 更改GRUB_CMDLINE_LINUX="" 成： @@ -48,7 +48,7 @@ Linux桌面自带了一个显示管理器（比如：GDM、KDM、LightDM）， $ sudo update-grub -这时，你的桌面应该从GUI启动切换到控制台启动了。可以通过重启验证。 +这时，你的桌面应该可以从GUI启动切换到控制台启动了。可以通过重启验证。 ![](https://farm8.staticflickr.com/7518/16106378151_81ac6b5a49_b.jpg) @@ -57,7 +57,7 @@ Linux桌面自带了一个显示管理器（比如：GDM、KDM、LightDM）， via: http://ask.xmodulo.com/boot-into-command-line-ubuntu-debian.html 译者：[geekpi](https://github.com/geekpi) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 47913d0680c69a8446d671c8f89e9fb1fdb9d76a Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 27 Jan 2015 20:52:18 +0800 Subject: [PATCH 065/207] PUB:How to filter, split or merge pcap files on Linux @SPccman --- ...ter, split or merge pcap files on Linux.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) rename {translated/tech => published}/How to filter, split or merge pcap files on Linux.md (61%) diff --git a/translated/tech/How to filter, split or merge pcap files on Linux.md b/published/How to filter, split or merge pcap files on Linux.md similarity index 61% rename from translated/tech/How to filter, split or merge pcap files on Linux.md rename to published/How to filter, split or merge pcap files on Linux.md index 3c3335544d..82caa80cbd 100644 --- a/translated/tech/How to filter, split or merge pcap files on Linux.md +++ b/published/How to filter, split or merge pcap files on Linux.md @@ -1,7 +1,7 @@ Linux下如何过滤、分割以及合并 pcap 文件 ============= -如果你是个网络管理员，并且你的工作包括测试一个[入侵侦测系统][1]或一些网络访问控制策略，那么你通常需要抓取数据包并且在离线状态下分析这些文件。当需要保存捕获的数据包时，我们会想到 libpcap 的数据包格式被广泛使用于许多开源的嗅探工具以及捕包程序。如果 pcap 文件被用于入侵测试或离线分析的话，那么在将他们[注入][2]网络之前通常要先对 pcap 文件进行一些操作。 +如果你是一个测试[入侵侦测系统][1]或一些网络访问控制策略的网络管理员，那么你经常需要抓取数据包并在离线状态下分析这些文件。当需要保存捕获的数据包时，我们一般会存储为 libpcap 的数据包格式 pcap，这是一种被许多开源的嗅探工具以及捕包程序广泛使用的格式。如果 pcap 文件被用于入侵测试或离线分析的话，那么在将他们[注入][2]网络之前通常要先对 pcap 文件进行一些操作。 ![](https://farm8.staticflickr.com/7570/15425147404_a69f416673_c.jpg) @@ -9,9 +9,9 @@ Linux下如何过滤、分割以及合并 pcap 文件 ### Editcap 与 Mergecap### -Wireshark，是最受欢迎的 GUI 嗅探工具，实际上它来源于一套非常有用的命令行工具集。其中包括 editcap 与 mergecap。editcap 是一个万能的 pcap 编辑器，它可以过滤并且能以多种方式来分割 pcap 文件。mergecap 可以将多个 pcap 文件合并为一个。 这篇文章就是基于这些 Wireshark 命令行工具。 +Wireshark，是最受欢迎的 GUI 嗅探工具，实际上它带了一套非常有用的命令行工具集。其中包括 editcap 与 mergecap。editcap 是一个万能的 pcap 编辑器，它可以过滤并且能以多种方式来分割 pcap 文件。mergecap 可以将多个 pcap 文件合并为一个。 这篇文章就是基于这些 Wireshark 命令行工具的。 -如果你已经安装过Wireshark了，那么这些工具已经在你的系统中了。如果还没装的话，那么我们接下来就安装 Wireshark 命令行工具。 需要注意的是，在基于 Debian 的发行版上我们可以不用安装 Wireshark GUI 而仅安装 命令行工具，但是在 Red Hat 及 基于它的发行版中则需要安装整个 Wireshark 包。 +如果你已经安装过 Wireshark 了，那么这些工具已经在你的系统中了。如果还没装的话，那么我们接下来就安装 Wireshark 命令行工具。 需要注意的是，在基于 Debian 的发行版上我们可以不用安装 Wireshark GUI 而仅安装命令行工具，但是在 Red Hat 及 基于它的发行版中则需要安装整个 Wireshark 包。 **Debian, Ubuntu 或 Linux Mint** @@ -27,15 +27,15 @@ Wireshark，是最受欢迎的 GUI 嗅探工具，实际上它来源于一套非 通过 editcap， 我们能以很多不同的规则来过滤 pcap 文件中的内容，并且将过滤结果保存到新文件中。 -首先，以“起止时间”来过滤 pcap 文件。 " - A < start-time > and " - B < end-time > 选项可以过滤出处在这个时间段到达的数据包（如，从 2:30 ～ 2:35）。时间的格式为 “ YYYY-MM-DD HH:MM:SS"。 +首先，以“起止时间”来过滤 pcap 文件。 " - A < start-time > 和 " - B < end-time > 选项可以过滤出在这个时间段到达的数据包（如，从 2:30 ～ 2:35）。时间的格式为 “ YYYY-MM-DD HH:MM:SS"。 - $ editcap -A '2014-12-10 10:11:01' -B '2014-12-10 10:21:01' input.pcap output.pcap + $ editcap -A '2014-12-10 10:11:01' -B '2014-12-10 10:21:01' input.pcap output.pcap 也可以从某个文件中提取指定的 N 个包。下面的命令行从 input.pcap 文件中提取100个包（从 401 到 500）并将它们保存到 output.pcap 中： $ editcap input.pcap output.pcap 401-500 -使用 "-D< dup-window >" （dup-window可以看成是对比的窗口大小，仅与此范围内的包进行对比）选项可以提取出重复包。每个包都依次与它之前的 < dup-window > -1 个包对比长度与MD5值，如果有匹配的则丢弃。 +使用 "-D < dup-window >" （dup-window可以看成是对比的窗口大小，仅与此范围内的包进行对比）选项可以提取出重复包。每个包都依次与它之前的 < dup-window > -1 个包对比长度与MD5值，如果有匹配的则丢弃。 $ editcap -D 10 input.pcap output.pcap @@ -71,13 +71,13 @@ Wireshark，是最受欢迎的 GUI 嗅探工具，实际上它来源于一套非 如果要忽略时间戳，仅仅想以命令行中的顺序来合并文件，那么使用 -a 选项即可。 -例如，下列命令会将 input.pcap文件的内容写入到 output.pcap, 并且将 input2.pcap 的内容追加在后面。 +例如，下列命令会将 input.pcap 文件的内容写入到 output.pcap, 并且将 input2.pcap 的内容追加在后面。 $ mergecap -a -w output.pcap input.pcap input2.pcap ###总结### -在这篇指导中，我演示了多个 editcap、 mergecap 操作 pcap 文件的案例。除此之外，还有其它的相关工具，如 [reordercap][3]用于将数据包重新排序，[text2pcap][4] 用于将pcap 文件转换为 文本格式， [pcap-diff][5]用于比较 pcap 文件的异同，等等。当进行网络入侵测试及解决网络问题时，这些工具与[包注入工具][6]非常实用，所以最好了解他们。 +在这篇指导中，我演示了多个 editcap、 mergecap 操作 pcap 文件的例子。除此之外，还有其它的相关工具，如 [reordercap][3]用于将数据包重新排序，[text2pcap][4] 用于将 pcap 文件转换为文本格式， [pcap-diff][5]用于比较 pcap 文件的异同，等等。当进行网络入侵测试及解决网络问题时，这些工具与[包注入工具][6]非常实用，所以最好了解他们。 你是否使用过 pcap 工具？ 如果用过的话，你用它来做过什么呢？ @@ -86,8 +86,8 @@ Wireshark，是最受欢迎的 GUI 嗅探工具，实际上它来源于一套非 via: http://xmodulo.com/filter-split-merge-pcap-linux.html 作者：[Dan Nanni][a] -译者：[SPccman](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) +译者：[SPccman](https://github.com/SPccman) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 611bccf6a542e4d2a6a27434359339e579f91402 Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 27 Jan 2015 21:24:24 +0800 Subject: [PATCH 066/207] PUB:20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik @mr-ping --- ...our Apps and PPAs in Ubuntu Using Aptik.md | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) rename {translated/tech => published}/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md (86%) diff --git a/translated/tech/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md b/published/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md similarity index 86% rename from translated/tech/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md rename to published/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md index d55bf79f62..5b422eaef6 100644 --- a/translated/tech/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md +++ b/published/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md @@ -2,9 +2,9 @@ ================================================================================ ![00_lead_image_aptik](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x300x00_lead_image_aptik.png.pagespeed.ic.n3TJwp8YK_.png) -当你想重装Ubuntu或者仅仅是想安装它的一个新版本的时候，寻到一个便捷的方法去重新安装之前的应用并且重置其设置是很有用的。此时 *Aptik* 粉墨登场，它可以帮助你轻松实现。 +当你想重装Ubuntu或者仅仅是想安装它的一个新版本的时候，如果有个便捷的方法来重新安装之前的应用并且重置其设置会很方便的。此时 *Aptik* 粉墨登场，它可以帮助你轻松实现。 -Aptik（自动包备份和回复）是一个可以用在Ubuntu，Linux Mint, 和其他基于Debian以及Ubuntu的Linux发行版上的应用，它允许你将已经安装过的包括软件库、下载包、安装的应用及其主题和设置在内的PPAs(个人软件包存档)备份到外部的U盘、网络存储或者类似于Dropbox的云服务上。 +Aptik（自动包备份和恢复）是一个可以用在Ubuntu，Linux Mint 和其他基于Debian以及Ubuntu的Linux发行版上的应用，它允许你将已经安装过的包括软件库、下载包、安装的应用和主题、用户设置在内的PPAs(个人软件包存档)备份到外部的U盘、网络存储或者类似于Dropbox的云服务上。 注意：当我们在此文章中说到输入某些东西的时候，如果被输入的内容被引号包裹，请不要将引号一起输入进去，除非我们有特殊说明。 @@ -16,7 +16,7 @@ Aptik（自动包备份和回复）是一个可以用在Ubuntu，Linux Mint, 和 ![01_command_to_add_repository](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x99x01_command_to_add_repository.png.pagespeed.ic.UfVC9QLj54.png) -输入下边的命令到提示符旁边，来确保资源库已经是最新版本。 +在命令行提示符输入下边的命令，来确保资源库已经是最新版本。 sudo apt-get update @@ -86,11 +86,11 @@ Aptik的主窗口显示出来了。从“Backup Directory”下拉列表中选 接下来，“Downloaded Packages (APT Cache)”的项目只对重装同样版本的Ubuntu有用处。它会备份下你系统缓存(/var/cache/apt/archives)中的包。如果你是升级系统的话，可以跳过这个条目，因为针对新系统的包会比现有系统缓存中的包更加新一些。 -备份和回复下载过的包，这可以在重装Ubuntu，并且重装包的时候节省时间和网络带宽。因为一旦你把这些包恢复到系统缓存中之后，他们可以重新被利用起来，这样下载过程就免了，包的安装会更加快捷。 +备份和恢复下载过的包，这可以在重装Ubuntu，并且重装包的时候节省时间和网络带宽。因为一旦你把这些包恢复到系统缓存中之后，他们可以重新被利用起来，这样下载过程就免了，包的安装会更加快捷。 如果你是重装相同版本的Ubuntu系统的话，点击 “Downloaded Packages (APT Cache)” 右侧的 “Backup” 按钮来备份系统缓存中的包。 -注意：当你备份下载过的包的时候是没有二级对话框出现。你系统缓存 (/var/cache/apt/archives) 中的包会被拷贝到备份目录下一个名叫 “archives” 的文件夹中，当整个过程完成后会出现一个对话框来告诉你备份已经完成。 +注意：当你备份下载过的包的时候是没有二级对话框出现的。你系统缓存 (/var/cache/apt/archives) 中的包会被拷贝到备份目录下一个名叫 “archives” 的文件夹中，当整个过程完成后会出现一个对话框来告诉你备份已经完成。 ![16_downloaded_packages_backed_up](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x544x16_downloaded_packages_backed_up.png.pagespeed.ic.z8ysuwzQAK.png) @@ -104,7 +104,7 @@ Aptik的主窗口显示出来了。从“Backup Directory”下拉列表中选 ![18_clicking_backup_for_software_selections](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x530x18_clicking_backup_for_software_selections.png.pagespeed.ic.QI5D-IgnP_.png) -名为 “packages.list” and “packages-installed.list” 的两个文件出现在了备份目录中，并且一个用来通知你备份完成的对话框出现。点击 ”OK“关闭它。 +备份目录中出现了两个名为 “packages.list” 和“packages-installed.list” 的文件，并且会弹出一个通知你备份完成的对话框。点击 ”OK“关闭它。 注意：“packages-installed.list”文件包含了所有的包，而 “packages.list” 在包含了所有包的前提下还指出了那些包被选择上了。 @@ -120,27 +120,27 @@ Aptik的主窗口显示出来了。从“Backup Directory”下拉列表中选 ![21_zipping_settings_files](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x530x21_zipping_settings_files.png.pagespeed.ic.dgoBj7egqv.png) -当打包完成后，打包后的文件被拷贝到备份目录下，另外一个备份成功的对话框出现。点击”OK“，关掉。 +当打包完成后，打包后的文件被拷贝到备份目录下，另外一个备份成功的对话框出现。点击“OK”关掉。 ![22_app_settings_backed_up](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x530x22_app_settings_backed_up.png.pagespeed.ic.Mb6utyLJ3W.png) -来自 “/usr/share/themes” 目录的主题和来自 “/usr/share/icons” 目录的图标也可以备份。点击 “Themes and Icons” 右侧的 “Backup” 来进行此操作。“Backup Themes” 对话框默认选择了所有的主题和图标。你可以安装需要取消到一些然后点击 “Backup” 进行备份。 +放在 “/usr/share/themes” 目录的主题和放在 “/usr/share/icons” 目录的图标也可以备份。点击 “Themes and Icons” 右侧的 “Backup” 来进行此操作。“Backup Themes” 对话框默认选择了所有的主题和图标。你可以安装需要的、取消一些不要的，然后点击 “Backup” 进行备份。 ![22a_backing_up_themes_and_icons](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x530x22a_backing_up_themes_and_icons.png.pagespeed.ic.KXa8W3YhyF.png) -主题被打包拷贝到备份目录下的 “themes” 文件夹中，图标被打包拷贝到备份目录下的 “icons” 文件夹中。然后成功提示对话框出现，点击”OK“关闭它。 +主题被打包拷贝到备份目录下的 “themes” 文件夹中，图标被打包拷贝到备份目录下的 “icons” 文件夹中。然后成功提示对话框出现，点击“OK”关闭它。 ![22b_themes_and_icons_backed_up](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x530x22b_themes_and_icons_backed_up.png.pagespeed.ic.ejjRaymD39.png) -一旦你完成了需要的备份，点击主界面左上角的”X“关闭 Aptik 。 +一旦你完成了需要的备份，点击主界面左上角的“X”关闭 Aptik 。 ![23_closing_aptik](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x542x23_closing_aptik.png.pagespeed.ic.pNk9Vt3--l.png) -备份过的文件已存在于你选择的备份目录中，可以随时取阅。 +备份过的文件已存在于你选择的备份目录中，可以随时查看。 ![24_backup_files_in_directory](http://cdn5.howtogeek.com/wp-content/uploads/2014/12/650x374x24_backup_files_in_directory.png.pagespeed.ic.vwblOfN915.png) -当你重装Ubuntu或者安装新版本的Ubuntu后，在新的系统中安装 Aptik 并且将备份好的文件置于新系统中让其可被使用。运行 Aptik，并使用每个条目的 “Restore” 按钮来恢复你的软件源、应用、包、设置、主题以及图标。 +当你重装Ubuntu或者安装新版本的Ubuntu后，在新的系统中安装 Aptik 并且将备份好的文件置于新系统中使用。运行 Aptik，并使用每个条目的 “Restore” 按钮来恢复你的软件源、应用、包、设置、主题以及图标。 -------------------------------------------------------------------------------- @@ -148,7 +148,7 @@ via: http://www.howtogeek.com/206454/how-to-backup-and-restore-your-apps-and-ppa 作者：Lori Kaufman 译者：[Ping](https://github.com/mr-ping) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 2539cba212909abdeae1e9f6f3060006c3ed034e Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 27 Jan 2015 21:47:20 +0800 Subject: [PATCH 067/207] PUB:20141222 How to Sync Time Properly with NTP Server in CentOS 7.x @GOLinux --- ...c Time Properly with NTP Server in CentOS 7.x.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) rename {translated/tech => published}/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md (70%) diff --git a/translated/tech/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md b/published/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md similarity index 70% rename from translated/tech/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md rename to published/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md index 80a8237b6d..d8bfbd7c49 100644 --- a/translated/tech/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md +++ b/published/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md @@ -1,6 +1,6 @@ CentOS 7.x中正确设置时间与时钟服务器同步 ================================================================================ -**Chrony**是一个开源而自由的应用，它能帮助你保持系统时钟与时钟服务器同步，因此让你的时间保持精确。它由两个程序组成，分别是chronyd和chronyc。chronyd是一个后台运行的守护进程，用于调整内核中运行的系统时钟和时钟服务器同步。它确定计算机获取或丢失时间的比率，并对此进行补偿。chronyc提供了一个用户界面，用于监控性能并进行多样化的配置。它可以在chronyd实例控制的计算机上干这些事，也可以在一台不同的远程计算机上干这些事。 +**Chrony**是一个开源的自由软件，它能帮助你保持系统时钟与时钟服务器（NTP）同步，因此让你的时间保持精确。它由两个程序组成，分别是chronyd和chronyc。chronyd是一个后台运行的守护进程，用于调整内核中运行的系统时钟和时钟服务器同步。它确定计算机增减时间的比率，并对此进行补偿。chronyc提供了一个用户界面，用于监控性能并进行多样化的配置。它可以在chronyd实例控制的计算机上工作，也可以在一台不同的远程计算机上工作。 在像CentOS 7之类基于RHEL的操作系统上，已经默认安装有Chrony。 @@ -10,19 +10,17 @@ CentOS 7.x中正确设置时间与时钟服务器同步 **server** - 该参数可以多次用于添加时钟服务器，必须以"server "格式使用。一般而言，你想添加多少服务器，就可以添加多少服务器。 - Example: server 0.centos.pool.ntp.org server 3.europe.pool.ntp.org -**stratumweight** - stratumweight指令设置当chronyd从可用源中选择同步源时，每个层应该添加多少距离到同步距离。默认情况下，CentOS中设置为0，让chronyd在选择源时忽略层。 +**stratumweight** - stratumweight指令设置当chronyd从可用源中选择同步源时，每个层应该添加多少距离到同步距离。默认情况下，CentOS中设置为0，让chronyd在选择源时忽略源的层级。 -**driftfile** - chronyd程序的主要行为之一，就是根据实际时间计算出计算机获取或丢失时间的比率，将它记录到一个文件中是最合理的，它会在重启后为系统时钟作出补偿，甚至它可能有机会从时钟服务器获得好的估值。 +**driftfile** - chronyd程序的主要行为之一，就是根据实际时间计算出计算机增减时间的比率，将它记录到一个文件中是最合理的，它会在重启后为系统时钟作出补偿，甚至可能的话，会从时钟服务器获得较好的估值。 **rtcsync** - rtcsync指令将启用一个内核模式，在该模式中，系统时间每11分钟会拷贝到实时时钟（RTC）。 **allow / deny** - 这里你可以指定一台主机、子网，或者网络以允许或拒绝NTP连接到扮演时钟服务器的机器。 - Examples: allow 192.168.4.5 deny 192.168/16 @@ -30,11 +28,10 @@ CentOS 7.x中正确设置时间与时钟服务器同步 **bindcmdaddress** - 该指令允许你限制chronyd监听哪个网络接口的命令包（由chronyc执行）。该指令通过cmddeny机制提供了一个除上述限制以外可用的额外的访问控制等级。 - Example: bindcmdaddress 127.0.0.1 bindcmdaddress ::1 -**makestep** - 通常，chronyd将根据需求通过减慢或加速时钟，使得系统逐步纠正所有时间偏差。在某些特定情况下，系统时钟可能会漂移过快，导致该回转过程消耗很长的时间来纠正系统时钟。该指令强制chronyd在调整期大于某个阀值时调停系统时钟，但只有在因为chronyd启动时间超过指定限制（可使用负值来禁用限制），没有更多时钟更新时才生效。 +**makestep** - 通常，chronyd将根据需求通过减慢或加速时钟，使得系统逐步纠正所有时间偏差。在某些特定情况下，系统时钟可能会漂移过快，导致该调整过程消耗很长的时间来纠正系统时钟。该指令强制chronyd在调整期大于某个阀值时步进调整系统时钟，但只有在因为chronyd启动时间超过指定限制（可使用负值来禁用限制），没有更多时钟更新时才生效。 ### 使用chronyc ### @@ -66,7 +63,7 @@ via: http://linoxide.com/linux-command/chrony-time-sync/ 作者：[Adrian Dinu][a] 译者：[GOLinux](https://github.com/GOLinux) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 0c6739c7e49b1db508c7f8d1e01e09e1795fd139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E4=BC=AF=E7=91=9E?= Date: Tue, 27 Jan 2015 22:21:48 +0800 Subject: [PATCH 068/207] Update 20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md --- ... to Boot Linux ISO Images Directly From Your Hard Drive.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md b/sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md index 0a1670da58..b7ccf253f9 100644 --- a/sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md +++ b/sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md @@ -1,4 +1,4 @@ -How to Boot Linux ISO Images Directly From Your Hard Drive +[xieborui translating]How to Boot Linux ISO Images Directly From Your Hard Drive ================================================================================ Hi all, today we'll teach you an awesome interesting stuff related with the Operating System Disk Image and Booting. Now, try many OS you like without installing them in your Physical Hard Drive and without burning DVDs or USBs. @@ -75,4 +75,4 @@ via: http://linoxide.com/linux-how-to/boot-linux-iso-images-directly-hard-drive/ [a]:http://linoxide.com/author/arunp/ [1]:http://ubuntu.com/ [2]:http://linuxmint.com/ -[3]:http://git.marmotte.net/git/glim/tree/grub2 \ No newline at end of file +[3]:http://git.marmotte.net/git/glim/tree/grub2 From 62a61ee56d422586c0e5b4936dd3671552d462fb Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Tue, 27 Jan 2015 22:59:18 +0800 Subject: [PATCH 069/207] =?UTF-8?q?20150127=20=E9=80=89=E9=A2=98=20Bug=20i?= =?UTF-8?q?n=20Wi-Fi=20Direct=20Android=20Implementation=20Causes=20Denial?= =?UTF-8?q?=20of=20Service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Implementation Causes Denial of Service.md | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md diff --git a/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md b/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md new file mode 100644 index 0000000000..8829296d18 --- /dev/null +++ b/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md @@ -0,0 +1,49 @@ +Bug in Wi-Fi Direct Android Implementation Causes Denial of Service +---- +*Google marks the issue as having low severity, is not in a hurry to fix it* + +![Wi-Fi Direct glitch crashes Android](http://i1-news.softpedia-static.com/images/news2/Bug-In-Wi-Fi-Direct-Android-Implementation-Causes-Denial-of-Service-471299-2.jpg) + +#A vulnerability in the way Android handles Wi-Fi Direct connections leads to rebooting the device when searching for peers to connect to, which can be anything from other phones, cameras, gaming devices, computers, or printers. + +The Wi-Fi Direct technology allows devices capable of wireless connection to establish communication directly, without the need to join a local network. + +##Security company insisted on proper coordination for a fix + +The vulnerability allows an attacker to send a specially crafted 802.11 Probe Response frame to the device and crashes it due to an unhandled exception occurring on the WiFi monitoring class. + +Core Security discovered the flaw (CVE-2014-0997) through its CoreLabs team, and reported it to Google back in September 2014. The vendor acknowledged it but classified the glitch as having low severity, with no timeline for a fix being provided. + +The same answer was received by Core Security each time they contacted the Android security team to inform of a timeframe for rolling out a fix. The last reply of this kind was received on January 20, meaning that there is no patch for the time being. On Monday, the security company made their findings public. + +The security company created a (proof-of-concept)[1] to demonstrate the validity of the results obtained during their research. + +According to the technical details of the vulnerability, some Android devices can be induced a denial-of-service condition if they receive a malformed wpa_supplicant event, which makes available the interface between the wireless driver and the Android platform framework. + +##Google is not in a hurry to eliminate the problem + +The relaxed stance from the Android security team regarding the issue may be on account of the fact that denial-of-service condition occurs only for a short period of time, when scanning for peers. + +More than this, the result is not severe in nature as it consists in rebooting the device. There is no risk of data exfiltration or an attack that could lead to this, which would make it unappealing to a threat actor. On the other hand, a patch should be provided regardless, in order to mitigate any potential future risks. + +Core Security says that the issue was not detected on Android 5.0.1 and above, and among the devices affected they found Nexus 5 and 4 running version 4.4.4 of the mobile operating system, LG D806 and Samsung SM-T310 with Android 4.2.2, and Motorola RAZR HD with build 4.1.2 of the OS. + +For the time being, mitigation consists in refraining from using Wi-Fi Direct or updating to a non-vulnerable version of Android. + + +-------------------------------------------------------------------------------- + +via:http://news.softpedia.com/news/Bug-In-Wi-Fi-Direct-Android-Implementation-Causes-Denial-of-Service-471299.shtml + +本文发布时间:27 Jan 2015, 09:11 GMT + +作者：[Ionut Ilascu][a] + +译者：[译者ID](https://github.com/译者ID) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/ionut-ilascu +[1]:http://www.coresecurity.com/advisories/android-wifi-direct-denial-service \ No newline at end of file From f44993845aedc2a8a27bd072d0a7e2e6fe0e1034 Mon Sep 17 00:00:00 2001 From: mtunique Date: Wed, 28 Jan 2015 00:21:35 +0800 Subject: [PATCH 070/207] translated Linux FAQs with Answers--How to check disk space on Linux with df command --- ...eck disk space on Linux with df command.md | 158 ------------------ 1 file changed, 158 deletions(-) delete mode 100644 sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md b/sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md deleted file mode 100644 index b6595f555c..0000000000 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md +++ /dev/null @@ -1,158 +0,0 @@ -translating by mtunique -Linux FAQs with Answers--How to check disk space on Linux with df command -================================================================================ -> **问题**: 我知道在Linux上我可以用df命令来查看I know I can use df command to check a file system's disk space usage on Linux. Can you show me practical examples of the df command so that I can make the most out of it? - -As far as disk storage is concerned, there are many command-line or GUI-based tools that can tell you about current disk space usage. These tools report on detailed disk utilization in various human-readable formats, such as easy-to-understand summary, detailed statistics, or [intuitive visualization][1]. If you simply want to know how much free disk space is available for different file systems, then df command is probably all you need. - -![](https://farm9.staticflickr.com/8632/15505309473_51bffec3f1_b.jpg) - -The df command can report on disk utilization of any "mounted" file system. There are different ways this command can be invoked. Here are some **useful** df **command examples**. - -### Display in Human-Readable Format ### - -By default, the df command reports disk space in 1K blocks, which is not easily interpretable. The "-h" parameter will make df print disk space in a more human-readable format (e.g., 100K, 200M, 3G). - - $ df -h - ----------- - - Filesystem Size Used Avail Use% Mounted on - /dev/mapper/ubuntu-root 909G 565G 299G 66% / - none 4.0K 0 4.0K 0% /sys/fs/cgroup - udev 3.9G 4.0K 3.9G 1% /dev - tmpfs 785M 1.2M 784M 1% /run - none 5.0M 0 5.0M 0% /run/lock - none 3.9G 63M 3.8G 2% /run/shm - none 100M 48K 100M 1% /run/user - /dev/sda1 228M 98M 118M 46% /boot - -### Display Inode Usage ### - -When you monitor disk usage, you must watch out for not only disk space, but also "inode" usage. In Linux, inode is a data structure used to store metadata of a particular file, and when a file system is created, a pre-defined number of inodes are allocated. This means that a file system can run out of space not only because big files use up all available space, but also because many small files use up all available inodes. To display inode usage, use "-i" option. - - $ df -i - ----------- - - Filesystem Inodes IUsed IFree IUse% Mounted on - /dev/mapper/ubuntu-root 60514304 1217535 59296769 3% / - none 1004417 13 1004404 1% /sys/fs/cgroup - udev 1000623 552 1000071 1% /dev - tmpfs 1004417 608 1003809 1% /run - none 1004417 11 1004406 1% /run/lock - none 1004417 288 1004129 1% /run/shm - none 1004417 28 1004389 1% /run/user - /dev/sda1 124496 346 124150 1% /boot - -### Display Disk Usage Grant Total ### - -By default, the df command shows disk utilization of individual file systems. If you want to know the total disk usage over all existing file systems, add "--total" option. - - $ df -h --total - ----------- - - Filesystem Size Used Avail Use% Mounted on - /dev/mapper/ubuntu-root 909G 565G 299G 66% / - none 4.0K 0 4.0K 0% /sys/fs/cgroup - udev 3.9G 4.0K 3.9G 1% /dev - tmpfs 785M 1.2M 784M 1% /run - none 5.0M 0 5.0M 0% /run/lock - none 3.9G 62M 3.8G 2% /run/shm - none 100M 48K 100M 1% /run/user - /dev/sda1 228M 98M 118M 46% /boot - total 918G 565G 307G 65% - - -### Display File System Types ### - -By default, the df command does not show file system type information. Use "-T" option to add file system types to the output. - - $ df -T - ----------- - - Filesystem Type 1K-blocks Used Available Use% Mounted on - /dev/mapper/ubuntu-root ext4 952893348 591583292 312882844 66% / - none tmpfs 4 0 4 0% /sys/fs/cgroup - udev devtmpfs 4002492 4 4002488 1% /dev - tmpfs tmpfs 803536 1196 802340 1% /run - none tmpfs 5120 0 5120 0% /run/lock - none tmpfs 4017668 60176 3957492 2% /run/shm - none tmpfs 102400 48 102352 1% /run/user - /dev/sda1 ext2 233191 100025 120725 46% /boot - -### Include or Exclude a Specific File System Type ### - -If you want to know free space of a specific file system type, use "-t " option. You can use this option multiple times to include more than one file system types. - - $ df -t ext2 -t ext4 - ----------- - - Filesystem 1K-blocks Used Available Use% Mounted on - /dev/mapper/ubuntu-root 952893348 591583380 312882756 66% / - /dev/sda1 233191 100025 120725 46% /boot - -To exclude a specific file system type, use "-x " option. You can use this option multiple times as well. - - $ df -x tmpfs - -### Display Disk Usage of a Specific Mount Point ### - -If you specify a mount point with df, it will report disk usage of the file system mounted at that location. If you specify a regular file (or a directory) instead of a mount point, df will display disk utilization of the file system which contains the file (or the directory). - - $ df / - ----------- - - Filesystem 1K-blocks Used Available Use% Mounted on - /dev/mapper/ubuntu-root 952893348 591583528 312882608 66% / - ----------- - - $ df /home/dev - ----------- - - Filesystem 1K-blocks Used Available Use% Mounted on - /dev/mapper/ubuntu-root 952893348 591583528 312882608 66% / - -### Display Information about Dummy File Systems ### - -If you want to display disk space information for all existing file systems including dummy file systems, use "-a" option. Here, dummy file systems refer to pseudo file systems which do not have corresponding physical devices, e.g., tmpfs, cgroup virtual file system or FUSE file systems. These dummy filesystems have size of 0, and are not reported by df without "-a" option. - - $ df -a - ----------- - - Filesystem 1K-blocks Used Available Use% Mounted on - /dev/mapper/ubuntu-root 952893348 591578716 312887420 66% / - proc 0 0 0 - /proc - sysfs 0 0 0 - /sys - none 4 0 4 0% /sys/fs/cgroup - none 0 0 0 - /sys/fs/fuse/connections - none 0 0 0 - /sys/kernel/debug - none 0 0 0 - /sys/kernel/security - udev 4002492 4 4002488 1% /dev - devpts 0 0 0 - /dev/pts - tmpfs 803536 1196 802340 1% /run - none 5120 0 5120 0% /run/lock - none 4017668 58144 3959524 2% /run/shm - none 102400 48 102352 1% /run/user - none 0 0 0 - /sys/fs/pstore - cgroup 0 0 0 - /sys/fs/cgroup/cpuset - cgroup 0 0 0 - /sys/fs/cgroup/hugetlb - /dev/sda1 233191 100025 120725 46% /boot - vmware-vmblock 0 0 0 - /run/vmblock-fuse - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/check-disk-space-linux-df-command.html - -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://xmodulo.com/visualize-disk-usage-linux.html From 743040498a7bde86504080532f931cf31c5cd461 Mon Sep 17 00:00:00 2001 From: mtunique Date: Wed, 28 Jan 2015 00:23:25 +0800 Subject: [PATCH 071/207] move 20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md --- ...eck disk space on Linux with df command.md | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 translated/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md diff --git a/translated/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md b/translated/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md new file mode 100644 index 0000000000..6b1d65ca8b --- /dev/null +++ b/translated/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md @@ -0,0 +1,156 @@ +Linux有问必答：在Linux下如何用df命令检查磁盘空间？ +================================================================================ +> **问题**: 我知道在Linux上我可以用df命令来查看磁盘使用空间。你能告诉我df命令的实际例子使我可以最大限度得利用它吗？ + +对于磁盘存储方面，有很多命令行或基于GUI的工具，它可以告诉你关于当前磁盘空间的使用情况。这些工具用各种人们可读的格式展示磁盘利用率的详细信息，比如易于理解的总结，详细的统计信息或直观的[可视化报告][1]。如果你只想知道不同文件系统有多少空闲的磁盘空间，那么df命令可能是你所需要的。 + +![](https://farm9.staticflickr.com/8632/15505309473_51bffec3f1_b.jpg) + +df命令可以展示任何“mounted”文件系统的磁盘利用率。该命令可以用不同的方式调用。这里有一些**有用的** df **命令例子**. + +### 用人们可读的方式展示 ### + +默认情况下，df命令用1K为块来展示磁盘空间，这不容易解释。“-h”参数使df用更可读的方式打印磁盘空间（例如 100K，200M，3G）。 + + $ df -h + +---------- + + Filesystem Size Used Avail Use% Mounted on + /dev/mapper/ubuntu-root 909G 565G 299G 66% / + none 4.0K 0 4.0K 0% /sys/fs/cgroup + udev 3.9G 4.0K 3.9G 1% /dev + tmpfs 785M 1.2M 784M 1% /run + none 5.0M 0 5.0M 0% /run/lock + none 3.9G 63M 3.8G 2% /run/shm + none 100M 48K 100M 1% /run/user + /dev/sda1 228M 98M 118M 46% /boot + +### 展示Inode使用情况 ### + +当你监视磁盘使用情况时，你必须注意的不仅仅是磁盘空间还有“inode”的使用情况。在Linux中，inode是用来存储特定文件的元数据的一种数据结构，在创建一个文件系统时，inode的预先定义数量将被分配。这意味着，一个文件系统可能耗尽空间不只是因为大文件用完了所有可用空间，也可能是因为很多小文件用完了所有可能的inode。用“-i”选项展示inode使用情况。 + + $ df -i + +---------- + + Filesystem Inodes IUsed IFree IUse% Mounted on + /dev/mapper/ubuntu-root 60514304 1217535 59296769 3% / + none 1004417 13 1004404 1% /sys/fs/cgroup + udev 1000623 552 1000071 1% /dev + tmpfs 1004417 608 1003809 1% /run + none 1004417 11 1004406 1% /run/lock + none 1004417 288 1004129 1% /run/shm + none 1004417 28 1004389 1% /run/user + /dev/sda1 124496 346 124150 1% /boot + +### 展示磁盘总利用率 ### + +默认情况下， df命令显示磁盘的单个文件系统的利用率。如果你想知道的所有文件系统的总磁盘使用量，增加“ --total ”选项。 + $ df -h --total + +---------- + + Filesystem Size Used Avail Use% Mounted on + /dev/mapper/ubuntu-root 909G 565G 299G 66% / + none 4.0K 0 4.0K 0% /sys/fs/cgroup + udev 3.9G 4.0K 3.9G 1% /dev + tmpfs 785M 1.2M 784M 1% /run + none 5.0M 0 5.0M 0% /run/lock + none 3.9G 62M 3.8G 2% /run/shm + none 100M 48K 100M 1% /run/user + /dev/sda1 228M 98M 118M 46% /boot + total 918G 565G 307G 65% - + +### 展示文件系统类型 ### + +默认情况下，df命令不现实文件系统类型信息。用“-T”选项来添加文件系统信息到输出中。 + + $ df -T + +---------- + + Filesystem Type 1K-blocks Used Available Use% Mounted on + /dev/mapper/ubuntu-root ext4 952893348 591583292 312882844 66% / + none tmpfs 4 0 4 0% /sys/fs/cgroup + udev devtmpfs 4002492 4 4002488 1% /dev + tmpfs tmpfs 803536 1196 802340 1% /run + none tmpfs 5120 0 5120 0% /run/lock + none tmpfs 4017668 60176 3957492 2% /run/shm + none tmpfs 102400 48 102352 1% /run/user + /dev/sda1 ext2 233191 100025 120725 46% /boot + +### 包含或排除特定的文件系统类型 ### + +如果你想知道特定文件系统类型的剩余空间，用“-t ”选项。你可以多次使用这个选项来包含更多的文件系统类型。 + + $ df -t ext2 -t ext4 + +---------- + + Filesystem 1K-blocks Used Available Use% Mounted on + /dev/mapper/ubuntu-root 952893348 591583380 312882756 66% / + /dev/sda1 233191 100025 120725 46% /boot + +排除特定的文件系统类型，用“-x ”选项。同样，你可以用这个选项多次。 + + $ df -x tmpfs + +### 显示一个具体的挂载点磁盘使用情况 ### + +如果你用df指定一个挂载点，它将报告挂载在那个地方的文件系统的磁盘使用情况。如果你指定一个普通文件（或一个目录）而不是一个挂载点，df将现实包含这个文件（或目录）的文件系统的磁盘利用率。 + + $ df / + +---------- + + Filesystem 1K-blocks Used Available Use% Mounted on + /dev/mapper/ubuntu-root 952893348 591583528 312882608 66% / + +---------- + + $ df /home/dev + +---------- + + Filesystem 1K-blocks Used Available Use% Mounted on + /dev/mapper/ubuntu-root 952893348 591583528 312882608 66% / + +### 现实虚拟文件系统的信息 ### + +如果你想显示所有已经存在的文件系统（包括虚拟文件系统）的磁盘空间信息，用“-a”选项。这里，虚拟文件系统是指没有相对应的物理设备的假的文件系统，例如，tmpfs，cgroup虚拟文件系统或FUSE文件安系统。这些虚拟文件系统大小为0，不用“-a”选项将不会被报告出来。 + + $ df -a + +---------- + + Filesystem 1K-blocks Used Available Use% Mounted on + /dev/mapper/ubuntu-root 952893348 591578716 312887420 66% / + proc 0 0 0 - /proc + sysfs 0 0 0 - /sys + none 4 0 4 0% /sys/fs/cgroup + none 0 0 0 - /sys/fs/fuse/connections + none 0 0 0 - /sys/kernel/debug + none 0 0 0 - /sys/kernel/security + udev 4002492 4 4002488 1% /dev + devpts 0 0 0 - /dev/pts + tmpfs 803536 1196 802340 1% /run + none 5120 0 5120 0% /run/lock + none 4017668 58144 3959524 2% /run/shm + none 102400 48 102352 1% /run/user + none 0 0 0 - /sys/fs/pstore + cgroup 0 0 0 - /sys/fs/cgroup/cpuset + cgroup 0 0 0 - /sys/fs/cgroup/hugetlb + /dev/sda1 233191 100025 120725 46% /boot + vmware-vmblock 0 0 0 - /run/vmblock-fuse + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/check-disk-space-linux-df-command.html + +译者：[mtunique](https://github.com/mtunique) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://xmodulo.com/visualize-disk-usage-linux.html From 8b7c46f9004bf28d29a6c008e572c0651ed3e900 Mon Sep 17 00:00:00 2001 From: bazz2 Date: Wed, 28 Jan 2015 08:51:38 +0800 Subject: [PATCH 072/207] half the work --- .../tech/20141204 Linux Namespaces.md | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) rename {sources => translated}/tech/20141204 Linux Namespaces.md (75%) diff --git a/sources/tech/20141204 Linux Namespaces.md b/translated/tech/20141204 Linux Namespaces.md similarity index 75% rename from sources/tech/20141204 Linux Namespaces.md rename to translated/tech/20141204 Linux Namespaces.md index 6424d8f6a4..4d81eddcb9 100644 --- a/sources/tech/20141204 Linux Namespaces.md +++ b/translated/tech/20141204 Linux Namespaces.md @@ -1,33 +1,32 @@ -[bazz2222222222] -Linux Namespaces +Linux ռ ================================================================================ -### Background ### +### ### -Starting from kernel 2.6.24, Linux supports 6 different types of namespaces. Namespaces are useful in creating processes that are more isolated from the rest of the system, without needing to use full low level virtualization technology. +2.6.24ں˿ʼLinux ֧6ֲͬ͵ռ䡣ǵij֣ʹûĽܹϵͳøӳףӶҪ̫ײ⻯ -- **CLONE_NEWIPC**: IPC Namespaces: SystemV IPC and POSIX Message Queues can be isolated. -- **CLONE_NEWPID**: PID Namespaces: PIDs are isolated, meaning that a virtual PID inside of the namespace can conflict with a PID outside of the namespace. PIDs inside the namespace will be mapped to other PIDs outside of the namespace. The first PID inside the namespace will be '1' which outside of the namespace is assigned to init -- **CLONE_NEWNET**: Network Namespaces: Networking (/proc/net, IPs, interfaces and routes) are isolated. Services can be run on the same ports within namespaces, and "duplicate" virtual interfaces can be created. -- **CLONE_NEWNS**: Mount Namespaces. We have the ability to isolate mount points as they appear to processes. Using mount namespaces, we can achieve similar functionality to chroot() however with improved security. -- **CLONE_NEWUTS**: UTS Namespaces. This namespaces primary purpose is to isolate the hostname and NIS name. -- **CLONE_NEWUSER**: User Namespaces. Here, user and group IDs are different inside and outside of namespaces and can be duplicated. +- **CLONE_NEWIPC**: ̼ͨ(IPC)ռ䣬Խ SystemV IPC POSIX Ϣж +- **CLONE_NEWPID**: ID ռ䣬 ID ˼ռڵĽ ID ܻռĽ ID ͻռڵĽ ID ӳ䵽ռʱʹһ ID˵ռ ID Ϊ1Ḷ̌ռָ init ̡ +- **CLONE_NEWNET**: ռ䣬ڸԴ/proc/netIP ַ·ɵȣ̨̿ڲͬռڵͬ˿ϣûһ +- **CLONE_NEWNS**: ռ䣬ʱԽصϵͳ룬ʹʱǿԴﵽ chroot ĹܣڰȫԷ chroot ߡ +- **CLONE_NEWUTS**: UTS ռ䣬ҪĿǶϢNIS +- **CLONE_NEWUSER**: ûռ䣬ͬ ID һû ID ID ռDzһģڲͬռڿԴͬ ID -Let's look first at the structure of a C program, required to demonstrate process namespaces. The following has been tested on Debian 6 and 7. First, we need to allocate a page of memory on the stack, and set a pointer to the end of that memory page. We use **alloca** to allocate stack memory rather than malloc which would allocate memory on the heap. + C ԽΪʾռʱҪõ C ԡIJԹ Debian 6 Debian 7 ִСȣջڷһҳڴռ䣬ָָڴҳĩβʹ **alloca()** ڴ棬Ҫ malloc() ڴڶϡ void *mem = alloca(sysconf(_SC_PAGESIZE)) + sysconf(_SC_PAGESIZE); -Next, we use **clone** to create a child process, passing the location of our child stack 'mem', as well as the required flags to specify a new namespace. We specify 'callee' as the function to execute within the child space: +Ȼʹ **clone()** ӽ̣ջռĵַ "mem"ԼָռıǡͬʱǻָcalleeΪӽеĺ mypid = clone(callee, mem, SIGCHLD | CLONE_NEWIPC | CLONE_NEWPID | CLONE_NEWNS | CLONE_FILES, NULL); -After calling **clone** we then wait for the child process to finish, before terminating the parent. If not, the parent execution flow will continue and terminate immediately after, clearing up the child with it: +**clone** ֮Ҫڸеȴӽ˳Ļ̻ȥֱ̽ӽ̱ɹ¶̣ while (waitpid(mypid, &r, 0) < 0 && errno == EINTR) { continue; } -Lastly, we'll return to the shell with the exit code of the child: +ӽ˳ǻص shell 档 if (WIFEXITED(r)) { @@ -35,7 +34,7 @@ Lastly, we'll return to the shell with the exit code of the child: } return EXIT_FAILURE; -Now, let's look at the **callee** function: +Ľܵ **callee** £ static int callee() { @@ -48,7 +47,7 @@ Now, let's look at the **callee** function: return ret; } -Here, we mount a **/proc** filesystem, and then set the uid (User ID) and gid (Group ID) to the value of 'u' before spawning the **/bin/bash** shell. [LXC][1] is an OS level virtualization tool utilizing cgroups and namespaces for resource isolation. Let's put it all together, setting 'u' to 65534 which is user "nobody" and group "nogroup" on Debian: + **/proc** ļϵͳû ID IDֵΪuȻ **/bin/bash** [LXC][1] Dzϵͳ⻯ߣʹ cgroups ռԴķ롣ǰдһ𣬱uֵΪ65534 Debian ϵͳУǡnobody͡nogroup #define _GNU_SOURCE #include @@ -90,7 +89,7 @@ Here, we mount a **/proc** filesystem, and then set the uid (User ID) and gid (G return ret; } -To execute the code produces the following: +ִĴ룺 root@w:~/pen/tmp# gcc -O -o ns.c -Wall -Werror -ansi -c89 ns.c root@w:~/pen/tmp# ./ns From 226fcd1cc5d0e12c554535e27988c3c1d8a5a6cf Mon Sep 17 00:00:00 2001 From: tinyeyeser Date: Wed, 28 Jan 2015 08:54:35 +0800 Subject: [PATCH 073/207] =?UTF-8?q?=E5=B7=B2=E7=BF=BB=E8=AF=91=20by?= =?UTF-8?q?=E5=B0=8F=E7=9C=BC=E5=84=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tinyeyeser --- ...illion Users Stolen from Dating Website.md | 52 ------------------- ...illion Users Stolen from Dating Website.md | 51 ++++++++++++++++++ 2 files changed, 51 insertions(+), 52 deletions(-) delete mode 100644 sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md create mode 100644 translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md diff --git a/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md b/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md deleted file mode 100644 index 2a1dea8478..0000000000 --- a/sources/news/20150126 Data of 20 Million Users Stolen from Dating Website.md +++ /dev/null @@ -1,52 +0,0 @@ -翻译中 by小眼儿 - -Data of 20 Million Users Stolen from Dating Website ----------- -*Info includes Gmail, Hotmail and Yahoo emails* - -![Details could belong to users of online dating website Topface](http://i1-news.softpedia-static.com/images/news2/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179-2.jpg) - -#A database containing details of more than 20 million users of an online dating website has been allegedly stolen by a hacker. - -It is unclear at the moment if the information has been dumped into the public domain, but someone using the online alias “Mastermind” claims to have it, according to a post on an undisclosed paste site. - -#List contains hundreds of domains from all over the world - -The individual claims that the details are 100% valid and Daniel Ingevaldson, Chief Technology Officer at Easy Solutions, said in a blog post on Sunday that the list included email addresses from Hotmail, Yahoo and Gmail. - -Easy Solutions is a US-based company that provides security products for detecting and preventing cyber fraud across different computer platforms. - -According to Ingevaldson, the list contains over 7 million credentials from Hotmail, 2.5 million from Yahoo, and 2.2 million from Gmail.com. - -It is unclear if “credentials” refers to usernames and passwords that can be used to access the email accounts or the account of the dating website. Also, it is unknown whether the database stored the passwords in a secure manner or if they were available in plain text. - -An email address is often used as the username for an online service, to which the user can log in with a unique password. However, password recycling is a common practice for many users and the same string could be used to sign in to multiple online accounts. - -“The list appears to be international in nature with hundreds of domains listed from all over the world. Hackers and fraudsters are likely to leverage stolen credentials to commit fraud not on the original hacked site, but to use them to exploit password re-use to automatically scan and compromise other sites including banking, travel and email providers,” [says Ingevaldson](1). - -#More information is expected to emerge - -According to our sources, the affected website is Topface, an online dating location that touts over 90 million users. The business is headquartered in Sankt Petersburg, Russia, and it advertises that more than 50% of its users are from outside Russia. - -We contacted Topface to confirm or deny whether they suffered a breach recently that could have resulted in exposing a database this big; we are yet to receive an answer from the company. - -The credentials could have been stolen without perpetrators needing to gain unauthorized access, as Easy Solutions draws attention to the fact that email phishing may also have been used to get the info straight from the clients of the website. - -Easy Solutions could not be contacted through the online form available on its website, but we tried alternative communication and are currently waiting for more details. - --------------------------------------------------------------------------------- - -via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179.shtml - -本文发布时间:26 Jan 2015, 10:20 GMT - -作者：[Ionut Ilascu][a] - -译者：[译者ID](https://github.com/译者ID) - -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://news.softpedia.com/editors/browse/ionut-ilascu -[1]:http://newblog.easysol.net/dating-site-breached/ diff --git a/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md b/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md new file mode 100644 index 0000000000..14c5249dc3 --- /dev/null +++ b/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md @@ -0,0 +1,51 @@ +2000万用户网站数据遭泄露 +---------- +*泄露数据包括Gmail、Hotmail以及Yahoo邮箱* + +![泄露的数据很可能来自于线数据网站Topface](http://i1-news.softpedia-static.com/images/news2/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179-2.jpg) + +#一名黑客非法窃取了在线数据网站Topface一个包含2000万用户资料的数据库。 + +目前并不清楚这些数据是否已经公开，但是根据某些未公开页面的消息说，某个使用在线代理工具“Mastermind”的人声称掌握着这些数据。 + +#泄露数据列表涵盖了全世界数百个域名 + +此人号称泄露数据的内容100%可用，而Easy Solutions的CTO，Daniel Ingevaldson 周日在一篇博客中说道，泄露数据包括Hotmail、Yahoo和Gmail等邮箱地址。 + +Easy Solutions是一家位于美国的公司，提供多个不同平台的网络检测与安全防护产品。 + +据Ingevaldson所说，泄露的数据中，700万来自于Hotmail，250万来自于Yahoo，220万来自于Gmail.com。 + +我们并不清楚这些数据是可以直接登录邮箱账户的用户名密码，还是只是登录数据网站的账户。另外，也不清楚这些数据在数据库中是加密状态还是明文存在的。 + +邮箱地址常常被用于在线网站的登录用户名，用户可以凭借唯一密码进行登录。然而重复使用同一个密码是许多用户的常用作法，同一个密码可以登录许多在线账户。 + + +[Ingevaldson 还说](1)：“看起来，这些数据事实上涵盖了全世界数百个域名。除了原始的被黑的网页，黑客和不法分子很可能利用窃取的帐密进行暴库、自动扫描、危害包括银行业、旅游业以及email提供商在内的多个网站。” + +#预计将披露更多信息 + +据我们的多个消息源爆料，数据的泄露源就是Topface，一个包含9000万用户的在线数据网站。其总部位于俄罗斯圣彼得堡，超过50%的用户来自于俄罗斯以外的国家。 + +我们联系了Topface，向他们求证最近是否遭受了可能导致如此大量数据泄露的网络攻击；但目前我们仍未收到该公司的回复。 + +攻击者可能无需获得非法访问权限就窃取了这些数据，Easy Solutions 推测攻击者很可能针对网站客户端使用钓鱼邮件直接获取到了用户数据。 + +我们无法通过Easy Solutions的在线网站联系到它们，但我们已经尝试通过其他交互方式联系了它们，目前正在等待更多信息的披露。 + +-------------------------------------------------------------------------------- + +via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179.shtml + +本文发布时间:26 Jan 2015, 10:20 GMT + +作者：[Ionut Ilascu][a] + +译者：[Mr小眼儿](https://github.com/tinyeyeser) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/ionut-ilascu +[1]:http://newblog.easysol.net/dating-site-breached/ \ No newline at end of file From 4e879557df2f47a5cd685843dbc08ce46e3cf458 Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Wed, 28 Jan 2015 10:08:36 +0800 Subject: [PATCH 074/207] =?UTF-8?q?=E6=A0=A1=E5=AF=B9=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...50126 Data of 20 Million Users Stolen from Dating Website.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md b/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md index 14c5249dc3..b4de21c0eb 100644 --- a/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md +++ b/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md @@ -48,4 +48,4 @@ via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-W 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://news.softpedia.com/editors/browse/ionut-ilascu -[1]:http://newblog.easysol.net/dating-site-breached/ \ No newline at end of file +[1]:http://newblog.easysol.net/dating-site-breached/ From 5f06c4ea2555f5dfa23de3910d6e9546b6f249c1 Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Wed, 28 Jan 2015 10:26:39 +0800 Subject: [PATCH 075/207] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...illion Users Stolen from Dating Website.md | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md b/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md index b4de21c0eb..2fd4acc06d 100644 --- a/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md +++ b/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md @@ -1,37 +1,36 @@ -2000万用户网站数据遭泄露 +交友网站的2000万用户数据遭泄露 ---------- *泄露数据包括Gmail、Hotmail以及Yahoo邮箱* -![泄露的数据很可能来自于线数据网站Topface](http://i1-news.softpedia-static.com/images/news2/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179-2.jpg) +![泄露的数据很可能来自于在线交友网站Topface](http://i1-news.softpedia-static.com/images/news2/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179-2.jpg) -#一名黑客非法窃取了在线数据网站Topface一个包含2000万用户资料的数据库。 +#一名黑客非法窃取了在线交友网站Topface一个包含2000万用户资料的数据库。 -目前并不清楚这些数据是否已经公开，但是根据某些未公开页面的消息说，某个使用在线代理工具“Mastermind”的人声称掌握着这些数据。 +目前并不清楚这些数据是否已经公开，但是根据某些未公开页面的消息说，某个网名为“Mastermind”的人声称掌握着这些数据。 #泄露数据列表涵盖了全世界数百个域名 -此人号称泄露数据的内容100%可用，而Easy Solutions的CTO，Daniel Ingevaldson 周日在一篇博客中说道，泄露数据包括Hotmail、Yahoo和Gmail等邮箱地址。 +此人号称泄露数据的内容100%真实有效，而Easy Solutions的CTO，Daniel Ingevaldson 周日在一篇博客中说道，泄露数据包括Hotmail、Yahoo和Gmail等邮箱地址。 Easy Solutions是一家位于美国的公司，提供多个不同平台的网络检测与安全防护产品。 据Ingevaldson所说，泄露的数据中，700万来自于Hotmail，250万来自于Yahoo，220万来自于Gmail.com。 -我们并不清楚这些数据是可以直接登录邮箱账户的用户名密码，还是只是登录数据网站的账户。另外，也不清楚这些数据在数据库中是加密状态还是明文存在的。 +我们并不清楚这些数据是可以直接登录邮箱账户的用户名和密码，还是登录交友网站的账户。另外，也不清楚这些数据在数据库中是加密状态还是明文存在的。 邮箱地址常常被用于在线网站的登录用户名，用户可以凭借唯一密码进行登录。然而重复使用同一个密码是许多用户的常用作法，同一个密码可以登录许多在线账户。 - -[Ingevaldson 还说](1)：“看起来，这些数据事实上涵盖了全世界数百个域名。除了原始的被黑的网页，黑客和不法分子很可能利用窃取的帐密进行暴库、自动扫描、危害包括银行业、旅游业以及email提供商在内的多个网站。” +[Ingevaldson 还说](1)：“看起来，这些数据事实上涵盖了全世界数百个域名。除了原始被黑的网页，黑客和不法分子很可能利用窃取的帐密进行暴库、自动扫描、危害包括银行业、旅游业以及email提供商在内的多个网站。” #预计将披露更多信息 -据我们的多个消息源爆料，数据的泄露源就是Topface，一个包含9000万用户的在线数据网站。其总部位于俄罗斯圣彼得堡，超过50%的用户来自于俄罗斯以外的国家。 +据我们的多个消息源爆料，数据的泄露源就是Topface，一个包含9000万用户的在线交友网站。其总部位于俄罗斯圣彼得堡，超过50%的用户来自于俄罗斯以外的国家。 我们联系了Topface，向他们求证最近是否遭受了可能导致如此大量数据泄露的网络攻击；但目前我们仍未收到该公司的回复。 攻击者可能无需获得非法访问权限就窃取了这些数据，Easy Solutions 推测攻击者很可能针对网站客户端使用钓鱼邮件直接获取到了用户数据。 -我们无法通过Easy Solutions的在线网站联系到它们，但我们已经尝试通过其他交互方式联系了它们，目前正在等待更多信息的披露。 +我们无法通过Easy Solutions的在线网站联系到他们，但我们已经尝试了其他交互通讯方式，目前正在等待更多信息的披露。 -------------------------------------------------------------------------------- @@ -43,7 +42,7 @@ via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-W 译者：[Mr小眼儿](https://github.com/tinyeyeser) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From dca9140beb63c885315375c433d3d3f055664b27 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Wed, 28 Jan 2015 10:43:12 +0800 Subject: [PATCH 076/207] Finish the translation by ZTinoZ --- ...0 Linux Commands Interview Questions & Answers.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename {sources => translated}/talk/20141223 20 Linux Commands Interview Questions & Answers.md (89%) diff --git a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/translated/talk/20141223 20 Linux Commands Interview Questions & Answers.md similarity index 89% rename from sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md rename to translated/talk/20141223 20 Linux Commands Interview Questions & Answers.md index 7e73344c2d..40d5019c52 100644 --- a/sources/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/translated/talk/20141223 20 Linux Commands Interview Questions & Answers.md @@ -36,7 +36,7 @@ # diff -Naur old_file new_file > diff_file -旧文件和新文件要么都是单个的文件要么都是包含文件的目录，r选项支持目录树递归。 +旧文件和新文件要么都是单个的文件要么都是包含文件的目录，-r参数支持目录树递归。 一旦diff文件创建好，我们就能在旧的文件上打上补丁，把它变成新文件： @@ -76,7 +76,7 @@ **问:13 如何在/var目录下找出90天之内未被访问过的文件？** -答: # find /var \! -atime -90 +答: # find /var \\! -atime -90 **问:14 在整个目录树下查找核心文件，如发现则删除它们且不提示确认信息。** @@ -102,13 +102,13 @@ 答: 这条ll命令会显示这些文件的文件名和它们的拥有者。 -**问:19 What is the use of at command in linux ?** +**问:19 :Linux中的at命令有什么用？** -答: The at command is used to schedule a one-time execution of a program in the future. All submitted jobs are spooled in the /var/spool/at directory and executed by the atd daemon when the scheduled time arrives. +答: at命令用来安排一个程序在未来的做一次一次性执行。所有提交的任务都被放在 /var/spool/at 目录下并且到了执行时间的时候通过atd守护进程来执行。 -**问:20 What is the role of lspci command in linux ?** +**问:20 linux中lspci命令的作用是什么？** -答: The lspci command displays information about PCI buses and the devices attached to your system. Specify -v, -vv, or -vvv for detailed output. With the -m option, the command produces more legible output. +答: lspci命令用来显示你的系统上PCI总线和附加设备的信息。指定-v，-vv或-vvv来获取详细输出，加上-r参数的话，命令的输出则会更具有易读性。 -------------------------------------------------------------------------------- From 39f39dccb7f1d82fb7126b5ec90c47ce2a707fc9 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 11:09:24 +0800 Subject: [PATCH 077/207] Update 20150127 Install Jetty Web Server On CentOS 7.md --- sources/tech/20150127 Install Jetty Web Server On CentOS 7.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md b/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md index 0cfb868498..d7c4b41a24 100644 --- a/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md +++ b/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md @@ -1,3 +1,5 @@ +Translating---geekpi + Install Jetty Web Server On CentOS 7 ================================================================================ [Jetty][1] is a pure Java-based HTTP **(Web) server** and Java Servlet container. Jetty is now often used for machine to machine communications, usually within larger software frameworks. But the other Web Servers are usually associated with serving documents to humans. Jetty is developed as a free and open source project as part of the Eclipse Foundation. The web server is used in products such as Apache ActiveMQ, Alfresco, Apache Geronimo, Apache Maven, Apache Spark, Google App Engine, Eclipse, FUSE, Twitter’s Streaming API and Zimbra. @@ -75,4 +77,4 @@ via: http://www.unixmen.com/install-jetty-web-server-centos-7/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://www.unixmen.com/author/jijo/ -[1]:http://eclipse.org/jetty/ \ No newline at end of file +[1]:http://eclipse.org/jetty/ From 42ec379de6e7182f8e315c968adeccbc1fe84183 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 28 Jan 2015 11:21:02 +0800 Subject: [PATCH 078/207] =?UTF-8?q?20150128-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...A New Web Browser Built for Power Users.md | 60 ++++++++ ...A Package Is Installed Or Not In Ubuntu.md | 137 ++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 sources/share/20150128 Meet Vivaldi--A New Web Browser Built for Power Users.md create mode 100644 sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md diff --git a/sources/share/20150128 Meet Vivaldi--A New Web Browser Built for Power Users.md b/sources/share/20150128 Meet Vivaldi--A New Web Browser Built for Power Users.md new file mode 100644 index 0000000000..c55a5fabe7 --- /dev/null +++ b/sources/share/20150128 Meet Vivaldi--A New Web Browser Built for Power Users.md @@ -0,0 +1,60 @@ +Meet Vivaldi — A New Web Browser Built for Power Users +================================================================================ +![](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/Screen-Shot-2015-01-27-at-17.36.jpg) + +**A brand new web browser has arrived this week that aims to meet the needs of power users — and it’s already available for Linux.** + +Vivaldi is the name of this new browser and it has been launched as a tech preview (read: a beta without the responsibility) for 64-bit Linux machines, Windows and Mac. It is built — shock — on the tried-and-tested open-source frameworks of Chromium, Blink and Google’s open-source V8 JavaScript engine (among other projects). + +Does the world really want another browser? Vivaldi, the brain child of former Opera Software CEO Jon von Tetzchner, is less concerned about want and more about need. + +Vivaldi is being built with the sort of features that keyboard preferring tab addicts need. It is not being pitched at users who find Firefox perplexing or whose sole criticism of Chrome is that it moved the bookmarks button. + +That’s not tacky marketing spiel either. Despite the ‘technical preview’ badge it comes with, Vivaldi is already packed with features that demonstrate its power user slant. + +Plenty of folks feel left behind and underserved by the simplified, paired back offerings other software companies are producing. Vivaldi, even at this early juncture, looks well placed to succeed in winning them over. + +### Vivaldi Features ### + +A few of Vivaldi’s key features already present include: + +![](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/quick.jpg) + +**Quick Commands** (Ctrl + Q) is an in-app HUD that lets you quickly filter through settings, options and features, be it opening a bookmark or hiding the status bar, using your keyboard. No clicks needed. + +**Tab Stacks** let you clean up your workspace by grouping separate tabs into one, and then using a keyboard command or the tab preview picker to switch between them. + +![](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/tab-stacks.jpg) + +A collapsible **side panel** that houses extra features (just like old Opera) including a (not yet working) mail client, contacts, bookmarks browser and note taking section that lets you take and annotate screenshots. + +A bunch of other features are on offer too, including customizable keyboard shortcuts, a tabs bar that can be set on any edge of the browser (or hidden entirely), privacy options and a speed dial with folders. + +### Opera Mark II ### + +![](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/vivaldi-settings-in-ubuntu-750x434.jpg) + +It’s not a leap to see Vivaldi as the true successor to Opera post-Presto (Opera’s old, proprietary rendering engine). Opera (which also pushed out a minor new update today) has split out many of its “power user” features as it chases a lighter, more manageable set of features. + +Vivaldi wants to pick up the baggage Opera has been so keen to offload. And while that might not help it grab marketshare it will see it grab the attention of power users, many of whom will no doubt already be using Linux. + +### Download ### + +Interested in taking it for a spin? You can. Vivaldi is available to download for Windows, Mac and 64-bit Linux distributions. On the latter you have a choice of Debian or RPM installer. + +Bear in mind that it’s not finished and that more features (including extensions, sync and more) are planned for future builds. + +- [Download Vivaldi Tech Preview for Linux][1] + +-------------------------------------------------------------------------------- + +via: http://www.omgubuntu.co.uk/2015/01/vivaldi-web-browser-linux-download-power-users + +作者：[Joey-Elijah Sneddon][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:https://plus.google.com/117485690627814051450/?rel=author +[1]:https://vivaldi.com/#Download \ No newline at end of file diff --git a/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md b/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md new file mode 100644 index 0000000000..6b68f02b1e --- /dev/null +++ b/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md @@ -0,0 +1,137 @@ +Linux Basics: How To Check If A Package Is Installed Or Not In Ubuntu +================================================================================ +![](http://180016988.r.cdn77.net/wp-content/uploads/2014/04/ubuntu-790x558.png) + +If you’re managing Debian or Ubuntu servers, probably, you may use **dpkg** or **apt-get** commands often. These two commands are used to install, remove, update packages. + +In this brief tutorial, let us see how to check if a package is installed or not in DEB based systems. + +To check whether a particular package for example firefox, is installed or not using command: + + dpkg -s firefox + +Sample output: + + Package: firefox + Status: install ok installed + Priority: optional + Section: web + Installed-Size: 93339 + Maintainer: Ubuntu Mozilla Team + Architecture: amd64 + Version: 35.0+build3-0ubuntu0.14.04.2 + Replaces: kubuntu-firefox-installer + Provides: gnome-www-browser, iceweasel, www-browser + Depends: lsb-release, libasound2 (>= 1.0.16), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.2.4), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.78), libfontconfig1 (>= 2.9.0), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:4.1.1), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.37.3), libgtk2.0-0 (>= 2.24.0), libpango-1.0-0 (>= 1.22.0), libpangocairo-1.0-0 (>= 1.14.0), libstartup-notification0 (>= 0.8), libstdc++6 (>= 4.6), libx11-6, libxcomposite1 (>= 1:0.3-1), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxrender1, libxt6 + Recommends: xul-ext-ubufox, libcanberra0, libdbusmenu-glib4, libdbusmenu-gtk4 + Suggests: ttf-lyx + Conffiles: + /etc/firefox/syspref.js 09e457e65435a1a043521f2bd19cd2a1 + /etc/apport/blacklist.d/firefox ee63264f847e671832d42255912ce144 + /etc/apport/native-origins.d/firefox 7c26b75c7c2b715c89cc6d85338252a4 + /etc/apparmor.d/usr.bin.firefox f54f7a43361c7ecfa3874abca2f292cf + Description: Safe and easy web browser from Mozilla + Firefox delivers safe, easy web browsing. A familiar user interface, + enhanced security features including protection from online identity theft, + and integrated search let you get the most out of the web. + Xul-Appid: {ec8030f7-c20a-464f-9b0e-13a3a9e97384} + +As you see in the above output, the firefox is installed. + +Also, you can do the same using **dpkg-query** command. This command displays the decent output, and ofcourse, you can wild cards too. + + dpkg-query -l firefox + +Sample output: + + Desired=Unknown/Install/Remove/Purge/Hold + | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend + |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) + ||/ Name Version Architecture Description + +++-====================================-=======================-=======================-============================================================================= + ii firefox 35.0+build3-0ubuntu0.14 amd64 Safe and easy web browser from Mozilla + +To list all installed package in your system, enter the following command + + dpkg --get-selections + +Sample output: + + abiword install + abiword-common install + accountsservice install + acl install + adduser install + alsa-base install + alsa-utils install + anacron install + app-install-data install + apparmor install + . + . + . + zeitgeist install + zeitgeist-core install + zeitgeist-datahub install + zenity install + zenity-common install + zip install + zlib1g:amd64 install + zlib1g:i386 install + +The above might be very long depending upon the number of packages you have installed on your system. + +You can also filter through **grep** to get results for the exact package you need. For example, I want to see which gcc packages are already installed on my system using **dpkg** command: + + dpkg --get-selections | grep gcc + +Sample output: + + gcc install + gcc-4.8 install + gcc-4.8-base:amd64 install + gcc-4.8-base:i386 install + gcc-4.9-base:amd64 install + gcc-4.9-base:i386 install + libgcc-4.8-dev:amd64 install + libgcc1:amd64 install + libgcc1:i386 install + +Additionally, you can find location of the files within a package using the parameter “**-L**”. + + dpkg -L gcc-4.8 + +Sample output: + + /. + /usr + /usr/share + /usr/share/doc + /usr/share/doc/gcc-4.8-base + /usr/share/doc/gcc-4.8-base/README.Bugs + /usr/share/doc/gcc-4.8-base/NEWS.html + /usr/share/doc/gcc-4.8-base/quadmath + /usr/share/doc/gcc-4.8-base/quadmath/changelog.gz + /usr/share/doc/gcc-4.8-base/gcc + . + . + . + /usr/bin/x86_64-linux-gnu-gcc-4.8 + /usr/bin/x86_64-linux-gnu-gcc-ar-4.8 + /usr/bin/x86_64-linux-gnu-gcov-4.8 + +That’s all for now. Hope this short tutorial will useful for you. + +Good day! + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/linux-basics-check-package-installed-not-ubuntu/ + +作者：[SK][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/sk/ \ No newline at end of file From c4cf2f2a7d87d487d831f99fd7b0a48936947ae8 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 11:35:02 +0800 Subject: [PATCH 079/207] translated --- ...27 Install Jetty Web Server On CentOS 7.md | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md b/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md index d7c4b41a24..3cdb89ca76 100644 --- a/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md +++ b/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md @@ -1,48 +1,46 @@ -Translating---geekpi - -Install Jetty Web Server On CentOS 7 +在CentOS 7中安装Jetty服务器 ================================================================================ -[Jetty][1] is a pure Java-based HTTP **(Web) server** and Java Servlet container. Jetty is now often used for machine to machine communications, usually within larger software frameworks. But the other Web Servers are usually associated with serving documents to humans. Jetty is developed as a free and open source project as part of the Eclipse Foundation. The web server is used in products such as Apache ActiveMQ, Alfresco, Apache Geronimo, Apache Maven, Apache Spark, Google App Engine, Eclipse, FUSE, Twitter’s Streaming API and Zimbra. +[Jetty][1] 是一款纯Java的HTTP **(Web) 服务器**和Java Servlet容器。 通常在更大的网络框架中，Jetty经常用于设备间的通信。但是其他Web服务器通常给人类传递文件。Jetty是一个Eclipse基金中免费开源项目。这个Web服务器用于如Apache ActiveMQ、 Alfresco、 Apache Geronimo、 Apache Maven、 Apache Spark、Google App Engine、 Eclipse、 FUSE、 Twitter的 Streaming API 和 Zimbra中。 -This article explains ‘How to install jetty web server in your CentOS server’. +这篇文章会解释‘如何在CentOS服务器中安装Jetty服务器’。 -**First of all we have to install java JDK, By the following command:** +**首先我们要用下面的命令安装JDK：** yum -y install java-1.7.0-openjdk wget -**After the JDK installation, We will download the latest version of Jetty:** +**JDK安装之后，我们就可以下载最新版本的Jetty了：** wget http://download.eclipse.org/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz -**Extract and move the the downloaded package to /opt:** +**解压并移动下载的包到/opt：** tar zxvf jetty-distribution-9.2.5.v20141112.tar.gz -C /opt/ -**Rename the file name to jetty:** +**重命名文件夹名为jetty:** mv /opt/jetty-distribution-9.2.5.v20141112/ /opt/jetty -**Create a user called jetty:** +**创建一个jetty用户：** useradd -m jetty -**Change the ownership of jetty:** +**改变jetty文件夹的所属用户:** chown -R jetty:jetty /opt/jetty/ -**Make a Symlink jetty.sh to /etc/init.d directory to create a start up script file:** +**为jetty.sh创建一个软链接到 /etc/init.d directory 来创建一个启动脚本文件：** ln -s /opt/jetty/bin/jetty.sh /etc/init.d/jetty -**Add script:** +**添加脚本：** chkconfig --add jetty -**Make the jetty web server auto starts on system boot:** +**是jetty在系统启动时启动：** chkconfig --level 345 jetty on -**Open /etc/default/jetty in your favorite editor and replace port and listening address desired value:** +**使用你最喜欢的文本编辑器打开 /etc/default/jetty 并修改端口和监听地址：** vi /etc/default/jetty @@ -54,24 +52,24 @@ This article explains ‘How to install jetty web server in your CentOS server JETTY_HOST=50.116.24.78 JETTY_LOGS=/opt/jetty/logs/ -**We finished the installation, Now you have to start the jetty service.** +**我们完成了安装，现在可以启动jetty服务了 ** service jetty start -All done! +完成了！ -Now you can access jetty web sever in **http://:8080** +现在你可以在 **http://:8080** 中访问了 -That’s it! +就是这样。 -Cheers!! +干杯！！ -------------------------------------------------------------------------------- via: http://www.unixmen.com/install-jetty-web-server-centos-7/ 作者：[Jijo][a] -译者：[译者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/) 荣誉推出 From 8bd4ee503f0540e33a4887e85997e77c2c62b8d2 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 11:35:50 +0800 Subject: [PATCH 080/207] Rename sources/tech/20150127 Install Jetty Web Server On CentOS 7.md to sources/translated/20150127 Install Jetty Web Server On CentOS 7.md --- .../20150127 Install Jetty Web Server On CentOS 7.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sources/{tech => translated}/20150127 Install Jetty Web Server On CentOS 7.md (100%) diff --git a/sources/tech/20150127 Install Jetty Web Server On CentOS 7.md b/sources/translated/20150127 Install Jetty Web Server On CentOS 7.md similarity index 100% rename from sources/tech/20150127 Install Jetty Web Server On CentOS 7.md rename to sources/translated/20150127 Install Jetty Web Server On CentOS 7.md From de548c0edf1e8332f34d02ed866d1906552e5f13 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 28 Jan 2015 11:42:32 +0800 Subject: [PATCH 081/207] =?UTF-8?q?20150128-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... The top 10 rookie open source projects.md | 153 ++++++++++++++++++ ...s Point Signal Strength With wifi-linux.md | 86 ++++++++++ 2 files changed, 239 insertions(+) create mode 100644 sources/talk/20150128 The top 10 rookie open source projects.md create mode 100644 sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md diff --git a/sources/talk/20150128 The top 10 rookie open source projects.md b/sources/talk/20150128 The top 10 rookie open source projects.md new file mode 100644 index 0000000000..0dfcb07a48 --- /dev/null +++ b/sources/talk/20150128 The top 10 rookie open source projects.md @@ -0,0 +1,153 @@ +The top 10 rookie open source projects +================================================================================ +Black Duck presents its Open Source Rookies of the Year -- the 10 most exciting, active new projects germinated by the global open source community + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_01-100564902-orig.jpeg) + +### Open Source Rookies of the Year ### + +Each year sees the start of thousands of new open source projects. Only a handful gets real traction. Some projects gain momentum by building on existing, well-known technologies; others truly break new ground. Many projects are created to solve a simple development problem, while others begin with loftier intentions shared by like-minded developers around the world. + +Since 2009, the open source software logistics company Black Duck has identified the [Open Source Rookies of the Year][1], based on activity tracked by its [Open Hub][2] (formerly Ohloh) site. This year, we're delighted to present 10 winners and two honorable mentions for 2015, selected from thousands of open source projects. Using a weighted scoring system, points were awarded based on project activity, the pace of commits, and several other factors. + +Open source has become the industry's engine of innovation. This year, for example, growth in projects related to Docker containerization trumped every other rookie area -- and not coincidentally reflected the most exciting area of enterprise technology overall. At the very least, the projects described here provide a window on what the global open source developer community is thinking, which is fast becoming a good indicator of where we're headed. + +### 2015 Open Source Rookie of the Year: DebOps ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_02-100564903-orig.jpeg) + +[DebOps][3] is a collection of [Ansible][4] playbooks and roles, scalable from one container to an entire data center. Founder Maciej Delmanowski open-sourced DebOps to ensure his work outlived his current work environment and could grow in strength and depth from outside contributors. + +DebOps began at a small university in Poland that ran its own data center, where everything was configured by hand. Crashes sometimes led to days of downtime -- and Delmanowski realized that a configuration management system was needed. Starting with a Debian base, DebOps is a group of Ansible playbooks that configure an entire data infrastructure. The project has been implemented in many different working environments, and the founders plan to continue supporting and improving it as time goes on. + +### 2015 Open Source Rookie of the Year: Code Combat ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_03-100564904-gallery.idge.jpg) + +The traditional pen-and-paper way of learning falls short for technical subjects. Games, however, are all about engagement -- which is why the founders of [CodeCombat][5] went about creating a multiplayer programming game to teach people how to code. + +At its inception, CodeCombat was an idea for a startup, but the founders decided to create an open source project instead. The idea blossomed within the community, and the project gained contributors at a steady rate. A mere two months after its launch, the game was accepted into Google’s Summer of Code. The game reaches a broad audience and is available in 45 languages. CodeCombat hopes to become the standard for people who want to learn to code and have fun at the same time. + +### 2015 Open Source Rookie of the Year: Storj ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_04-100564905-gallery.idge.jpg) + +[Storj][6] is a peer-to-peer cloud storage network that implements end-to-end encryption, enabling users to transfer and share data without reliance on a third party. Based on bitcoin blockchain technology and peer-to-peer protocols, Storj provides secure, private, and encrypted cloud storage. + +Opponents of cloud-based data storage worry about cost efficiencies and vulnerability to attack. Intended to address both concerns, Storj is a private cloud storage marketplace where space is purchased and traded via Storjcoin X (SJCX). Files uploaded to Storj are shredded, encrypted, and stored across the community. File owners are the sole individuals who possess keys to the encrypted information. + +The proof of concept for this decentralized cloud storage marketplace was first presented at the Texas Bitcoin Conference Hackathon in 2014. After winning first place in the hackathon, the project founders and leaders used open forums, Reddit, bitcoin forums, and social media to grow an active community, now an essential part of the Storj decision-making process. + +### 2015 Open Source Rookie of the Year: Neovim ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_05-100564906-orig.jpg) + +Since its inception in 1991, Vim has been a beloved text editor adopted by millions of software developers. [Neovim][6] is the next generation. + +The software development ecosystem has experienced exponential growth and innovation over the past 23 years. Neovim founder Thiago de Arruda knew that Vim was lacking in modern-day features and development speed. Although determined to preserve the signature features of Vim, the community behind Neovim seeks to improve and evolve the technology of its favorite text editor. Crowdfunding initially enabled de Arruda to focus six uninterrupted months on launching this endeavor. He credits the Neovim community for supporting the project and for inspiring him to continue contributing. + +### 2015 Open Source Rookie of the Year: CockroachDB ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_06-100564907-orig.jpg) + +Former Googlers are bringing a big-company data solution to open source in the form of [CockroachDB][8], a scalable, geo-replicated, transactional data store. + +To maintain the terabytes of data transacted over its global online properties, Google developed Spanner. This powerful tool provides Google with scalability, survivability, and transactionality -- qualities that the team behind CockroachDB is serving up to the open source community. Like an actual cockroach, CockroachDB can survive without its head, tolerating the failure of any node. This open source project has a devoted community of experienced contributors, actively cultivated by the founders via social media, GitHub, networking, conferences, and meet-ups. + +### 2015 Open Source Rookie of the Year: Kubernetes ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_07-100564908-orig.jpg) + +In introducing containerized software development to the open source community, [Docker][9] has become the backbone of a strong, innovative set of tools and technologies. [Kubernetes][10], which Google introduced last June, is an open source container management tool used to accelerate development and simplify operations. + +Google has been using containers for years in its internal operations. At the summer 2014 DockerCon, the Internet giant open-sourced Kubernetes, which was developed to meet the needs of the exponentially growing Docker ecosystem. Through collaborations with other organizations and projects, such as Red Hat and CoreOS, Kubernetes project managers have grown their project to be the No. 1 downloaded tool on the Docker Hub. The Kubernetes team hopes to expand the project and grow the community, so software developers can spend less time managing infrastructure and more time building the apps they want. + +### 2015 Open Source Rookie of the Year: Open Bazaar ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_08-100564909-orig.jpg) + +[OpenBazaar][11] is a decentralized marketplace for trading with anyone using bitcoin. The proof of concept for OpenBazaar was born at a hackathon, where its founders combined BitTorent, bitcoin, and traditional financial server methodologies to create a censorship-resistant trading platform. The OpenBazaar team sought new members, and before long they were able to expand the OpenBazaar community immensely. The table stakes of OpenBazaar -- transparency and a common goal to revolutionize trade and commerce -- are helping founders and contributors work toward a real-world, uncontrolled, and decentralized marketplace. + +### 2015 Open Source Rookie of the Year: IPFS ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_09-100564910-orig.jpg) + +[IPFS (InterPlanetary File System)][12] is a global, versioned, peer-to-peer file system.It synthesizes many of the ideas behind Git, BitTorrent, and HTTP to bring a new data and data structure transport protocol to the open Web. + +Open source is known for developing simple solutions to complex problems that result in many innovations, but these powerful projects represent only one slice of the open source community. IFPS belong to a more radical group whose proof of concept seems daring, outrageous, and even unattainable -- in this case, a peer-to-peer distributed file system that seeks to connect all computing devices. This possible HTTP replacement maintains a community through multiple mediums, including the Git community and an IRC channel that has more than 100 current contributors. This “crazy” idea will be available for alpha testing in 2015. + +### 2015 Open Source Rookie of the Year: cAdvisor ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_10-100564911-orig.jpg) + +[cAdvisor (Container Advisor)][13] is a daemon that collects, aggregates, processes, and exports information about running containers, providing container users with an understanding of resource usage and performance characteristics. For each container, cAdvisor keeps resource isolation parameters, historical resource usage, histograms of complete historical resource usage, and network statistics. This data is exported by container and across machines. + +cAdvisor can run on most Linux distros and supports many container types, including Docker. It has become the de facto monitoring agent for containers, has been integrated into many systems, and is one of the most downloaded images on the Docker Hub. The team hopes to grow cAdvisor to understand application performance more deeply and to integrate this information into clusterwide systems. + +### 2015 Open Source Rookie of the Year: Terraform ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_11-100564912-orig.jpg) + +[Terraform][14] provides a common configuration to launch infrastructure, from physical and virtual servers to email and DNS providers. The idea is to encompass everything from custom in-house solutions to services offered by public cloud platforms. Once launched, Terraform enables ops to change infrastructure safely and efficiently as the configuration evolves. + +Working at a devops company, Terraform.io's founders identified a pain point in codifying the knowledge required to build a complete data center, from plugged-in servers to a fully networked and functional data center. Infrastructure is described using a high-level configuration syntax, which allows a blueprint of your data center to be versioned and treated as you would any other code. Sponsorship from the well-respected open source company HashiCorp helped launch the project. + +### Honorable mention: Docker Fig ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_12-100564913-orig.jpg) + +[Fig][15] provides fast, isolated development environments using [Docker][16]. It moves the configuration required to orchestrate Docker into a simple fig.yml file. It handles all the work of building and running containers and forwarding their ports, as well as sharing volumes and linking them. + +Orchard formed Fig last year to create a new system of tools to make Docker work. It was developed as a way of setting up development environments with Docker, enabling users to define the exact environment for their apps, while also running databases and caches inside Docker. Fig solved a major pain point for developers. Docker fully supports this open source project and [recently purchased Orchard][17] to expand the reach of Fig. + +### Honorable mention: Drone ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_13-100564916-orig.jpg) + +[Drone][18] is a Continuous Integration platform built on Docker and [written in Go][19]. The Drone project grew out of frustration with existing available technologies and processes for setting up development environments. + +Drone provides a simple approach to automated testing and continuous delivery: Simply pick a Docker image tailored to your needs, connect GitHub, and commit. Drone uses Docker containers to provision isolated testing environments, giving every project complete control over its stack without the burden of traditional server administration. The community behind Drone is 100 contributors strong and hopes to bring this project to the enterprise and to mobile app development. + +### Open source rookies ### + +![](http://images.techhive.com/images/article/2015/01/open_source_rookies_14-100564941-orig.jpg) + +- [Open Source Rookies of the 2014 Year][20] +- [InfoWorld's 2015 Technology of the Year Award winners][21] +- [Bossies: The Best of Open Source Software Awards][22] +- [15 essential open source tools for Windows admins][23] + +-------------------------------------------------------------------------------- + +via: http://www.infoworld.com/article/2875439/open-source-software/the-top-10-rookie-open-source-projects.html + +作者：[Black Duck Software][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.infoworld.com/author/Black-Duck-Software/ +[1]:https://www.blackducksoftware.com/open-source-rookies +[2]:https://www.openhub.net/ +[3]:https://github.com/debops/debops +[4]:http://www.infoworld.com/article/2612397/data-center/review--ansible-orchestration-is-a-veteran-unix-admin-s-dream.html +[5]:https://codecombat.com/ +[6]:http://storj.io/ +[7]:http://neovim.org/ +[8]:https://github.com/cockroachdb/cockroach +[9]:http://www.infoworld.com/resources/16373/application-virtualization/the-beginners-guide-to-docker +[10]:http://kubernetes.io/ +[11]:https://openbazaar.org/ +[12]:http://ipfs.io/ +[13]:https://github.com/google/cadvisor +[14]:https://www.terraform.io/ +[15]:http://www.fig.sh/ +[16]:http://www.infoworld.com/resources/16373/application-virtualization/the-beginners-guide-to-docker +[17]:http://www.infoworld.com/article/2608546/application-virtualization/docker-acquires-orchard-in-a-sign-of-rising-ambitions.html +[18]:https://drone.io/ +[19]:http://www.infoworld.com/article/2683845/google-go/164121-Fast-guide-to-Go-programming.html +[20]:https://www.blackducksoftware.com/open-source-rookies +[21]:http://www.infoworld.com/article/2871935/application-development/infoworlds-2015-technology-of-the-year-award-winners.html +[22]:http://www.infoworld.com/article/2688104/open-source-software/article.html +[23]:http://www.infoworld.com/article/2854954/microsoft-windows/15-essential-open-source-tools-for-windows-admins.html \ No newline at end of file diff --git a/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md b/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md new file mode 100644 index 0000000000..d652b15d8c --- /dev/null +++ b/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md @@ -0,0 +1,86 @@ +How To Monitor Access Point Signal Strength With wifi-linux +================================================================================ +As a python geek I love exploring new python tools on github that target the linux users. Today I discovered a simple application written in python programming language that can be used to monitor access point signal strength. + +I have been experimenting for about two hours with **wifi-linux** and it works great but I would like to see some unittests in the near future from the author as the command **plot** is not working on my machine and is also causing some errors. + +### What is wifi-linux ### + +According to the official readme.md file on author's github account wifi-linux is a very simple python script which collects RSSI information about wifi access points around you and draws graphics showing RSSI activity. + +The author states that the program also draws RSSI activity graphic and this can be generated with the command plot but unfortunetly it is not working for me. wifi-linux supports other commands such as **bp** to add a breakpoint, **print** to print some statistics and **start changer**. + +The wifi-linux application has the folowing dependencies: + +- dbus-python +- gnuplot-py + +So first we have to install all the package dependencies for our project in order to run it in our linux machine. + +### Install pakages required by wifi-linux ### + +I tried to install python-dbus by using the pip tool which is used to manage python packages but it did not work and the reason for this is that pip looks for setup.py, which dbus-python doesn't have. So the following command is not going to work. + + pip install dbus-python + +And to make sure it does not work give it a try. It is a very high probability that you will get the following error displayed on your console. + + IOError: [Errno 2] No such file or directory: '/tmp/pip_build_oltjano/dbus-python/setup.py' + +How did I manage to solve this problem? It is very simple. I installed the the system package for the Python DBUS bindings using the following command. + + sudo apt-get install python-dbus + +The above command will work only in machines that make use of the apt-get package manager such as Debian and Ubuntu. + +Then the second dependency we have to take care is the gnuplot-py. Download it, extract using the tar utility and then run setup.py install to install the python package. + +First step is to download gnuplot-py. + + wget http://prdownloads.sourceforge.net/gnuplot-py/gnuplot-py-1.8.tar.gz + +Then use the tar utility to extract it. + + tar xvf gnuplot-py-1.8.tar.gz + +Then use the cd command to change directory. + + cd gnuplot-py-1.8 + +Once there then run the following command to install the package gunplot-py on your system. + + sudo setup.py install + +Once the installation is finished you are ready to run the wifi-linux on your machine. Just download it and use the following command to run the script. + +Download wifi-linux on your local machine by using the following command. + + wget https://github.com/dixel/wifi-linux/archive/master.zip + +Extract the master.zip archive and then use the following command to run the python script list_rsssi.py + + python list_rssi.py + +The following screenshot shows wifi-linux in action. + +![wifi-linux to monitor wifi signal strength](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux.png) + +Then the command **bp** is executed to add a breakpoint like shown below. + +![the bp command in wifi-linux](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux2.png) + +The command **print** can be used to display stats on the console of your machine. An example of its usage is shown below. + +![the print command](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux3.png) + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-how-to/monitor-access-point-signal-strength-wifi-linux/ + +作者：[Oltjano Terpollari][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/oltjano/ \ No newline at end of file From 3d2f5499edb81cdf61c7415246495c0458f9a577 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 12:19:38 +0800 Subject: [PATCH 082/207] Rename sources/translated/20150127 Install Jetty Web Server On CentOS 7.md to translated/tech/20150127 Install Jetty Web Server On CentOS 7.md --- .../tech}/20150127 Install Jetty Web Server On CentOS 7.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {sources/translated => translated/tech}/20150127 Install Jetty Web Server On CentOS 7.md (100%) diff --git a/sources/translated/20150127 Install Jetty Web Server On CentOS 7.md b/translated/tech/20150127 Install Jetty Web Server On CentOS 7.md similarity index 100% rename from sources/translated/20150127 Install Jetty Web Server On CentOS 7.md rename to translated/tech/20150127 Install Jetty Web Server On CentOS 7.md From d41d49ab7e0d1a0bfb023e36b53d5cbc034e84b4 Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Wed, 28 Jan 2015 12:49:31 +0800 Subject: [PATCH 083/207] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0150126 Data of 20 Million Users Stolen from Dating Website.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {translated/news => published}/20150126 Data of 20 Million Users Stolen from Dating Website.md (100%) diff --git a/translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md b/published/20150126 Data of 20 Million Users Stolen from Dating Website.md similarity index 100% rename from translated/news/20150126 Data of 20 Million Users Stolen from Dating Website.md rename to published/20150126 Data of 20 Million Users Stolen from Dating Website.md From a43c57cda8eec9586de5644ee58b58ec1013e23b Mon Sep 17 00:00:00 2001 From: geekpi Date: Tue, 27 Jan 2015 23:57:15 -0500 Subject: [PATCH 084/207] add a file for PR#2296 --- ...nstall ixgbe driver on Ubuntu or Debian.md | 144 ++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md diff --git a/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md b/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md new file mode 100644 index 0000000000..aab015201e --- /dev/null +++ b/translated/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md @@ -0,0 +1,144 @@ +Linux 有问必答： 如何在Ubuntu或者Debian中下载和安装ixgbe驱动 +================================================================================ +> **提问**： 我想为我的Intel 10G网卡下载安装最新的ixgbe。我该如何在Ubuntu（或者Debian）中安装ixgbe驱动？ + +Intel的10G网卡（比如，82598、 82599、 x540）由ixgbe驱动支持。现代的Linux发版已经将ixgbe作为一个可加载模块。然而，有些情况你不想要你机器上的已经编译和安装的ixgbe驱动。比如，你想要体验ixbge驱动的最新特性。同样，自带内核中的ixgbe中的一个默认问题是不允许你自定义旭东内核参数。如果你想要完全自动一ixgbe驱动（比如 RSS、多队列、中断阈值等等），你需要手动从源码编译ixgbe驱动。 + +这里是如何在Ubuntu、Debian或者它们的衍生版中下载安装ixgbe驱动。 + +### 第一步： 安装前提 ### + +安装之前，需要安装匹配的内核头文件和开发工具包。 + + $ sudo apt-get install linux-headers-$(uname -r) + $ sudo apt-get install gcc make + +### 第二步： 编译Ixgbe驱动 ### + +从[最新的ixgbe驱动][1]中下载源码。 + + $ wget http://sourceforge.net/projects/e1000/files/ixgbe%20stable/3.23.2/ixgbe-3.23.2.tar.gz + +如下编译ixgbe驱动。 + + $ tar xvfvz ixgbe-3.23.2.tar.gz + $ cd ixgbe-3.23.2/src + $ make + +### 第三步： 检查Ixgbe驱动 ### + +编译之后，你会看到在ixgbe-3.23.2/src目录下创建了**ixgbe.ko**。这就是会加载到内核之中的ixgbe驱动。 + +用modinfo命令检查内核模块的信息。注意你需要指定模块的绝对路径（比如 ./ixgbe.ko 或者 /home/xmodulo/ixgbe/ixgbe-3.23.2/src/ixgbe.ko）。输出中会显示ixgbe内核的版本。 + + $ modinfo ./ixgbe.ko + +---------- + + filename: /home/xmodulo/ixgbe/ixgbe-3.23.2/src/ixgbe.ko + version: 3.23.2 + license: GPL + description: Intel(R) 10 Gigabit PCI Express Network Driver + author: Intel Corporation, + srcversion: 2ADA5E537923E983FA9DAE2 + alias: pci:v00008086d00001560sv*sd*bc*sc*i* + alias: pci:v00008086d00001558sv*sd*bc*sc*i* + alias: pci:v00008086d0000154Asv*sd*bc*sc*i* + alias: pci:v00008086d00001557sv*sd*bc*sc*i* + alias: pci:v00008086d0000154Fsv*sd*bc*sc*i* + alias: pci:v00008086d0000154Dsv*sd*bc*sc*i* + alias: pci:v00008086d00001528sv*sd*bc*sc*i* + alias: pci:v00008086d000010F8sv*sd*bc*sc*i* + alias: pci:v00008086d0000151Csv*sd*bc*sc*i* + alias: pci:v00008086d00001529sv*sd*bc*sc*i* + alias: pci:v00008086d0000152Asv*sd*bc*sc*i* + alias: pci:v00008086d000010F9sv*sd*bc*sc*i* + alias: pci:v00008086d00001514sv*sd*bc*sc*i* + alias: pci:v00008086d00001507sv*sd*bc*sc*i* + alias: pci:v00008086d000010FBsv*sd*bc*sc*i* + alias: pci:v00008086d00001517sv*sd*bc*sc*i* + alias: pci:v00008086d000010FCsv*sd*bc*sc*i* + alias: pci:v00008086d000010F7sv*sd*bc*sc*i* + alias: pci:v00008086d00001508sv*sd*bc*sc*i* + alias: pci:v00008086d000010DBsv*sd*bc*sc*i* + alias: pci:v00008086d000010F4sv*sd*bc*sc*i* + alias: pci:v00008086d000010E1sv*sd*bc*sc*i* + alias: pci:v00008086d000010F1sv*sd*bc*sc*i* + alias: pci:v00008086d000010ECsv*sd*bc*sc*i* + alias: pci:v00008086d000010DDsv*sd*bc*sc*i* + alias: pci:v00008086d0000150Bsv*sd*bc*sc*i* + alias: pci:v00008086d000010C8sv*sd*bc*sc*i* + alias: pci:v00008086d000010C7sv*sd*bc*sc*i* + alias: pci:v00008086d000010C6sv*sd*bc*sc*i* + alias: pci:v00008086d000010B6sv*sd*bc*sc*i* + depends: ptp,dca + vermagic: 3.11.0-19-generic SMP mod_unload modversions + parm: InterruptType:Change Interrupt Mode (0=Legacy, 1=MSI, 2=MSI-X), default IntMode (deprecated) (array of int) + parm: IntMode:Change Interrupt Mode (0=Legacy, 1=MSI, 2=MSI-X), default 2 (array of int) + parm: MQ:Disable or enable Multiple Queues, default 1 (array of int) + parm: DCA:Disable or enable Direct Cache Access, 0=disabled, 1=descriptor only, 2=descriptor and data (array of int) + parm: RSS:Number of Receive-Side Scaling Descriptor Queues, default 0=number of cpus (array of int) + parm: VMDQ:Number of Virtual Machine Device Queues: 0/1 = disable, 2-16 enable (default=8) (array of int) + parm: max_vfs:Number of Virtual Functions: 0 = disable (default), 1-63 = enable this many VFs (array of int) + parm: VEPA:VEPA Bridge Mode: 0 = VEB (default), 1 = VEPA (array of int) + parm: InterruptThrottleRate:Maximum interrupts per second, per vector, (0,1,956-488281), default 1 (array of int) + parm: LLIPort:Low Latency Interrupt TCP Port (0-65535) (array of int) + parm: LLIPush:Low Latency Interrupt on TCP Push flag (0,1) (array of int) + parm: LLISize:Low Latency Interrupt on Packet Size (0-1500) (array of int) + parm: LLIEType:Low Latency Interrupt Ethernet Protocol Type (array of int) + parm: LLIVLANP:Low Latency Interrupt on VLAN priority threshold (array of int) + parm: FdirPballoc:Flow Director packet buffer allocation level: + 1 = 8k hash filters or 2k perfect filters + 2 = 16k hash filters or 4k perfect filters + 3 = 32k hash filters or 8k perfect filters (array of int) + parm: AtrSampleRate:Software ATR Tx packet sample rate (array of int) + parm: FCoE:Disable or enable FCoE Offload, default 1 (array of int) + parm: LRO:Large Receive Offload (0,1), default 1 = on (array of int) + parm: allow_unsupported_sfp:Allow unsupported and untested SFP+ modules on 82599 based adapters, default 0 = Disable (array of int) + +### 第四步： 测试Ixgbe驱动 ### + +在测试新的模块之前，如果你内核中已存在旧版本ixgbe模块的话你需要先移除它。 + + $ sudo rmmod ixgbe + +接着使用insmod命令插入新编译的ixgbe模块。确保指定一个模块的绝对路径。 + + $ sudo insmod ./ixgbe.ko + +如果上面的命令成功运行，就不会显示任何的信息。 + +如果你需要，你可以尝试加入额外的参数。比如，设置RSS的队列数量为16： + + $ sudo insmod ./ixgbe.ko RSS=16 + +检查**/var/log/kern.log**来查看ixgbe驱动是否成功激活。查看日志中的“Intel(R) 10 Gigabit PCI Express Network Driver”。ixgbe的版本信息应该和之前的modinfo的显示应该相同。 + + Sep 18 14:48:52 spongebob kernel: [684717.906254] Intel(R) 10 Gigabit PCI Express Network Driver - version 3.22.3 + +![](https://farm8.staticflickr.com/7583/16056721867_f06e152076_c.jpg) + +### 第五步： 安装Ixgbe驱动 ### + +一旦你验证新的ixgbe驱动已经成功家在，最后一步是在你的系统中安装驱动。 + + $ sudo make install + +**ixgbe.ko** 接着会安装在/lib/modules//kernel/drivers/net/ethernet/intel/ixgbe 下。 + +这一步起，你可以用下面的modprobe命令加载ixgbe驱动了。注意你不必再指定绝对路径。 + + $ sudo modprobe ixgbe + +如果你希望在启动时家在ixgbe驱动，你可以在/etc/modules的最后加入“ixgbe”。 + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/download-install-ixgbe-driver-ubuntu-debian.html + +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://sourceforge.net/projects/e1000/files/ixgbe%20stable/ From e3b73270a102d2fdbadc3e12b4ba34c06d28f593 Mon Sep 17 00:00:00 2001 From: bazz2 Date: Wed, 28 Jan 2015 13:56:16 +0800 Subject: [PATCH 085/207] [translated by bazz2]Linux Namespace --- translated/tech/20141204 Linux Namespaces.md | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/translated/tech/20141204 Linux Namespaces.md b/translated/tech/20141204 Linux Namespaces.md index 4d81eddcb9..aae091f29c 100644 --- a/translated/tech/20141204 Linux Namespaces.md +++ b/translated/tech/20141204 Linux Namespaces.md @@ -101,18 +101,18 @@ Linux nobody 5 0.0 0.0 2784 1064 pts/1 R+ 21:21 0:00 ps auxw nobody@w:~/pen/tmp$ -Notice that the UID and GID are set to that of nobody and nogroup. Specifically notice that the full ps output shows only two running processes and that their PIDs are 1 and 5 respectively. Now, let's move on to using ip netns to work with network namespaces. First, let's confirm that no namespaces exist currently: +עĽUID GID ó nobody nogroup ˣر ps ֻ̣ǵ ID ֱ15LCTTעĽ CLONE_NEWPID ʱᵽĹܣ߳ڵռڣ ID Ϊ1ӳ䵽ռ65534ռ ID Ϊ1Ľһֱ initֵʹ ip netns ռ䡣һȷǰϵͳûռ䣺 root@w:~# ip netns list Object "netns" is unknown, try "ip help". -In this case, either ip needs an upgrade, or the kernel does. Assuming you have a kernel newer than 2.6.24, it's most likely **ip**. After upgrading, **ip netns list** should by default return nothing. Let's add a new namespace called 'ns1': +£ҪϵͳںˣԼ ip ߡں˰2.6.24ip ߰汾Ҳ࣬2.6.24LCTTעip iproute װṩ˰װ汾ں˰汾ºú**ip netns list** ûռڵ²ϢӸΪns1ռ俴 root@w:~# ip netns add ns1 root@w:~# ip netns list ns1 -First, let's list the current interfaces: +г root@w:~# ip link list 1: lo: mtu 65536 qdisc noqueue state UNKNOWN mode DEFAULT @@ -120,7 +120,7 @@ First, let's list the current interfaces: 2: eth0: mtu 1500 qdisc pfifo_fast state UNKNOWN mode DEFAULT qlen 1000 link/ether 00:0c:29:65:25:9e brd ff:ff:ff:ff:ff:ff -Now to create a new virtual interface, and add it to our new namespace. Virtual interfaces are created in pairs, and are linked to each other - imagine a virtual crossover cable: +µӵռ䡣ҪɶԴ뽻°ɣ root@w:~# ip link add veth0 type veth peer name veth1 root@w:~# ip link list @@ -133,9 +133,9 @@ Now to create a new virtual interface, and add it to our new namespace. Virtual 4: veth0: mtu 1500 qdisc noop state DOWN mode DEFAULT qlen 1000 link/ether f2:f7:5e:e2:22:ac brd ff:ff:ff:ff:ff:ff -**ifconfig** -a will also now show the addition of both veth0 and veth1. +ʱ **ifconfig** -a Ҳʾӵ veth0 veth1 -Great, now to assign our new interfaces to the namespace. Note that ip **netns exec** is used to execute commands within the namespace: +ܺãڽݿӵռȥעһ£ ip **netns exec** ڽռִУLCTTעĽʾ ns1 ռУֻ lo veth1 root@w:~# ip link set veth1 netns ns1 root@w:~# ip netns exec ns1 ip link list @@ -144,21 +144,21 @@ Great, now to assign our new interfaces to the namespace. Note that ip **netns e 3: veth1: mtu 1500 qdisc noop state DOWN mode DEFAULT qlen 1000 link/ether d2:e9:52:18:19:ab brd ff:ff:ff:ff:ff:ff -**ifconfig** -a will now only show veth0, as veth1 is in the ns1 namespace. +ʱ **ifconfig** -a ֻʾ veth0ʾ veth1Ϊ ns1 ռС -Should we want to delete veth0/veth1: +ɾ veth1ִ ip netns exec ns1 ip link del veth1 -We can now assign IP address 192.168.5.5/24 to veth0 on our host: +Ϊ veth0 IP ַ ifconfig veth0 192.168.5.5/24 -And assign veth1 192.168.5.10/24 within ns1: +ռΪ veth1 IP ַ ip netns exec ns1 ifconfig veth1 192.168.5.10/24 up -To execute ip addr **list** on both our host and within our namespace: +ռִ ip addr **list**  root@w:~# ip addr list 1: lo: mtu 65536 qdisc noqueue state UNKNOWN @@ -185,7 +185,7 @@ To execute ip addr **list** on both our host and within our namespace: inet6 fe80::10bd:b6ff:fe76:a6eb/64 scope link valid_lft forever preferred_lft forever -To view routing tables inside and outside of the namespace: +ռ鿴·ɱ root@w:~# ip route list default via 192.168.3.1 dev eth0 proto static @@ -194,7 +194,7 @@ To view routing tables inside and outside of the namespace: root@w:~# ip netns exec ns1 ip route list 192.168.5.0/24 dev veth1 proto kernel scope link src 192.168.5.10 -Lastly, to connect our physical and virtual interfaces, we'll require a bridge. Let's bridge eth0 and veth0 on the host, and then use DHCP to gain an IP within the ns1 namespace: +󣬽ϣҪõŽӡǽ veth0 Žӵ eth0 ns1 ռʹ DHCP Զȡ IP ַ root@w:~# brctl addbr br0 root@w:~# brctl addif br0 eth0 @@ -209,7 +209,7 @@ Lastly, to connect our physical and virtual interfaces, we'll require a bridge. inet6 fe80::20c:29ff:fe65:259e/64 scope link valid_lft forever preferred_lft forever -br0 has been assigned an IP of 192.168.3.122/24. Now for the namespace: +Ϊ br0 IP ַΪ192.168.3.122/24Ϊռַ root@w:~# ip netns exec ns1 dhclient veth1 root@w:~# ip netns exec ns1 ip addr list @@ -221,17 +221,17 @@ br0 has been assigned an IP of 192.168.3.122/24. Now for the namespace: inet6 fe80::10bd:b6ff:fe76:a6eb/64 scope link valid_lft forever preferred_lft forever -Excellent! veth1 has been assigned 192.168.3.248/24 +ڣ veth1 IP ó 192.168.3.248/24 ˡ -------------------------------------------------------------------------------- via: http://www.howtoforge.com/linux-namespaces -作者：[aziods][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) +ߣ[aziods][a] +ߣ[bazz2](https://github.com/bazz2) +Уԣ[УID](https://github.com/УID) -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + [LCTT](https://github.com/LCTT/TranslateProject) ԭ룬[Linuxй](http://linux.cn/) Ƴ [a]:http://www.howtoforge.com/forums/private.php?do=newpm&u=138952 [1]:http://en.wikipedia.org/wiki/LXC From f8d13bbc415c8cb4e88329eb2e180b1b4240f9d1 Mon Sep 17 00:00:00 2001 From: bazz2 Date: Wed, 28 Jan 2015 14:10:07 +0800 Subject: [PATCH 086/207] [gbk->utf-8]Linux Namespaces --- translated/tech/20141204 Linux Namespaces.md | 72 ++++++++++---------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/translated/tech/20141204 Linux Namespaces.md b/translated/tech/20141204 Linux Namespaces.md index aae091f29c..522131a50b 100644 --- a/translated/tech/20141204 Linux Namespaces.md +++ b/translated/tech/20141204 Linux Namespaces.md @@ -1,32 +1,32 @@ -Linux ռ +Linux 命名空间 ================================================================================ -### ### +### 背景 ### -2.6.24ں˿ʼLinux ֧6ֲͬ͵ռ䡣ǵij֣ʹûĽܹϵͳøӳףӶҪ̫ײ⻯ +从2.6.24版的内核开始，Linux 就支持6种不同类型的命名空间。它们的出现，使用户创建的进程能够与系统分离得更加彻底，从而不需要考虑太多底层的虚拟化技术。 -- **CLONE_NEWIPC**: ̼ͨ(IPC)ռ䣬Խ SystemV IPC POSIX Ϣж -- **CLONE_NEWPID**: ID ռ䣬 ID ˼ռڵĽ ID ܻռĽ ID ͻռڵĽ ID ӳ䵽ռʱʹһ ID˵ռ ID Ϊ1Ḷ̌ռָ init ̡ -- **CLONE_NEWNET**: ռ䣬ڸԴ/proc/netIP ַ·ɵȣ̨̿ڲͬռڵͬ˿ϣûһ -- **CLONE_NEWNS**: ռ䣬ʱԽصϵͳ룬ʹʱǿԴﵽ chroot ĹܣڰȫԷ chroot ߡ -- **CLONE_NEWUTS**: UTS ռ䣬ҪĿǶϢNIS -- **CLONE_NEWUSER**: ûռ䣬ͬ ID һû ID ID ռDzһģڲͬռڿԴͬ ID +- **CLONE_NEWIPC**: 进程间通信(IPC)的命名空间，可以将 SystemV 的 IPC 和 POSIX 的消息队列独立出来。 +- **CLONE_NEWPID**: 进程 ID 的命名空间，进程 ID 独立，意思就是命名空间内的进程 ID 可能会与命名空间外的进程 ID 冲突，于是命名空间内的进程 ID 映射到命名空间外时会使用另外一个进程 ID。比如说，命名空间内 ID 为1的进程，在命名空间外就是指 init 进程。 +- **CLONE_NEWNET**: 网络命名空间，用于隔离网络资源（/proc/net、IP 地址、网卡、路由等）。后台进程可以运行在不同命名空间内的相同端口上，用户还可以虚拟出一块网卡。 +- **CLONE_NEWNS**: 挂载命名空间，进程运行时可以将挂载点与系统分离，使用这个功能时，我们可以达到 chroot 的功能，而在安全性方面比 chroot 更高。 +- **CLONE_NEWUTS**: UTS 命名空间，主要目的是独立出主机名和网络信息服务（NIS）。 +- **CLONE_NEWUSER**: 用户命名空间，同进程 ID 一样，用户 ID 和组 ID 在命名空间内外是不一样的，并且在不同命名空间内可以存在相同的 ID。 - C ԽΪʾռʱҪõ C ԡIJԹ Debian 6 Debian 7 ִСȣջڷһҳڴռ䣬ָָڴҳĩβʹ **alloca()** ڴ棬Ҫ malloc() ڴڶϡ +本文用 C 语言介绍上述概念，因为演示进程命名空间的时候需要用到 C 语言。下面的测试过程在 Debian 6 和 Debian 7 上执行。首先，在栈内分配一页内存空间，并将指针指向内存页的末尾。这里我们使用 **alloca()** 函数来分配内存，不要用 malloc() 函数，它会把内存分配在堆上。 void *mem = alloca(sysconf(_SC_PAGESIZE)) + sysconf(_SC_PAGESIZE); -Ȼʹ **clone()** ӽ̣ջռĵַ "mem"ԼָռıǡͬʱǻָcalleeΪӽеĺ +然后使用 **clone()** 函数创建子进程，传入栈空间的地址 "mem"，以及指定命名空间的标记。同时我们还指定“callee”作为子进程运行的函数。 mypid = clone(callee, mem, SIGCHLD | CLONE_NEWIPC | CLONE_NEWPID | CLONE_NEWNS | CLONE_FILES, NULL); -**clone** ֮Ҫڸеȴӽ˳Ļ̻ȥֱ̽ӽ̱ɹ¶̣ +**clone** 之后我们要在父进程中等待子进程先退出，否则的话，父进程会继续运行下去，直到进程结束，留下子进程变成孤儿进程： while (waitpid(mypid, &r, 0) < 0 && errno == EINTR) { continue; } -ӽ˳ǻص shell 档 +最后当子进程退出后，我们会回到 shell 界面。 if (WIFEXITED(r)) { @@ -34,7 +34,7 @@ Linux } return EXIT_FAILURE; -Ľܵ **callee** £ +上文介绍的 **callee** 函数功能如下： static int callee() { @@ -47,7 +47,7 @@ Linux return ret; } - **/proc** ļϵͳû ID IDֵΪuȻ **/bin/bash** [LXC][1] Dzϵͳ⻯ߣʹ cgroups ռԴķ롣ǰдһ𣬱uֵΪ65534 Debian ϵͳУǡnobody͡nogroup +程序挂载 **/proc** 文件系统，设置用户 ID 和组 ID，值都为“u”，然后运行 **/bin/bash** 程序，[LXC][1] 是操作系统级的虚拟化工具，使用 cgroups 和命名空间来完成资源的分离。现在我们把所有代码放在一起，变量“u”的值设为65534，在 Debian 系统中，这是“nobody”和“nogroup”： #define _GNU_SOURCE #include @@ -89,7 +89,7 @@ Linux return ret; } -ִĴ룺 +执行以下命令来运行上面的代码： root@w:~/pen/tmp# gcc -O -o ns.c -Wall -Werror -ansi -c89 ns.c root@w:~/pen/tmp# ./ns @@ -101,18 +101,18 @@ Linux nobody 5 0.0 0.0 2784 1064 pts/1 R+ 21:21 0:00 ps auxw nobody@w:~/pen/tmp$ -עĽUID GID ó nobody nogroup ˣر ps ֻ̣ǵ ID ֱ15LCTTעĽ CLONE_NEWPID ʱᵽĹܣ߳ڵռڣ ID Ϊ1ӳ䵽ռ65534ռ ID Ϊ1Ľһֱ initֵʹ ip netns ռ䡣һȷǰϵͳûռ䣺 +注意上面的结果，UID 和 GID 被设置成 nobody 和 nogroup 了，特别是 ps 工具只输出两个进程，它们的 ID 分别是1和5（LCTT注：这就是上文介绍 CLONE_NEWPID 时提到的功能，在线程所在的命名空间内，进程 ID 可以为1，映射到命名空间外就是65534；而命名空间外的 ID 为1的进程一直是 init）。接下来轮到使用 ip netns 来设置网络的命名空间。第一步先确定当前系统没有命名空间： root@w:~# ip netns list Object "netns" is unknown, try "ip help". -£ҪϵͳںˣԼ ip ߡں˰2.6.24ip ߰汾Ҳ࣬2.6.24LCTTעip iproute װṩ˰װ汾ں˰汾ºú**ip netns list** ûռڵ²ϢӸΪns1ռ俴 +这种情况下，你需要更新你的系统内核，以及 ip 工具。这里假设你的内核版高于2.6.24，ip 工具版本也差不多，高于2.6.24（LCTT注：ip 工具由 iproute 安装包提供，此安装包版本与内核版本相近）。更新好后，**ip netns list** 在没有命名空间存在的情况下不会输出任务信息。加个名为“ns1”的命名空间看看： root@w:~# ip netns add ns1 root@w:~# ip netns list ns1 -г +列出网卡： root@w:~# ip link list 1: lo: mtu 65536 qdisc noqueue state UNKNOWN mode DEFAULT @@ -120,7 +120,7 @@ Linux 2: eth0: mtu 1500 qdisc pfifo_fast state UNKNOWN mode DEFAULT qlen 1000 link/ether 00:0c:29:65:25:9e brd ff:ff:ff:ff:ff:ff -µӵռ䡣ҪɶԴ뽻°ɣ +创建新的虚拟网卡，加到命名空间。虚拟网卡需要成对创建，互相关联——想想交叉电缆吧： root@w:~# ip link add veth0 type veth peer name veth1 root@w:~# ip link list @@ -133,9 +133,9 @@ Linux 4: veth0: mtu 1500 qdisc noop state DOWN mode DEFAULT qlen 1000 link/ether f2:f7:5e:e2:22:ac brd ff:ff:ff:ff:ff:ff -ʱ **ifconfig** -a Ҳʾӵ veth0 veth1 +这个时候 **ifconfig** -a 命令也能显示新添加的 veth0 和 veth1 两块网卡。 -ܺãڽݿӵռȥעһ£ ip **netns exec** ڽռִУLCTTעĽʾ ns1 ռУֻ lo veth1 +很好，现在将这两份块网卡加到命名空间中去。注意一下，下面的 ip **netns exec** 命令用于将后面的命令在命名空间中执行（LCTT注：下面的结果显示了在 ns1 这个网络命名空间中，只存在 lo 和 veth1 两块网卡）： root@w:~# ip link set veth1 netns ns1 root@w:~# ip netns exec ns1 ip link list @@ -144,21 +144,21 @@ Linux 3: veth1: mtu 1500 qdisc noop state DOWN mode DEFAULT qlen 1000 link/ether d2:e9:52:18:19:ab brd ff:ff:ff:ff:ff:ff -ʱ **ifconfig** -a ֻʾ veth0ʾ veth1Ϊ ns1 ռС +这个时候 **ifconfig** -a 命令只能显示 veth0，不能显示 veth1，因为后者现在在 ns1 命名空间中。 -ɾ veth1ִ +如果想删除 veth1，可以执行下面的命令： ip netns exec ns1 ip link del veth1 -Ϊ veth0 IP ַ +为 veth0 分配 IP 地址： ifconfig veth0 192.168.5.5/24 -ռΪ veth1 IP ַ +在命名空间内为 veth1 分配 IP 地址： ip netns exec ns1 ifconfig veth1 192.168.5.10/24 up -ռִ ip addr **list**  +在命名空间内外执行 ip addr **list** 命令： root@w:~# ip addr list 1: lo: mtu 65536 qdisc noqueue state UNKNOWN @@ -185,7 +185,7 @@ Linux inet6 fe80::10bd:b6ff:fe76:a6eb/64 scope link valid_lft forever preferred_lft forever -ռ鿴·ɱ +在命名空间内外查看路由表： root@w:~# ip route list default via 192.168.3.1 dev eth0 proto static @@ -194,7 +194,7 @@ Linux root@w:~# ip netns exec ns1 ip route list 192.168.5.0/24 dev veth1 proto kernel scope link src 192.168.5.10 -󣬽ϣҪõŽӡǽ veth0 Žӵ eth0 ns1 ռʹ DHCP Զȡ IP ַ +最后，将虚拟网卡连到物理网卡上，我们需要用到桥接。这里做的是将 veth0 桥接到 eth0，而 ns1 命名空间内则使用 DHCP 自动获取 IP 地址： root@w:~# brctl addbr br0 root@w:~# brctl addif br0 eth0 @@ -209,7 +209,7 @@ Linux inet6 fe80::20c:29ff:fe65:259e/64 scope link valid_lft forever preferred_lft forever -Ϊ br0 IP ַΪ192.168.3.122/24Ϊռַ +为网桥 br0 分配的 IP 地址为192.168.3.122/24。接下来为命名空间分配地址： root@w:~# ip netns exec ns1 dhclient veth1 root@w:~# ip netns exec ns1 ip addr list @@ -221,17 +221,19 @@ Linux inet6 fe80::10bd:b6ff:fe76:a6eb/64 scope link valid_lft forever preferred_lft forever -ڣ veth1 IP ó 192.168.3.248/24 ˡ +现在， veth1 的 IP 被设置成 192.168.3.248/24 了。 -------------------------------------------------------------------------------- via: http://www.howtoforge.com/linux-namespaces -ߣ[aziods][a] -ߣ[bazz2](https://github.com/bazz2) -Уԣ[УID](https://github.com/УID) +作者：[aziods][a] +译者：[bazz2](https://github.com/bazz2) +校对：[校对者ID](https://github.com/校对者ID) - [LCTT](https://github.com/LCTT/TranslateProject) ԭ룬[Linuxй](http://linux.cn/) Ƴ +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://www.howtoforge.com/forums/private.php?do=newpm&u=138952 [1]:http://en.wikipedia.org/wiki/LXC + + From f4f61f060a02c449e8bd8149cb1e1976e797a70f Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 28 Jan 2015 14:20:08 +0800 Subject: [PATCH 087/207] PUB:20141008 How to configure HTTP load balancer with HAProxy on Linux @liaoishere --- ...TTP load balancer with HAProxy on Linux.md | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) rename {translated/tech => published}/20141008 How to configure HTTP load balancer with HAProxy on Linux.md (82%) diff --git a/translated/tech/20141008 How to configure HTTP load balancer with HAProxy on Linux.md b/published/20141008 How to configure HTTP load balancer with HAProxy on Linux.md similarity index 82% rename from translated/tech/20141008 How to configure HTTP load balancer with HAProxy on Linux.md rename to published/20141008 How to configure HTTP load balancer with HAProxy on Linux.md index 216483ab3c..bd7c865cda 100644 --- a/translated/tech/20141008 How to configure HTTP load balancer with HAProxy on Linux.md +++ b/published/20141008 How to configure HTTP load balancer with HAProxy on Linux.md @@ -1,18 +1,17 @@ -如何在 Linux 上使用 HAProxy 配置 HTTP 负载均衡器 +使用 HAProxy 配置 HTTP 负载均衡器 ================================================================================ -随着基于 Web 的应用和服务的增多，IT 系统管理员肩上的责任也越来越重。当遇到不可预期的事件如流量达到高峰，流量增大或者内部的挑战比如硬件的损坏或紧急维修，无论如何，你的 Web 应用都必须要保持可用性。甚至现在流行的 devops 和持续交付也可能威胁到你的 Web 服务的可靠性和性能的一致性。 +随着基于 Web 的应用和服务的增多，IT 系统管理员肩上的责任也越来越重。当遇到不可预期的事件如流量达到高峰，流量增大或者内部的挑战比如硬件的损坏或紧急维修，无论如何，你的 Web 应用都必须要保持可用性。甚至现在流行的 devops 和持续交付（CD）也可能威胁到你的 Web 服务的可靠性和性能的一致性。 -不可预测，不一直的性能表现是你无法接受的。但是我们怎样消除这些缺点呢？大多数情况下一个合适的负载均衡解决方案可以解决这个问题。今天我会给你们介绍如何使用 [HAProxy][1] 配置 HTTP 负载均衡器。 +不可预测，不一致的性能表现是你无法接受的。但是我们怎样消除这些缺点呢？大多数情况下一个合适的负载均衡解决方案可以解决这个问题。今天我会给你们介绍如何使用 [HAProxy][1] 配置 HTTP 负载均衡器。 ###什么是 HTTP 负载均衡？ ### -HTTP 负载均衡是一个网络解决方案，它将发入的 HTTP 或 HTTPs 请求分配至一组提供相同的 Web 应用内容的服务器用于响应。通过将请求在这样的多个服务器间进行均衡，负载均衡器可以防止服务器出现单点故障，可以提升整体的可用性和响应速度。它还可以让你能够简单的通过添加或者移除服务器来进行横向扩展或收缩，对工作负载进行调整。 +HTTP 负载均衡是一个网络解决方案，它将进入的 HTTP 或 HTTPs 请求分配至一组提供相同的 Web 应用内容的服务器用于响应。通过将请求在这样的多个服务器间进行均衡，负载均衡器可以防止服务器出现单点故障，可以提升整体的可用性和响应速度。它还可以让你能够简单的通过添加或者移除服务器来进行横向扩展或收缩，对工作负载进行调整。 ### 什么时候，什么情况下需要使用负载均衡？ ### 负载均衡可以提升服务器的使用性能和最大可用性，当你的服务器开始出现高负载时就可以使用负载均衡。或者你在为一个大型项目设计架构时，在前端使用负载均衡是一个很好的习惯。当你的环境需要扩展的时候它会很有用。 - ### 什么是 HAProxy？ ### HAProxy 是一个流行的开源的 GNU/Linux 平台下的 TCP/HTTP 服务器的负载均衡和代理软件。HAProxy 是单线程，事件驱动架构，可以轻松的处理 [10 Gbps 速率][2] 的流量，在生产环境中被广泛的使用。它的功能包括自动健康状态检查，自定义负载均衡算法，HTTPS/SSL 支持，会话速率限制等等。 @@ -24,13 +23,13 @@ HAProxy 是一个流行的开源的 GNU/Linux 平台下的 TCP/HTTP 服务器的 ### 准备条件 ### 你至少要有一台，或者最好是两台 Web 服务器来验证你的负载均衡的功能。我们假设后端的 HTTP Web 服务器已经配置好并[可以运行][3]。 -You will need at least one, or preferably two web servers to verify functionality of your load balancer. We assume that backend HTTP web servers are already [up and running][3]. + -### 在 Linux 中安装 HAProxy ### +## 在 Linux 中安装 HAProxy ## 对于大多数的发行版，我们可以使用发行版的包管理器来安装 HAProxy。 -#### 在 Debian 中安装 HAProxy #### +### 在 Debian 中安装 HAProxy ### 在 Debian Wheezy 中我们需要添加源，在 /etc/apt/sources.list.d 下创建一个文件 "backports.list" ，写入下面的内容 @@ -41,25 +40,25 @@ You will need at least one, or preferably two web servers to verify functionalit # apt­ get update # apt ­get install haproxy -#### 在 Ubuntu 中安装 HAProxy #### +### 在 Ubuntu 中安装 HAProxy ### # apt ­get install haproxy -#### 在 CentOS 和 RHEL 中安装 HAProxy #### +### 在 CentOS 和 RHEL 中安装 HAProxy ### # yum install haproxy -### 配置 HAProxy ### +## 配置 HAProxy ## 本教程假设有两台运行的 HTTP Web 服务器，它们的 IP 地址是 192.168.100.2 和 192.168.100.3。我们将负载均衡配置在 192.168.100.4 的这台服务器上。 为了让 HAProxy 工作正常，你需要修改 /etc/haproxy/haproxy.cfg 中的一些选项。我们会在这一节中解释这些修改。一些配置可能因 GNU/Linux 发行版的不同而变化，这些会被标注出来。 -#### 1. 配置日志功能 #### +### 1. 配置日志功能 ### 你要做的第一件事是为 HAProxy 配置日志功能，在排错时日志将很有用。日志配置可以在 /etc/haproxy/haproxy.cfg 的 global 段中找到他们。下面是针对不同的 Linux 发型版的 HAProxy 日志配置。 -**CentOS 或 RHEL:** +#### CentOS 或 RHEL:#### 在 CentOS/RHEL中启用日志，将下面的： @@ -82,7 +81,7 @@ You will need at least one, or preferably two web servers to verify functionalit # service rsyslog restart -**Debian 或 Ubuntu:** +####Debian 或 Ubuntu:#### 在 Debian 或 Ubuntu 中启用日志，将下面的内容 @@ -106,7 +105,7 @@ You will need at least one, or preferably two web servers to verify functionalit # service rsyslog restart -#### 2. 设置默认选项 #### +### 2. 设置默认选项 ### 下一步是设置 HAProxy 的默认选项。在 /etc/haproxy/haproxy.cfg 的 default 段中，替换为下面的配置： @@ -124,7 +123,7 @@ You will need at least one, or preferably two web servers to verify functionalit 上面的配置是当 HAProxy 为 HTTP 负载均衡时建议使用的，但是并不一定是你的环境的最优方案。你可以自己研究 HAProxy 的手册并配置它。 -#### 3. Web 集群配置 #### +### 3. Web 集群配置 ### Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡中的大多数设置都在这里。现在我们会创建一些基本配置，定义我们的节点。将配置文件中从 frontend 段开始的内容全部替换为下面的： @@ -141,14 +140,14 @@ Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡 server web01 192.168.100.2:80 cookie node1 check server web02 192.168.100.3:80 cookie node2 check -"listen webfarm *:80" 定义了负载均衡器监听的地址和端口。为了教程的需要，我设置为 "\*" 表示监听在所有接口上。在真实的场景汇总，这样设置可能不太合适，应该替换为可以从 internet 访问的那个网卡接口。 +"listen webfarm \*:80" 定义了负载均衡器监听的地址和端口。为了教程的需要，我设置为 "*" 表示监听在所有接口上。在真实的场景汇总，这样设置可能不太合适，应该替换为可以从 internet 访问的那个网卡接口。 stats enable stats uri /haproxy?stats stats realm Haproxy\ Statistics stats auth haproxy:stats -上面的设置定义了，负载均衡器的状态统计信息可以通过 http:///haproxy?stats 访问。访问需要简单的 HTTP 认证，用户名为 "haproxy" 密码为 "stats"。这些设置可以替换为你自己的认证方式。如果你不需要状态统计信息，可以完全禁用掉。 +上面的设置定义了，负载均衡器的状态统计信息可以通过 http://\/haproxy?stats 访问。访问需要简单的 HTTP 认证，用户名为 "haproxy" 密码为 "stats"。这些设置可以替换为你自己的认证方式。如果你不需要状态统计信息，可以完全禁用掉。 下面是一个 HAProxy 统计信息的例子 @@ -160,7 +159,7 @@ Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡 - **source**：对请求的客户端 IP 地址进行哈希计算，根据哈希值和服务器的权重将请求调度至后端服务器。 - **uri**：对 URI 的左半部分（问号之前的部分）进行哈希，根据哈希结果和服务器的权重对请求进行调度 - **url_param**：根据每个 HTTP GET 请求的 URL 查询参数进行调度，使用固定的请求参数将会被调度至指定的服务器上 -- **hdr(name**)：根据 HTTP 首部中的 字段来进行调度 +- **hdr(name**)：根据 HTTP 首部中的 \ 字段来进行调度 "cookie LBN insert indirect nocache" 这一行表示我们的负载均衡器会存储 cookie 信息，可以将后端服务器池中的节点与某个特定会话绑定。节点的 cookie 存储为一个自定义的名字。这里，我们使用的是 "LBN"，你可以指定其他的名称。后端节点会保存这个 cookie 的会话。 @@ -169,25 +168,25 @@ Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡 上面是我们的 Web 服务器节点的定义。服务器有由内部名称（如web01，web02），IP 地址和唯一的 cookie 字符串表示。cookie 字符串可以自定义，我这里使用的是简单的 node1，node2 ... node(n) -### 启动 HAProxy ### +## 启动 HAProxy ## 如果你完成了配置，现在启动 HAProxy 并验证是否运行正常。 -#### 在 Centos/RHEL 中启动 HAProxy #### +### 在 Centos/RHEL 中启动 HAProxy ### 让 HAProxy 开机自启，使用下面的命令 # chkconfig haproxy on # service haproxy start -当然，防火墙需要开放 80 端口，想下面这样 +当然，防火墙需要开放 80 端口，像下面这样 -**CentOS/RHEL 7 的防火墙** +####CentOS/RHEL 7 的防火墙#### # firewall­cmd ­­permanent ­­zone=public ­­add­port=80/tcp # firewall­cmd ­­reload -**CentOS/RHEL 6 的防火墙** +####CentOS/RHEL 6 的防火墙#### 把下面内容加至 /etc/sysconfig/iptables 中的 ":OUTPUT ACCEPT" 段中 @@ -197,9 +196,9 @@ Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡 # service iptables restart -#### 在 Debian 中启动 HAProxy #### +### 在 Debian 中启动 HAProxy ### -#### 启动 HAProxy #### +启动 HAProxy # service haproxy start @@ -207,7 +206,7 @@ Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡 ­A INPUT ­p tcp ­­dport 80 ­j ACCEPT -#### 在 Ubuntu 中启动HAProxy #### +### 在 Ubuntu 中启动HAProxy ### 让 HAProxy 开机自动启动在 /etc/default/haproxy 中配置 @@ -221,7 +220,7 @@ Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡 # ufw allow 80 -### 测试 HAProxy ### +## 测试 HAProxy ## 检查 HAProxy 是否工作正常，我们可以这样做 @@ -239,7 +238,7 @@ Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡 $ curl http://192.168.100.4/test.php -我们多次使用这个命令此时，会发现交替的输出下面的内容（因为使用了轮询算法）： +我们多次运行这个命令此时，会发现交替的输出下面的内容（因为使用了轮询算法）： Server IP: 192.168.100.2 X-Forwarded-for: 192.168.100.4 @@ -251,13 +250,13 @@ Web 集群配置定义了一组可用的 HTTP 服务器。我们的负载均衡 如果我们停掉一台后端 Web 服务，curl 命令仍然正常工作，请求被分发至另一台可用的 Web 服务器。 -### 总结 ### +## 总结 ## -现在你有了一个完全可用的负载均衡器，以轮询的模式对你的 Web 节点进行负载均衡。还可以去实验其他的配置选项以适应你的环境。希望这个教程可以帮会组你们的 Web 项目有更好的可用性。 +现在你有了一个完全可用的负载均衡器，以轮询的模式对你的 Web 节点进行负载均衡。还可以去实验其他的配置选项以适应你的环境。希望这个教程可以帮助你们的 Web 项目有更好的可用性。 你可能已经发现了，这个教程只包含单台负载均衡的设置。这意味着我们仍然有单点故障的问题。在真实场景中，你应该至少部署 2 台或者 3 台负载均衡以防止意外发生，但这不是本教程的范围。 -如果 你有任何问题或建议，请在评论中提出，我会尽我的努力回答。 +如果你有任何问题或建议，请在评论中提出，我会尽我的努力回答。 -------------------------------------------------------------------------------- @@ -265,11 +264,11 @@ via: http://xmodulo.com/haproxy-http-load-balancer-linux.html 作者：[Jaroslav Štěpánek][a] 译者：[Liao](https://github.com/liaoishere) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://xmodulo.com/author/jaroslav [1]:http://www.haproxy.org/ [2]:http://www.haproxy.org/10g.html -[3]:http://xmodulo.com/how-to-install-lamp-server-on-ubuntu.html +[3]:http://linux.cn/article-1567-1.html From df3a8b808d446041974cd641b4b904f1b87ee6e7 Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 28 Jan 2015 14:24:55 +0800 Subject: [PATCH 088/207] =?UTF-8?q?=E6=B8=85=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SO Images Directly From Your Hard Drive.md | 78 ------------------- 1 file changed, 78 deletions(-) delete mode 100644 sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md diff --git a/sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md b/sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md deleted file mode 100644 index b7ccf253f9..0000000000 --- a/sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md +++ /dev/null @@ -1,78 +0,0 @@ -[xieborui translating]How to Boot Linux ISO Images Directly From Your Hard Drive -================================================================================ -Hi all, today we'll teach you an awesome interesting stuff related with the Operating System Disk Image and Booting. Now, try many OS you like without installing them in your Physical Hard Drive and without burning DVDs or USBs. - -We can boot Linux ISO files directly from your hard drive with Linux’s GRUB2 boot loader. We can boot any Linux Distribution's using this method without creating bootable USBs, Burn DVDs, etc but the changes made will be temporary. - -![boot iso files directly from hard drive in grub2](http://blog.linoxide.com/wp-content/uploads/2015/01/boot-iso-files-directly-from-hard-drive-in-grub2.png) - -### 1. Get the ISO of the Linux Distributions: ### - -Here, we're gonna create Menu of Ubuntu 14.04 LTS "Trusty" and Linux Mint 17.1 LTS "Rebecca" so, we downloaded them from their official site: - -Ubuntu from : [http://ubuntu.com/][1] And Linux Mint from: [http://linuxmint.com/][2] - -You can download ISO files of required linux distributions from their respective websites. If you have mirror of the iso files hosted near your area or country, it is recommended if you have no sufficient internet download speed. - -### 2. Determine the Hard Drive Partition’s Path ### - -GRUB uses a different “device name” scheme than Linux does. On a Linux system, /dev/sda0 is the first partition on the first hard disk — **a** means the first hard disk and **0** means its first partition. In GRUB, (hd0,1) is equivalent to /dev/sda0. The **0** means the first hard disk, while **1** means the first partition on it. In other words, in a GRUB device name, the disk numbers start counting at 0 and the partition numbers start counting at 1. For example, (hd3,6) refers to the sixth partition on the fourth hard disk. - -You can use the **fdisk -l** command to view this information. On Ubuntu, open a Terminal and run the following command: - - $ sudo fdisk -l - -![fdisk-l view the list of the hard disk and its partitions](http://blog.linoxide.com/wp-content/uploads/2015/01/fdisk-l.png) - -You’ll see a list of Linux device paths, which you can convert to GRUB device names on your own. For example, below we can see the system partition is /dev/sda1 — so that’s (hd0,1) for GRUB. - -### 3. Adding boot menu to Grub2 ### - -The easiest way to add a custom boot entry is to edit the /etc/grub.d/40_custom script. This file is designed for user-added custom boot entries. After editing the file, the contents of your /etc/defaults/grub file and the /etc/grub.d/ scripts will be combined to create a /boot/grub/grub.cfg file. You shouldn't edit this file by hand. It’s designed to be automatically generated from settings you specify in other files. - -So we’ll need to open the /etc/grub.d/40_custom file for editing with root privileges. On Ubuntu, you can do this by opening a Terminal window and running the following command: - - $ sudo nano /etc/grub.d/40_custom - -Unless we’ve added other custom boot entries, we should see a mostly empty file. We'll need to add one or more ISO-booting sections to the file below the commented lines. - - ===== - menuentry “Ubuntu 14.04 ISO” { - set isofile=”/home/linoxide/Downloads/ubuntu-14.04.1-desktop-amd64.iso” - loopback loop (hd0,1)$isofile - linux (loop)/casper/vmlinuz.efi boot=casper iso-scan/filename=${isofile} quiet splash - initrd (loop)/casper/initrd.lz - } - menuentry "Linux Mint 17.1 Cinnamon ISO" { - set isofile=”/home/linoxide/Downloads/mint-17.1-desktop-amd64.iso” - loopback loop (hd0,1)$isofile - linux (loop)/casper/vmlinuz.efi boot=casper iso-scan/filename=${isofile} quiet splash - initrd (loop)/casper/initrd.lz - } - -![Grub2 Menu configuration for adding the ISOs](http://blog.linoxide.com/wp-content/uploads/2015/01/grub-added-iso.png) - -**Important Note**: Different Linux distributions require different boot entries with different boot options. The GRUB Live ISO Multiboot project offers a variety of [menu entries for different Linux distributions][3]. You should be able to adapt these example menu entries for the ISO file you want to boot. You can also just perform a web search for the name and release number of the Linux distribution you want to boot along with “boot from ISO in GRUB” to find more information. - -### 4. Updating Grub2 ### - -To make the custom menu entries active, we'll run "sudo update-grub" - - sudo update-grub - -Hurray, we have successfully added our brand new linux distribution's ISO to our GRUB Menu. Now, we'll be able to boot them and enjoy trying them. You can add many distributions and try them all. Note that the changes made in those OS will don't be kept preserved, which means you'll loose changes made in that distros after the restart. - --------------------------------------------------------------------------------- - -via: http://linoxide.com/linux-how-to/boot-linux-iso-images-directly-hard-drive/ - -作者：[Arun Pyasi][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linoxide.com/author/arunp/ -[1]:http://ubuntu.com/ -[2]:http://linuxmint.com/ -[3]:http://git.marmotte.net/git/glim/tree/grub2 From 28c16bb997c81ac3e29efe9fd4f79634b0ab4499 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Wed, 28 Jan 2015 14:28:00 +0800 Subject: [PATCH 089/207] Translating by ZTinoZ --- ... Linux FAQs with Answers--How to check CPU info on Linux.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md index b9a9712a49..f099000ef2 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md @@ -1,3 +1,4 @@ +Translating by ZTinoZ Linux FAQs with Answers--How to check CPU info on Linux ================================================================================ > **Question**: I would like to know detailed information about the CPU processor of my computer. What are the available methods to check CPU information on Linux? @@ -112,4 +113,4 @@ via: http://ask.xmodulo.com/check-cpu-info-linux.html [1]:http://xmodulo.com/how-to-find-number-of-cpu-cores-on.html [2]:http://en.wikipedia.org/wiki/CPUID [3]:http://xmodulo.com/identify-cpu-processor-architecture-linux.html -[4]:http://xmodulo.com/identify-cpu-processor-architecture-linux.html \ No newline at end of file +[4]:http://xmodulo.com/identify-cpu-processor-architecture-linux.html From 210f5b5c5fbeed38a06ff84cb59d004c562561f2 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 28 Jan 2015 14:13:54 +0800 Subject: [PATCH 090/207] =?UTF-8?q?20150128-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...unities driving open source development.md | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 sources/talk/20150128 7 communities driving open source development.md diff --git a/sources/talk/20150128 7 communities driving open source development.md b/sources/talk/20150128 7 communities driving open source development.md new file mode 100644 index 0000000000..3b3c450cf8 --- /dev/null +++ b/sources/talk/20150128 7 communities driving open source development.md @@ -0,0 +1,86 @@ +7 communities driving open source development +================================================================================ +Not so long ago, the open source model was the rebellious kid on the block, viewed with suspicion by established industry players. Today, open initiatives and foundations are flourishing with long lists of vendor committers who see the model as a key to innovation. + +![](http://images.techhive.com/images/article/2015/01/0_opensource-title-100539095-orig.jpg) + +### Open Development of Tech Drives Innovation ### + +Over the past two decades, open development of technology has come to be seen as a key to driving innovation. Even companies that once saw open source as a threat have come around — Microsoft, for example, is now active in a number of open source initiatives. To date, most open development has focused on software. But even that is changing as communities have begun to coalesce around open hardware initiatives. Here are seven organizations that are successfully promoting and developing open technologies, both hardware and software. + +### OpenPOWER Foundation ### + +![](http://images.techhive.com/images/article/2015/01/1_openpower-100539100-orig.jpg) + +The [OpenPOWER Foundation][2] was founded by IBM, Google, Mellanox, Tyan and NVIDIA in 2013 to drive open collaboration hardware development in the same spirit as the open source software development which has found fertile ground in the past two decades. + +IBM seeded the foundation by opening up its Power-based hardware and software technologies, offering licenses to use Power IP in independent hardware products. More than 70 members now work together to create custom open servers, components and software for Linux-based data centers. + +In April, OpenPOWER unveiled a technology roadmap based on new POWER8 process-based servers capable of analyzing data 50 times faster than the latest x86-based systems. In July, IBM and Google released a firmware stack. October saw the availability of NVIDIA GPU accelerated POWER8 systems and the first OpenPOWER reference server from Tyan. + +### The Linux Foundation ### + +![](http://images.techhive.com/images/article/2015/01/2_the-linux-foundation-100539101-orig.jpg) + +Founded in 2000, [The Linux Foundation][2] is now the host for the largest open source, collaborative development effort in history, with more than 180 corporate members and many individual and student members. It sponsors the work of key Linux developers and promotes, protects and advances the Linux operating system and collaborative software development. + +Some of its most successful collaborative projects include Code Aurora Forum (a consortium of companies with projects serving the mobile wireless industry), MeeGo (a project to build a Linux kernel-based operating system for mobile devices and IVI) and the Open Virtualization Alliance (which fosters the adoption of free and open source software virtualization solutions). + +### Open Virtualization Alliance ### + +![](http://images.techhive.com/images/article/2015/01/3_open-virtualization-alliance-100539102-orig.jpg) + +The [Open Virtualization Alliance (OVA)][3] exists to foster the adoption of free and open source software virtualization solutions like Kernel-based Virtual Machine (KVM) through use cases and support for the development of interoperable common interfaces and APIs. KVM turns the Linux kernel into a hypervisor. + +Today, KVM is the most commonly used hypervisor with OpenStack. + +### The OpenStack Foundation ### + +![](http://images.techhive.com/images/article/2015/01/4_the-openstack-foundation-100539096-orig.jpg) + +Originally launched as an Infrastructure-as-a-Service (IaaS) product by NASA and Rackspace hosting in 2010, the [OpenStack Foundation][4] has become the home for one of the biggest open source projects around. It boasts more than 200 member companies, including AT&T, AMD, Avaya, Canonical, Cisco, Dell and HP. + +Organized around a six-month release cycle, the foundation's OpenStack projects are developed to control pools of processing, storage and networking resources through a data center — all managed or provisioned through a Web-based dashboard, command-line tools or a RESTful API. So far, the collaborative development supported by the foundation has resulted in the creation of OpenStack components including OpenStack Compute (a cloud computing fabric controller that is the main part of an IaaS system), OpenStack Networking (a system for managing networks and IP addresses) and OpenStack Object Storage (a scalable redundant storage system). + +### OpenDaylight ### + +![](http://images.techhive.com/images/article/2015/01/5_opendaylight-100539097-orig.jpg) + +Another collaborative project to come out of the Linux Foundation, [OpenDaylight][5] is a joint initiative of industry vendors, like Dell, HP, Oracle and Avaya founded in April 2013. Its mandate is the creation of a community-led, open, industry-supported framework consisting of code and blueprints for Software-Defined Networking (SDN). The idea is to provide a fully functional SDN platform that can be deployed directly, without requiring other components, though vendors can offer add-ons and enhancements. + +### Apache Software Foundation ### + +![](http://images.techhive.com/images/article/2015/01/6_apache-software-foundation-100539098-orig.jpg) + +The [Apache Software Foundation (ASF)][7] is home to nearly 150 top level projects ranging from open source enterprise automation software to a whole ecosystem of distributed computing projects related to Apache Hadoop. These projects deliver enterprise-grade, freely available software products, while the Apache License is intended to make it easy for users, whether commercial or individual, to deploy Apache products. + +ASF was incorporated in 1999 as a membership-based, not-for-profit corporation with meritocracy at its heart — to become a member you must first be actively contributing to one or more of the foundation's collaborative projects. + +### Open Compute Project ### + +![](http://images.techhive.com/images/article/2015/01/7_open-compute-project-100539099-orig.jpg) + +An outgrowth of Facebook's redesign of its Oregon data center, the [Open Compute Project (OCP)][7] aims to develop open hardware solutions for data centers. The OCP is an initiative made up of cheap, vanity-free servers, modular I/O storage for Open Rack (a rack standard designed for data centers to integrate the rack into the data center infrastructure) and a relatively "green" data center design. + +OCP board members include representatives from Facebook, Intel, Goldman Sachs, Rackspace and Microsoft. + +OCP recently announced two options for licensing: an Apache 2.0-like license that allows for derivative works and a more prescriptive license that encourages changes to be rolled back into the original software. + +-------------------------------------------------------------------------------- + +via: http://www.networkworld.com/article/2866074/opensource-subnet/7-communities-driving-open-source-development.html + +作者：[Thor Olavsrud][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.networkworld.com/author/Thor-Olavsrud/ +[1]:http://openpowerfoundation.org/ +[2]:http://www.linuxfoundation.org/ +[3]:https://openvirtualizationalliance.org/ +[4]:http://www.openstack.org/foundation/ +[5]:http://www.opendaylight.org/ +[6]:http://www.apache.org/ +[7]:http://www.opencompute.org/ \ No newline at end of file From 35bdd1c7421014618a0aeb9c290191fe87e364f8 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 28 Jan 2015 14:47:57 +0800 Subject: [PATCH 091/207] =?UTF-8?q?20150128-4=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20150128 Docker-1 Moving to Docker.md | 81 ++++++ ...-2 Setting up a private Docker registry.md | 241 +++++++++++++++++ ...utomated Docker-based Rails deployments.md | 253 ++++++++++++++++++ 3 files changed, 575 insertions(+) create mode 100644 sources/tech/20150128 Docker-1 Moving to Docker.md create mode 100644 sources/tech/20150128 Docker-2 Setting up a private Docker registry.md create mode 100644 sources/tech/20150128 Docker-3 Automated Docker-based Rails deployments.md diff --git a/sources/tech/20150128 Docker-1 Moving to Docker.md b/sources/tech/20150128 Docker-1 Moving to Docker.md new file mode 100644 index 0000000000..6917b3b7b1 --- /dev/null +++ b/sources/tech/20150128 Docker-1 Moving to Docker.md @@ -0,0 +1,81 @@ +Moving to Docker +================================================================================ +![](http://cocoahunter.com/content/images/2015/01/docker1.jpeg) + +[TL;DR] This is the first post in a series of 3 on how my company moved its infrastructure from PaaS to Docker based deployment. If you want, you can skip the intro (this post) and head directly to the technical topics (links at the bottom of the page). + +---------- + +In the last month I've been strggling with devops. This is my very personal story and experience in trying to streamline a deployment process of a Raila app with Docker. + +When I started my company – [Touchware][1] – in 2012 I was a lone developer. Things were small, uncomplicated, they didn't require a lot of maintenance, nor they needed to scale all that much. During the course of last year though, we grew quite a lot (we are now a team of 10 people) and our server-side applications and API grew both in terms of scope and scale. + +### Step 1 - Heroku ### + +We still are a very small team and we need to make things going and run as smoothly as possible. When we looked for possible solutions, we decided to stick with something that would have removed from our shoulders the burden of managing hardware. Since we develop mainly Rails based applications and Heroku has a great support for RoR and various kind of DBs and cached (Postgres / Mongo / Redis etc.), the smartest choice seemed to be going with [Heroku][2]. And that's what we did. + +Heroku has a great support and great documentation and deploying apps is just so snappy! Only problem is, when you start growing, you need to have piles of cash around to pay the bills. Not the best deal, really. + +### Step 2 - Dokku ### + +In a rush to try and cut the costs, we decided to try with Dokku. [Dokku][3], quoting the Github repo is a + +> Docker powered mini-Heroku in around 100 lines of Bash + +We launched some instances on [DigitalOcean][4] with Dokku pre-installed and we gave it spin. Dokku is very much like Heroku, but when you have complex applications for whom you need to twear params, or where you need certain dependencies, it's just not gonna work out. We had an app where we needed to apply multiple transformations on images and we couldn't find a way to install the correct version of imagemagick into the dokku-based Docker container that was hosting our Rails app. We still have a couple of very simple apps that are running on Dokku, but we had to move some of them back to Heroku. + +### Step 3 - Docker ### + +A couple of months ago, since the problem of devops and managing production apps was resurfacing, I decided to try out [Docker][5]. Docker, in simple terms, allows developers to containerize applications and to ease the deployment. Since a Docker container basically has all the dependencies it needs to run your app, if everything runs fine on your laptop, you can be sure it'll also run like a champ in production on a remote server, be it an AWS E2C instance or a VPS on DigitalOcean. + +Docker IMHO is particularly interesting for the following reasons: + +- it promotes modularization and separation of concerns: you need to start thinking about your apps in terms of logical components (load balancer: 1 container, DB: 1 container, webapp: 1 container etc.); +- it's very flexible in terms of deployment options: containers can be deployed to a wide variety of HW and can be easily redeployed to different servers / providers; +- it allows for a very fine grained tuning of your app environment: you build the images your containers runs from, so you have plenty of options for configuring your environment exactly as you would like to. + +There are howerver some downsides: + +- the learning curve is quite steep (this is probably a very personal problem, but I'm talking as a software dev and not as a skilled operations professional); +- setup is not simple, especially if you want to have a private registry / repository (more about this later). + +Following are some tips I put together during the course of the last week with the findings of someone that is new to the game. + +---------- + +In the following articles we'll see how to setup a semi-automated Docker based deployment system. + +- [Setting up a private Docker registry][6] +- [Configuring a Rails app for semi-automated deployment][7] + +-------------------------------------------------------------------------------- + +via: http://cocoahunter.com/2015/01/23/docker-1/ + +作者：[Michelangelo Chasseur][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://cocoahunter.com/author/michelangelo/ +[1]:http://www.touchwa.re/ +[2]:http://cocoahunter.com/2015/01/23/docker-1/www.heroku.com +[3]:https://github.com/progrium/dokku +[4]:http://cocoahunter.com/2015/01/23/docker-1/www.digitalocean.com +[5]:http://www.docker.com/ +[6]:http://cocoahunter.com/2015/01/23/docker-2/ +[7]:http://cocoahunter.com/2015/01/23/docker-3/ +[8]: +[9]: +[10]: +[11]: +[12]: +[13]: +[14]: +[15]: +[16]: +[17]: +[18]: +[19]: +[20]: \ No newline at end of file diff --git a/sources/tech/20150128 Docker-2 Setting up a private Docker registry.md b/sources/tech/20150128 Docker-2 Setting up a private Docker registry.md new file mode 100644 index 0000000000..9a9341b4b7 --- /dev/null +++ b/sources/tech/20150128 Docker-2 Setting up a private Docker registry.md @@ -0,0 +1,241 @@ +Setting up a private Docker registry +================================================================================ +![](http://cocoahunter.com/content/images/2015/01/docker2.jpg) + +[TL;DR] This is the second post in a series of 3 on how my company moved its infrastructure from PaaS to Docker based deployment. + +- [First part][1]: where I talk about the process we went thru before approaching Docker; +- [Third pard][2]: where I show how to automate the entire process of building images and deploying a Rails app with Docker. + +---------- + +Why would ouy want ot set up a provate registry? Well, for starters, Docker Hub only allows you to have one free private repo. Other companies are beginning to offer similar services, but they are all not very cheap. In addition, if you need to deploy production ready applications built with Docker, you might not want to publish those images on the public Docker Hub. + +This is a very pragmatic approach to dealing with the intricacies of setting up a private Docker registry. For the tutorial we will be using a small 512MB instance on DigitalOcean (from now on DO). I also assume you already know the basics of Docker since I will be concentrating on some more complicated stuff. + +### Local set up ### + +First of all you need to install **boot2docker** and docker CLI. If you already have your basic Docker environment up and running, you can just skip to the next section. + +From the terminal run the following command[1][3]: + + brew install boot2docker docker + +If everything is ok[2][4], you will now be able to start the VM inside which Docker will run with the following command: + + boot2docker up + +Follow the instructions, copy and paste the export commands that boot2docker will print in the terminal. If you now run `docker ps` you should be greeted by the following line + + CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES + +Ok, Docker is ready to go. This will be enough for the moment. Let's go back to setting up the registry. + +### Creating the server ### + +Log into you DO account and create a new Droplet by selecting an image with Docker pre-installed[^n]. + +![](http://cocoahunter.com/content/images/2015/01/Screenshot-2015-01-20-18-26-14.png) + +You should receive your root credentials via email. Log into your instance and run `docker ps` to see if eveything is ok. + +### Setting up AWS S3 ### + +We are going to use Amazon Simple Storage Service (S3) as the storage layer for our registry / repository. We will need to create a bucket and user credentials to allow our docker container accessoing it. + +Login into your AWS account (if you don't have one you can set one up at [http://aws.amazon.com/][5]) and from the console select S3 (Simple Storage Service). + +![](http://cocoahunter.com/content/images/2015/01/Screenshot-2015-01-20-19-29-21.png) + +Click on **Create Bucket**, enter a unique name for your bucket (and write it down, we're gonna need it later), then click on **Create**. + +![](http://cocoahunter.com/content/images/2015/01/Screenshot-2015-01-20-19-22-50.png) + +That's it! We're done setting up the storage part. + +### Setup AWS access credentials ### + +We are now going to create a new user. Go back to your AWS console and select IAM (Identity & Access Management). + +![](http://cocoahunter.com/content/images/2015/01/Screenshot-2015-01-20-19-29-08.png) + +In the dashboard, on the left side of the webpage, you should click on Users. Then select **Create New Users**. + +You should be presented with the following screen: + +![](http://cocoahunter.com/content/images/2015/01/Screenshot-2015-01-20-19-31-42.png) + +Enter a name for your user (e.g. docker-registry) and click on Create. Write down (or download the csv file with) your Access Key and Secret Access Key that we'll need when running the Docker container. Go back to your users list and select the one you just created. + +Under the Permission section, click on Attach User Policy. In the next screen, you will be presented with multiple choices: select Custom Policy. + +![](http://cocoahunter.com/content/images/2015/01/Screenshot-2015-01-20-19-41-21.png) + +Here's the content of the custom policy: + + { + "Version": "2012-10-17", + "Statement": [ + { + "Sid": "SomeStatement", + "Effect": "Allow", + "Action": [ + "s3:*" + ], + "Resource": [ + "arn:aws:s3:::docker-registry-bucket-name/*", + "arn:aws:s3:::docker-registry-bucket-name" + ] + } + ] + } + +This will allow the user (i.e. the registry) to manage (read/write) content on the bucket (make sure to use the bucket name you previously defined when setting up AWS S3). To sum it up: when you'll be pushing Docker images from your local machine to your repository, the server will be able to upload them to S3. + +### Installing the registry ### + +Now let's head back to our DO server and SSH into it. We are going to use[^n] one of the [official Docker registry images][6]. + +Let's start our registry with the following command: + + docker run \ + -e SETTINGS_FLAVOR=s3 \ + -e AWS_BUCKET=bucket-name \ + -e STORAGE_PATH=/registry \ + -e AWS_KEY=your_aws_key \ + -e AWS_SECRET=your_aws_secret \ + -e SEARCH_BACKEND=sqlalchemy \ + -p 5000:5000 \ + --name registry \ + -d \ + registry + +Docker should pull the required fs layers from the Docker Hub and eventually start the daemonised container. + +### Testing the registry ### + +If everything worked out, you should now be able to test the registry by pinging it and by searching its content (though for the time being it's still empty). + +Our registry is very basic and it does not provide any means of authentication. Since there are no easy ways of adding authentication (at least none that I'm aware of that are easy enough to implment in order to justify the effort), I've decided that the easiest way of querying / pulling / pushing the registry is an unsecure (over HTTP) connection tunneled thru SSH. + +Opening an SSH tunnel from your local machine is straightforward: + + ssh -N -L 5000:localhost:5000 root@your_registry.com + +The command is tunnelling connections over SSH from port 5000 of the registry server (which is the one we exposed with the `docker run` command in the previous paragraph) to port 5000 on the localhost. + +If you now browse to the following address [http://localhost:5000/v1/_ping][7] you should get the following very simple response + + {} + +This just means that the registry is working correctly. You can also list the whole content of the registry by browsing to [http://localhost:5000/v1/search][8] that will get you a similar response: + + { + "num_results": 2, + "query": "", + "results": [ + { + "description": "", + "name": "username/first-repo" + }, + { + "description": "", + "name": "username/second-repo" + } + ] + } + +### Building an image ### + +Let's now try and build a very simple Docker image to test our newly installed registry. On your local machine, create a Dockerfile with the following content[^n]: + + # Base image with ruby 2.2.0 + FROM ruby:2.2.0 + + MAINTAINER Michelangelo Chasseur + +...and build it: + + docker build -t localhost:5000/username/repo-name . + +The `localhost:5000` part is especially important: the first part of the name of a Docker image will tell the `docker push` command the endpoint towards which we are trying to push our image. In our case, since we are connecting to our remote private registry via an SSH tunnel, `localhost:5000` represents exactly the reference to our registry. + +If everything works as expected, when the command returns, you should be able to list your newly created image with the `docker images` command. Run it and see it for yourself. + +### Pushing to the registry ### + +Now comes the trickier part. It took a me a while to realize what I'm about to describe, so just be patient if you don't get it the first time you read and try to follow along. I know that all this stuff will seem pretty complicated (and it would be if you didn't automate the process), but I promise in the end it will all make sense. In the next post I will show a couple of shell scripts and Rake tasks that will automate the whole process and will let you deploy a Rails to your registry app with a single easy command. + +The docker command you are running from your terminal is actually using the boot2docker VM to run the containers and do all the magic stuff. So when we run a command like `docker push some_repo` what is actually happening is that it's the boot2docker VM that is reacing out for the registry, not our localhost. + +This is an extremely important point to understand: in order to push the Docker image to the remote private registry, the SSH tunnel needs to be established from the boot2docker VM and not from your local machine. + +There are a couple of ways to go with it. I will show you the shortest one (which is not probably the easiest to understand, but it's the one that will let us automate the process with shell scripts). + +First of all though we need to sort one last thing with SSH. + +### Setting up SSH ### + +Let's add our boot2docker SSH key to our remote server (registry) known hosts. We can do so using the ssh-copy-id utility that you can install with the following command shouldn't you already have it: + + brew install ssh-copy-id + +Then run: + + ssh-copy-id -i /Users/username/.ssh/id_boot2docker root@your-registry.com + +Make sure to substitute `/Users/username/.ssh/id_boot2docker` with the correct path of your ssh key. + +This will allow us to connect via SSH to our remote registry without being prompted for the password. + +Finally let's test it out: + + boot2docker ssh "ssh -o 'StrictHostKeyChecking no' -i /Users/michelangelo/.ssh/id_boot2docker -N -L 5000:localhost:5000 root@registry.touchwa.re &" & + +To break things out a little bit: + +- `boot2docker ssh` lets you pass a command as a parameter that will be executed by the boot2docker VM; +- the final `&` indicates that we want our command to be executed in the background; +- `ssh -o 'StrictHostKeyChecking no' -i /Users/michelangelo/.ssh/id_boot2docker -N -L 5000:localhost:5000 root@registry.touchwa.re &` is the actual command our boot2docker VM will run; + - the `-o 'StrictHostKeyChecking no'` will make sure that we are not prompted with security questions; + - the `-i /Users/michelangelo/.ssh/id_boot2docker` indicates which SSH key we want our VM to use for authentication purposes (note that this should be the key you added to your remote registry in the previous step); + - finally we are opening a tunnel on mapping port 5000 to localhost:5000. + +### Pulling from another server ### + +You should now be able to push your image to the remote registry by simply issuing the following command: + + docker push localhost:5000/username/repo_name + +In the [next post][9] we'll se how to automate some of this stuff and we'll containerize a real Rails application. Stay tuned! + +P.S. Please use the comments to let me know of any inconsistencies or fallacies in my tutorial. Hope you enjoyed it! + +1. I'm also assuming you are running on OS X. +1. For a complete list of instructions to set up your docker environment and requirements, please visit [http://boot2docker.io/][10] +1. Select Image > Applications > Docker 1.4.1 on 14.04 at the time of this writing. +1. [https://github.com/docker/docker-registry/][11] +1. This is just a stub, in the next post I will show you how to bundle a Rails application into a Docker container. + +-------------------------------------------------------------------------------- + +via: http://cocoahunter.com/2015/01/23/docker-2/ + +作者：[Michelangelo Chasseur][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://cocoahunter.com/author/michelangelo/ +[1]:http://cocoahunter.com/2015/01/23/docker-1/ +[2]:http://cocoahunter.com/2015/01/23/docker-3/ +[3]:http://cocoahunter.com/2015/01/23/docker-2/#fn:1 +[4]:http://cocoahunter.com/2015/01/23/docker-2/#fn:2 +[5]:http://aws.amazon.com/ +[6]:https://registry.hub.docker.com/_/registry/ +[7]:http://localhost:5000/v1/_ping +[8]:http://localhost:5000/v1/search +[9]:http://cocoahunter.com/2015/01/23/docker-3/ +[10]:http://boot2docker.io/ +[11]:https://github.com/docker/docker-registry/ \ No newline at end of file diff --git a/sources/tech/20150128 Docker-3 Automated Docker-based Rails deployments.md b/sources/tech/20150128 Docker-3 Automated Docker-based Rails deployments.md new file mode 100644 index 0000000000..f450361a68 --- /dev/null +++ b/sources/tech/20150128 Docker-3 Automated Docker-based Rails deployments.md @@ -0,0 +1,253 @@ +Automated Docker-based Rails deployments +================================================================================ +![](http://cocoahunter.com/content/images/2015/01/docker3.jpeg) + +[TL;DR] This is the third post in a series of 3 on how my company moved its infrastructure from PaaS to Docker based deployment. + +- [First part][1]: where I talk about the process we went thru before approaching Docker; +- [Second part][2]: where I explain how setting up a private registry for in house secure deployments. + +---------- + +In this final part we will see how to automate the whole deployment process with a real world (though very basic) example. + +### Basic Rails app ### + +Let's dive into the topic right away and bootstrap a basic Rails app. For the purpose of this demonstration I'm going to use Ruby 2.2.0 and Rails 4.1.1 + +From the terminal run: + + $ rvm use 2.2.0 + $ rails new && cd docker-test + +Let's create a basic controller: + + $ rails g controller welcome index + +...and edit `routes.rb` so that the root of the project will point to our newly created welcome#index method: + + root 'welcome#index' + +Running `rails s` from the terminal and browsing to [http://localhost:3000][3] should bring you to the index page. We're not going to make anything fancier to the app, it's just a basic example to prove that when we'll build and deploy the container everything is working. + +### Setup the webserver ### + +We are going to use Unicorn as our webserver. Add `gem 'unicorn'` and `gem 'foreman'` to the Gemfile and bundle it up (run `bundle install` from the command line). + +Unicorn needs to be configured when the Rails app launches, so let's put a **unicorn.rb** file inside the **config** directory. [Here is an example][4] of a Unicorn configuration file. You can just copy & paste the content of the Gist. + +Let's also add a Procfile with the following content inside the root of the project so that we will be able to start the app with foreman: + + web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb + +If you now try to run the app with **foreman start** everything should work as expected and you should have a running app on [http://localhost:5000][5] + +### Building a Docker image ### + +Now let's build the image inside which our app is going to live. In the root of our Rails project, create a file named **Dockerfile** and paste in it the following: + + # Base image with ruby 2.2.0 + FROM ruby:2.2.0 + + # Install required libraries and dependencies + RUN apt-get update && apt-get install -qy nodejs postgresql-client sqlite3 --no-install-recommends && rm -rf /var/lib/apt/lists/* + + # Set Rails version + ENV RAILS_VERSION 4.1.1 + + # Install Rails + RUN gem install rails --version "$RAILS_VERSION" + + # Create directory from where the code will run + RUN mkdir -p /usr/src/app + WORKDIR /usr/src/app + + # Make webserver reachable to the outside world + EXPOSE 3000 + + # Set ENV variables + ENV PORT=3000 + + # Start the web app + CMD ["foreman","start"] + + # Install the necessary gems + ADD Gemfile /usr/src/app/Gemfile + ADD Gemfile.lock /usr/src/app/Gemfile.lock + RUN bundle install --without development test + + # Add rails project (from same dir as Dockerfile) to project directory + ADD ./ /usr/src/app + + # Run rake tasks + RUN RAILS_ENV=production rake db:create db:migrate + +Using the provided Dockerfile, let's try and build an image with the following command[1][7]: + + $ docker build -t localhost:5000/your_username/docker-test . + +And again, if everything worked out correctly, the last line of the long log output should read something like: + + Successfully built 82e48769506c + $ docker images + REPOSITORY TAG IMAGE ID CREATED VIRTUAL SIZE + localhost:5000/your_username/docker-test latest 82e48769506c About a minute ago 884.2 MB + +Let's try and run the container! + + $ docker run -d -p 3000:3000 --name docker-test localhost:5000/your_username/docker-test + +You should be able to reach your Rails app running inside the Docker container at port 3000 of your boot2docker VM[2][8] (in my case [http://192.168.59.103:3000][6]). + +### Automating with shell scripts ### + +Since you should already know from the previous post3 how to push your newly created image to a private regisitry and deploy it on a server, let's skip this part and go straight to automating the process. + +We are going to define 3 shell scripts and finally tie it all together with rake. + +### Clean ### + +Every time we build our image and deploy we are better off always clean everything. That means the following: + +- stop (if running) and restart boot2docker; +- remove orphaned Docker images (images that are without tags and that are no longer used by your containers). + +Put the following into a **clean.sh** file in the root of your project. + + echo Restarting boot2docker... + boot2docker down + boot2docker up + + echo Exporting Docker variables... + sleep 1 + export DOCKER_HOST=tcp://192.168.59.103:2376 + export DOCKER_CERT_PATH=/Users/user/.boot2docker/certs/boot2docker-vm + export DOCKER_TLS_VERIFY=1 + + sleep 1 + echo Removing orphaned images without tags... + docker images | grep "" | awk '{print $3}' | xargs docker rmi + +Also make sure to make the script executable: + + $ chmod +x clean.sh + +### Build ### + +The build process basically consists in reproducing what we just did before (docker build). Create a **build.sh** script at the root of your project with the following content: + + docker build -t localhost:5000/your_username/docker-test . + +Make the script executable. + +### Deploy ### + +Finally, create a **deploy.sh** script with this content: + + # Open SSH connection from boot2docker to private registry + boot2docker ssh "ssh -o 'StrictHostKeyChecking no' -i /Users/username/.ssh/id_boot2docker -N -L 5000:localhost:5000 root@your-registry.com &" & + + # Wait to make sure the SSH tunnel is open before pushing... + echo Waiting 5 seconds before pushing image. + + echo 5... + sleep 1 + echo 4... + sleep 1 + echo 3... + sleep 1 + echo 2... + sleep 1 + echo 1... + sleep 1 + + # Push image onto remote registry / repo + echo Starting push! + docker push localhost:5000/username/docker-test + +If you don't understand what's going on here, please make sure you've read thoroughfully [part 2][9] of this series of posts. + +Make the script executable. + +### Tying it all together with rake ### + +Having 3 scripts would now require you to run them individually each time you decide to deploy your app: + +1. clean +1. build +1. deploy / push + +That wouldn't be much of an effort, if it weren't for the fact that developers are lazy! And lazy be it, then! + +The final step to wrap things up, is tying the 3 parts together with rake. + +To make things even simpler you can just append a bunch of lines of code to the end of the already present Rakefile in the root of your project. Open the Rakefile file - pun intended :) - and paste the following: + + namespace :docker do + desc "Remove docker container" + task :clean do + sh './clean.sh' + end + + desc "Build Docker image" + task :build => [:clean] do + sh './build.sh' + end + + desc "Deploy Docker image" + task :deploy => [:build] do + sh './deploy.sh' + end + end + +Even if you don't know rake syntax (which you should, because it's pretty awesome!), it's pretty obvious what we are doing. We have declared 3 tasks inside a namespace (docker). + +This will create the following 3 tasks: + +- rake docker:clean +- rake docker:build +- rake docker:deploy + +Deploy is dependent on build, build is dependent on clean. So every time we run from the command line + + $ rake docker:deploy + +All the script will be executed in the required order. + +### Test it ### + +To see if everything is working, you just need to make a small change in the code of your app and run + + $ rake docker:deploy + +and see the magic happening. Once the image has been uploaded (and the first time it could take quite a while), you can ssh into your production server and pull (thru an SSH tunnel) the docker image onto the server and run. It's that easy! + +Well, maybe it takes a while to get accustomed to how everything works, but once it does, it's almost (almost) as easy as deploying with Heroku. + +P.S. As always, please let me have your ideas. I'm not sure this is the best, or the fastest, or the safest way of doing devops with Docker, but it certainly worked out for us. + +- make sure to have **boot2docker** up and running. +- If you don't know your boot2docker VM address, just run `$ boot2docker ip` +- if you don't, you can read it [here][10] + +-------------------------------------------------------------------------------- + +via: http://cocoahunter.com/2015/01/23/docker-3/ + +作者：[Michelangelo Chasseur][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://cocoahunter.com/author/michelangelo/ +[1]:http://cocoahunter.com/docker-1 +[2]:http://cocoahunter.com/2015/01/23/docker-2/ +[3]:http://localhost:3000/ +[4]:https://gist.github.com/chasseurmic/0dad4d692ff499761b20 +[5]:http://localhost:5000/ +[6]:http://192.168.59.103:3000/ +[7]:http://cocoahunter.com/2015/01/23/docker-3/#fn:1 +[8]:http://cocoahunter.com/2015/01/23/docker-3/#fn:2 +[9]:http://cocoahunter.com/2015/01/23/docker-2/ +[10]:http://cocoahunter.com/2015/01/23/docker-2/ \ No newline at end of file From dc77f8c9a5c2ae22f9aaf224d4b5e18ab204c228 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Wed, 28 Jan 2015 16:36:59 +0800 Subject: [PATCH 092/207] Translating by ZTinoZ --- ...ux FAQs with Answers--How to check CPU info on Linux.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md index f099000ef2..a7c7993d89 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md @@ -1,9 +1,8 @@ -Translating by ZTinoZ -Linux FAQs with Answers--How to check CPU info on Linux +Linux有问必答时间--如何查看Linux系统的CPU信息 ================================================================================ -> **Question**: I would like to know detailed information about the CPU processor of my computer. What are the available methods to check CPU information on Linux? +> **问题**: 我想要了解我的电脑关于CPU处理器的详细信息，查看CPU信息比较有效地方法是什么？ -Depending on your need, there are various pieces of information you may need to know about the CPU processor(s) of your computer, such as CPU vendor name, model name, clock speed, number of sockets/cores, L1/L2/L3 cache configuration, available processor capabilities (e.g., hardware virtualization, AES, MMX, SSE), and so on. In Linux, there are many command line or GUI-based tools that are used to show detailed information about your CPU hardware. +根据你的需要，there are various pieces of information you may need to know about the CPU processor(s) of your computer, such as CPU vendor name, model name, clock speed, number of sockets/cores, L1/L2/L3 cache configuration, available processor capabilities (e.g., hardware virtualization, AES, MMX, SSE), and so on. In Linux, there are many command line or GUI-based tools that are used to show detailed information about your CPU hardware. ### 1. /proc/cpuinfo ### From dd544d31aef81644229c6644d82d30d4f5bb23fb Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Wed, 28 Jan 2015 20:44:04 +0800 Subject: [PATCH 093/207] Delete 20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完成，删除该文档。 --- ...ning up Ubuntu 14.10,14.04,13.10 system.md | 165 ------------------ 1 file changed, 165 deletions(-) delete mode 100644 sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md diff --git a/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md b/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md deleted file mode 100644 index 2c4ee5b2d6..0000000000 --- a/sources/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md +++ /dev/null @@ -1,165 +0,0 @@ -FSSLC Translating ! - -Cleaning up Ubuntu 14.10,14.04,13.10 system -================================================================================ -We have already discussed [Cleaning up a Ubuntu GNU/Linux system][1] and this tutorial is updated with new ubuntu versions and more tools added. - -If you want to clean your ubuntu machine you need to follow these simple steps to remove all unnecessary junk files. - -### Remove partial packages ### - -This is yet another built-in feature, but this time it is not used in Synaptic Package Manager. It is used in the Terminal. Now, in the Terminal, key in the following command - - sudo apt-get autoclean - -Then enact the package clean command. What this commnad does is to clean remove .deb packages that apt caches when you install/update programs. To use the clean command type the following in a terminal window: - - sudo apt-get clean - -You can then use the autoremove command. What the autoremove command does is to remove packages installed as dependencies after the original package is removed from the system. To use autoremove tye the following in a terminal window: - - sudo apt-get autoremove - -### Remove unnecessary locale data ### - -For this we need to install localepurge.Automagically remove unnecessary locale data.This is just a simple script to recover diskspace wasted for unneeded locale files and localized man pages. It will automagically be invoked upon completion of any apt installation run. - -Install localepurge in Ubuntu - - sudo apt-get install localepurge - -After installing anything with apt-get install, localepurge will remove all translation files and translated man pages in languages you cannot read. - -If you want to configure localepurge you need to edit /etc/locale.nopurge - -This can save you several megabytes of disk space, depending on the packages you have installed. - -Example:- - -I am trying to install dicus using apt-get - -sudo apt-get install discus - -after end of this installation you can see something like below - -localepurge: Disk space freed in /usr/share/locale: 41860K - -### Remove "orphaned" packages ### - -If you want to remove orphaned packages you need to install deborphan package. - -Install deborphan in Ubuntu - - sudo apt-get install deborphan - -### Using deborphan ### - -Open Your terminal and enter the following command - - sudo deborphan | xargs sudo apt-get -y remove --purge - -### Remove "orphaned" packages Using GtkOrphan ### - -GtkOrphan (a Perl/Gtk2 application for debian systems) is a graphical tool which analyzes the status of your installations, looking for orphaned libraries. It implements a GUI front-end for deborphan, adding the package-removal capability. - -### Install GtkOrphan in Ubuntu ### - -Open the terminal and run the following command - - sudo apt-get install gtkorphan - -#### Screenshot #### - -![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/41.png) - -### Remove Orphan packages using Wajig ### - -simplified Debian package management front end.Wajig is a single commandline wrapper around apt, apt-cache, dpkg,/etc/init.d scripts and more, intended to be easy to use and providing extensive documentation for all of its functions. - -With a suitable sudo configuration, most (if not all) package installation as well as creation tasks can be done from a user shell. Wajig is also suitable for general system administration.A Gnome GUI command ‘gjig' is also included in the package. - -### Install Wajig in Ubuntu ### - -Open the terminal and run the following command - - sudo apt-get install wajig - -### Debfoster --- Keep track of what you did install ### - -debfoster maintains a list of installed packages that were explicitly requested rather than installed as a dependency. Arguments are entirely optional, debfoster can be invoked per se after each run of dpkg and/or apt-get. - -Alternatively you can use debfoster to install and remove packages by specifying the packages on the command line. Packages suffixed with a --- are removed while packages without a suffix are installed. - -If a new package is encountered or if debfoster notices that a package that used to be a dependency is now an orphan, it will ask you what to do with it. If you decide to keep it, debfoster will just take note and continue. If you decide that this package is not interesting enough it will be removed as soon as debfoster is done asking questions. If your choices cause other packages to become orphaned more questions will ensue. - -### Install debfoster in Ubuntu ### - -Open the terminal and run the following command - - sudo apt-get install debfoster - -### Using debfoster ### - -to create the initial keepers file use the following command - - sudo debfoster -q - -you can always edit the file /var/lib/debfosterkeepers which defines the packages you want to remain on your system. - -to edit the keepers file type - - sudo vi /var/lib/debfoster/keepers - -To force debfoster to remove all packages that aren't listed in this list or dependencies of packages that are listed in this list.It will also add all packages in this list that aren't installed. So it makes your system comply with this list. Do this - - sudo debfoster -f - -To keep track of what you installed additionally do once in a while : - - sudo debfoster - -### xdiskusage -- Check where the space on your hard drive goes ### - -Displays a graphic of your disk usage with du.xdiskusage is a user-friendly program to show you what is using up all your disk space. It is based on the design of the "xdu" program written by Phillip C. Dykstra. Changes have been made so it runs "du" for you, and can display the free space left on the disk, and produce a PostScript version of the display.xdiskusage is nice if you want to easily see where the space on your hard drive goes. - -### Install xdiskusage in Ubuntu ### - - sudo apt-get install xdiskusage - -If you want to open this application you need to use the following command - - sudo xdiskusage - -![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/5.png) - -Once it opens you should see similar to the following screen - -### Bleachbit ### - -BleachBit quickly frees disk space and tirelessly guards your privacy. Free cache, delete cookies, clear Internet history, shred temporary files, delete logs, and discard junk you didn't know was there. Designed for Linux and Windows systems, it wipes clean a thousand applications including Firefox, Internet Explorer, Adobe Flash, Google Chrome, Opera, Safari,and more. Beyond simply deleting files, BleachBit includes advanced features such as shredding files to prevent recovery, wiping free disk space to hide traces of files deleted by other applications, and vacuuming Firefox to make it faster. Better than free, BleachBit is open source. - -### Install Bleachbit in ubuntu ### - -Open the terminal and run the following command - - sudo apt-get install bleachbit - -![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/6.png) - -### Using Ubuntu-Tweak ### - -You can also Use [Ubuntu-Tweak][2] To clean up your system - --------------------------------------------------------------------------------- - -via: http://www.ubuntugeek.com/cleaning-up-a-ubuntu-gnulinux-system-updated-with-ubuntu-14-10-and-more-tools-added.html - -作者：[ruchi][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.ubuntugeek.com/author/ubuntufix -[1]:http://www.ubuntugeek.com/cleaning-up-all-unnecessary-junk-files-in-ubuntu.html -[2]:http://www.ubuntugeek.com/www.ubuntugeek.com/install-ubuntu-tweak-on-ubuntu-14-10.html From 1a136b0aaf83e49a543ed41db44b85f94849bd29 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Wed, 28 Jan 2015 21:06:42 +0800 Subject: [PATCH 094/207] Translated "20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完成 "20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md" --- ...ning up Ubuntu 14.10,14.04,13.10 system.md | 204 ++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 translated/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md diff --git a/translated/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md b/translated/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md new file mode 100644 index 0000000000..a49467781e --- /dev/null +++ b/translated/tech/20150126 Cleaning up Ubuntu 14.10,14.04,13.10 system.md @@ -0,0 +1,204 @@ +清理 Ubuntu 14.10,14.04,13.10 系统 +================================================================================ +前面我们已经讨论了[如何清理 Ubuntu GNU/Linux 系统][1]，这篇教程将在原有教程的基础上，增加对新的 Ubuntu 发行版本的支持，并介绍更多的工具。 + +假如你想清理你的 Ubuntu 主机，你可以按照以下的一些简单步骤来移除所有不需要的垃圾文件。 + +### 移除多余软件包 ### + +这又是一个内置功能，但这次我们不必使用新得立包管理软件(Synaptic Package Manager)，而是在终端中达到目的。 + +现在，在终端窗口中键入如下命令： + +``` +sudo apt-get autoclean +``` + +这便激活了包清除命令。这个命令所做的工作是： 自动清除那些当你安装或升级程序时系统所缓存的 `.deb` 包(即清除 `/var/cache/apt/archives` 目录，不过只清理过时的包)。如果需要使用 清除命令，只需在终端窗口中键入以下命令： + +``` +sudo apt-get clean +``` + +然后你就可以使用自动移除命令。这个命令所做的工作是：清除那些 在系统中被某个已经卸载的软件 作为依赖所安装的软件包。要使用自动移除命令，在终端窗口中键入以下命令： + +``` +sudo apt-get autoremove +``` + +### 移除不需要的本地数据 ### + +为达到此目的，我们需要安装 `localepurge` 软件,它将自动移除一些不需要的本地数据。这个软件是一个简单的脚本，它将从那些 不再需要的本地文件和本地联机手册( man pages ) 所占用的空间中回收磁盘空间。这个软件将在任何 apt 安装命令运行时 被自动激活。 + +在 Ubuntu 中安装 `localepurge` + +``` +sudo apt-get install localepurge +``` + +在通过 `apt-get install` 安装任意软件后， localepurge 将移除所有 不是使用你系统中所设定语言的 翻译文件和翻译的联机手册。 + +假如你想设置 `localepurge`，你需要编辑 `/ect/locale.nopurge` 文件。 + +根据你已经安装的软件，这将为你节省几兆的磁盘空间。 + +例子：- + +假如我试着使用 `apt-get` 来安装 `dicus`软件： + +``` +sudo apt-get install discus +``` + +在软件安装完毕之后，你将看到如下提示： + +> localepurge: Disk space freed in /usr/share/locale: 41860K + +### 移除 孤包 ### + +假如你想移除孤包,你需要安装 `deborphan` 软件: + +在 Ubuntu 中安装 `deborphan` : + +``` +sudo apt-get install deborphan +``` + +### 使用 deborphan ### + +打开终端并键入如下命令即可: + +``` +sudo deborphan | xargs sudo apt-get -y remove --purge +``` + +### 使用 GtkOrphan 来移除 孤包 ### + +`GtkOrphan` (一个针对 debian 系发行版本的 Perl/Gtk2 应用) 是一个分析 用户安装过程状态并查找孤立库文件的图形化工具, 它为 `deborphan` 提供了一个 GUI 前端,并具备移除软件包的功能。 + +### 在 Ubuntu 中安装 GtkOrphan ### + +打开终端并运行如下命令： + +``` +sudo apt-get install gtkorphan +``` + +#### 一张截图 #### + +![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/41.png) + +### 使用 Wajig 移除孤包 ### + +`Wajig`是 Debian 包管理系统中一个简单的软件包管理前端。它将 apt、apt-cache、 dpkg、 /etc/init.d 中的脚本等 通过一个单一命令集成在一起，它的设计初衷是 使用简单 和 为它所包含的函数提供丰富的文档。 + +通过适当的 `sudo`配置，大多数（如果不是全部）的软件包安装和创建等任务可以通过 一个用户 shell 来完成。`Wajig` 也适用于一般的系统管理。另外，一个 Gnome GUI 命令 `gjig`也被囊括在这个软件包之中。 + +### 在 Ubuntu 中安装 Wajig ### + +打开终端并运行如下命令： + +``` +sudo apt-get install wajig +``` + +### Debfoster --- 跟踪你在安装过程中的操作 ### + +debfoster 将会维护一个列有 被明确要求安装的软件包的列表，但不包括那些作为某个软件的依赖而被安装的软件包。参数是完全可选的，你甚至可以使得 在 dpkg 和/或 apt-get 每次运行之后的每一秒内 激活 debfoster 。 + +另外，你还可以在命令行中使用 debfoster 来安装或移除某些特定的软件包。那些后缀为 `---` 的软件包将会被移除，而没有后缀的软件包将会被安装。 + +假如一个新的软件包或 debfoster 注意到 作为某个软件包的依赖的软件包 是一个孤包，则 debfoster 将会询问你下一步如何操作。若你决定保留这个孤包， debfoster 将只会进行记录并继续安装过程；若你觉得这个软件包不足以引起你的兴趣，在 debfoster 询问这个问题后，它将移除这个软件包。进一步的，如果你的决定使得其他的软件包变为孤包，更多的提问将会接踵而来。 + +### 在 Ubuntu 中安装 debfoster ### + +打开终端并运行如下命令： + +``` +sudo apt-get install debfoster +``` + +### 使用 debfoster ### + +为了创建一个 初始跟踪文件，可以使用如下命令： + +``` +sudo debfoster -q +``` + +你总可以编辑 `/var/lib/debfoster/keepers` 文件，来定义那些 你想留在系统中的软件包。 + +为了编辑这个文件，可以键入： + +``` +sudo vi /var/lib/debfoster/keepers +``` + +强制使 debfoster 去移除 所有没有被列在上面这个文件的软件包 或 安装作为某些列在这个文件中的软件包的依赖， 它也会添加所有在这个列表中没有被安装的软件包。若要根据这个列表来执行相关操作，只需执行 + +``` +sudo debfoster -f +``` + +若需要跟踪你新安装的软件包，你需要时不时地执行如下命令： + +``` +sudo debfoster +``` + +### xdiskusage -- 查看你的硬盘空间都去哪儿了 ### + +图形化地展示磁盘使用情况的 du.xdiskusage 是一个用户友好型程序，它将为你展示你所有磁盘的使用情况。 它是在 Phillip C. Dykstra 所写的 “xdu” 程序的基础上设计的。一些改变使得它可以为你运行 “du”命令，并显示磁盘的剩余空间，并且假如你想清晰地了解你的磁盘空间都去哪儿了，它还可以生成一个 PostScript 格式的名为 display.xdiskusage 的文件。 + +### 在 Ubuntu 中安装 xdiskusage ### + +只需使用如下命令： + +``` +sudo apt-get install xdiskusage +``` + +若你想打开这个应用，你需要使用如下命令： + +``` +sudo xdiskusage +``` + +一旦这个应用被打开，你将看到如下图所示的界面： + +![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/5.png) + + +### Bleachbit ### + +BleachBit 能快速地释放磁盘空间并不知疲倦地保护你的隐私。它可以 释放缓存，删除 cookie，清除 Internet 上网历史，粉碎临时文件，删除日志，丢弃你所不知道存在何处的垃圾。为 Linux 和 Windows 系统设计，它支持擦除清理数以千计的应用程序，如 Firefox, Internet Explorer, Adobe Flash, Google Chrome, Opera, Safari 等等。除了简单地删除文件，BleachBit 还包括许多高级功能，诸如 粉碎文件以防止恢复，擦除磁盘空间 来隐藏被其他应用程序所删除文件的痕迹，为火狐“除尘”，使其速度更快等。比免费更好，BleachBit 是一个开源软件。 + +### 在 Ubuntu 中安装 Bleachbit ### + +打开终端并运行如下命令： + +``` +sudo apt-get install bleachbit +``` + +### 一张截图 ### + +![](http://www.ubuntugeek.com/wp-content/uploads/2015/01/6.png) + +### 使用 Ubuntu-Tweak ### + +最后，你也可以使用 [Ubuntu-Tweak][2] 来清理你的系统。 + +-------------------------------------------------------------------------------- + +via: http://www.ubuntugeek.com/cleaning-up-a-ubuntu-gnulinux-system-updated-with-ubuntu-14-10-and-more-tools-added.html + +作者：[ruchi][a] +译者：[FSSlc](https://github.com/FSSlc) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.ubuntugeek.com/author/ubuntufix +[1]:http://www.ubuntugeek.com/cleaning-up-all-unnecessary-junk-files-in-ubuntu.html +[2]:http://www.ubuntugeek.com/www.ubuntugeek.com/install-ubuntu-tweak-on-ubuntu-14-10.html From b9aaa625d48b6171ff286fdd88de6973004a1d0e Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 21:08:50 +0800 Subject: [PATCH 095/207] Update 20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md --- ...How To Check If A Package Is Installed Or Not In Ubuntu.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md b/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md index 6b68f02b1e..7fe8ae172c 100644 --- a/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md +++ b/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md @@ -1,3 +1,5 @@ +Translating-----geekpi + Linux Basics: How To Check If A Package Is Installed Or Not In Ubuntu ================================================================================ ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/04/ubuntu-790x558.png) @@ -134,4 +136,4 @@ via: http://www.unixmen.com/linux-basics-check-package-installed-not-ubuntu/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[a]:http://www.unixmen.com/author/sk/ \ No newline at end of file +[a]:http://www.unixmen.com/author/sk/ From 4ad74fa941a3713540e25d57a90448c84feb9e3b Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 21:22:44 +0800 Subject: [PATCH 096/207] translated --- ...A Package Is Installed Or Not In Ubuntu.md | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) rename {sources => translated}/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md (77%) diff --git a/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md b/translated/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md similarity index 77% rename from sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md rename to translated/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md index 7fe8ae172c..9139b8dd92 100644 --- a/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md +++ b/translated/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md @@ -1,18 +1,16 @@ -Translating-----geekpi - -Linux Basics: How To Check If A Package Is Installed Or Not In Ubuntu +Linux 基础：如何在Ubuntu上检查是否已经安装了一个包 ================================================================================ ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/04/ubuntu-790x558.png) -If you’re managing Debian or Ubuntu servers, probably, you may use **dpkg** or **apt-get** commands often. These two commands are used to install, remove, update packages. +如果你正在管理Debian或者Ubuntu服务器，你也许会经常使用**dpkg** 或者 **apt-get**命令。这两个命令用来安装、卸载和更新包。 -In this brief tutorial, let us see how to check if a package is installed or not in DEB based systems. +在本篇中，让我们看下如何在基于DEB的系统下检查是否安装了一个包。 -To check whether a particular package for example firefox, is installed or not using command: +要检查特定的包，比如firefox是否安装了，使用这个命令： dpkg -s firefox -Sample output: +示例输出： Package: firefox Status: install ok installed @@ -38,13 +36,13 @@ Sample output: and integrated search let you get the most out of the web. Xul-Appid: {ec8030f7-c20a-464f-9b0e-13a3a9e97384} -As you see in the above output, the firefox is installed. +如上所见，firefox已经安装了。 -Also, you can do the same using **dpkg-query** command. This command displays the decent output, and ofcourse, you can wild cards too. +同样，你可以使用**dpkg-query** 命令。这个命令会有一个更好的输出，当然，你可以用通配符。 dpkg-query -l firefox -Sample output: +示例输出： Desired=Unknown/Install/Remove/Purge/Hold | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend @@ -53,11 +51,11 @@ Sample output: +++-====================================-=======================-=======================-============================================================================= ii firefox 35.0+build3-0ubuntu0.14 amd64 Safe and easy web browser from Mozilla -To list all installed package in your system, enter the following command +要列出你系统中安装的包，输入下面的命令： dpkg --get-selections -Sample output: +示例输出： abiword install abiword-common install @@ -81,13 +79,13 @@ Sample output: zlib1g:amd64 install zlib1g:i386 install -The above might be very long depending upon the number of packages you have installed on your system. +上面的输出可能会非常长，这依赖于你的系统已安装的包。 -You can also filter through **grep** to get results for the exact package you need. For example, I want to see which gcc packages are already installed on my system using **dpkg** command: +你同样可以通过**grep**来过滤割到更精确的包。比如，我想要使用**dpkg**命令查看系统中安装的gcc包： dpkg --get-selections | grep gcc -Sample output: +示例输出： gcc install gcc-4.8 install @@ -99,11 +97,11 @@ Sample output: libgcc1:amd64 install libgcc1:i386 install -Additionally, you can find location of the files within a package using the parameter “**-L**”. +额外的，你可以使用“**-L**”参数来找出包中文件的位置。 dpkg -L gcc-4.8 -Sample output: +示例输出： /. /usr @@ -122,16 +120,16 @@ Sample output: /usr/bin/x86_64-linux-gnu-gcc-ar-4.8 /usr/bin/x86_64-linux-gnu-gcov-4.8 -That’s all for now. Hope this short tutorial will useful for you. +就是这样了。希望这篇对你有用。 -Good day! +美好的一天！ -------------------------------------------------------------------------------- via: http://www.unixmen.com/linux-basics-check-package-installed-not-ubuntu/ 作者：[SK][a] -译者：[译者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/) 荣誉推出 From 9b23ad7309c2fcad36cf88c9feb0ffad9da26917 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 21:28:56 +0800 Subject: [PATCH 097/207] Rename translated/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md to sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md --- ...cs--How To Check If A Package Is Installed Or Not In Ubuntu.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {translated => sources}/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md (100%) diff --git a/translated/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md b/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md similarity index 100% rename from translated/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md rename to sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md From ab71b2b62bf5448d4986411c7ce0bcc7f906ebd4 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 21:30:00 +0800 Subject: [PATCH 098/207] translated --- ...cs--How To Check If A Package Is Installed Or Not In Ubuntu.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {sources => translated}/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md (100%) diff --git a/sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md b/translated/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md similarity index 100% rename from sources/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md rename to translated/tech/20150128 Linux Basics--How To Check If A Package Is Installed Or Not In Ubuntu.md From 4854a7761095b1b10506828ba05337baaed2eb6a Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Thu, 29 Jan 2015 08:53:56 +0800 Subject: [PATCH 099/207] Update 20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【translating】准备翻译这篇文章。 --- ...nd And Remove Duplicate Files Instantly From Hard Drive.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md b/sources/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md index d81a33de40..b9e9598d16 100644 --- a/sources/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md +++ b/sources/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md @@ -1,3 +1,5 @@ +Translating by FSSlc + dupeGuru – Find And Remove Duplicate Files Instantly From Hard Drive ================================================================================ ### Introduction ### @@ -95,4 +97,4 @@ via: http://www.unixmen.com/dupeguru-find-remove-duplicate-files-instantly-hard- [a]:http://www.unixmen.com/author/sk/ [1]:http://www.hardcoded.net/dupeguru/ [2]:http://www.hardcoded.net/dupeguru_me/ -[3]:http://www.hardcoded.net/dupeguru_pe/ \ No newline at end of file +[3]:http://www.hardcoded.net/dupeguru_pe/ From 77d386e9c72afc3ccbaaa057e5d09e1493f7766e Mon Sep 17 00:00:00 2001 From: geekpi Date: Thu, 29 Jan 2015 10:48:40 +0800 Subject: [PATCH 100/207] translating --- .../20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md b/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md index 2a004ed174..489e78dfaf 100644 --- a/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md +++ b/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md @@ -1,3 +1,5 @@ +Translating---geekpi + LinSSID – A Graphical Wi-Fi Scanner for Linux ================================================================================ ### Introduction ### @@ -58,4 +60,4 @@ via: http://www.unixmen.com/linssid-graphical-wi-fi-scanner-linux/ [a]:http://www.unixmen.com/author/sk/ [1]:http://sourceforge.net/projects/linssid/files/ -[2]:http://sourceforge.net/projects/linssid/ \ No newline at end of file +[2]:http://sourceforge.net/projects/linssid/ From 17e8c6440bc21ca8c8068170b2ed2f1532c461b5 Mon Sep 17 00:00:00 2001 From: Frank Zhang Date: Thu, 29 Jan 2015 10:55:40 +0800 Subject: [PATCH 101/207] [translating] 20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md --- ...ll Primer--Master Your Linux OS X Unix Shell Environment.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md b/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md index eafc6d21e5..4f46e43dd7 100644 --- a/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md +++ b/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md @@ -1,3 +1,4 @@ +zpl1025 A Shell Primer: Master Your Linux, OS X, Unix Shell Environment ================================================================================ On a Linux or Unix-like systems each user and process runs in a specific environment. An environment includes variables, settings, aliases, functions and more. Following is a very brief introduction to some useful shell environment commands, including examples of how to use each command and setup your own environment to increase productivity in the command prompt. @@ -689,4 +690,4 @@ via: http://www.cyberciti.biz/howto/shell-primer-configuring-your-linux-unix-osx [12]:http://www.cyberciti.biz/faq/fedora-redhat-scientific-linuxenable-bash-completion/ [13]:http://www.cyberciti.biz/tips/howto-linux-unix-bash-shell-setup-prompt.html [14]:http://bash.cyberciti.biz/guide/Setting_shell_options -[15]:http://www.cyberciti.biz/write-for-nixcraft/ \ No newline at end of file +[15]:http://www.cyberciti.biz/write-for-nixcraft/ From 543d0957b8cacf54fa53b02e48cb3d119f2e2f12 Mon Sep 17 00:00:00 2001 From: geekpi Date: Thu, 29 Jan 2015 11:08:31 +0800 Subject: [PATCH 102/207] translated --- ...ID--A Graphical Wi-Fi Scanner for Linux.md | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md b/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md index 489e78dfaf..5935a4545c 100644 --- a/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md +++ b/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md @@ -1,59 +1,58 @@ -Translating---geekpi - -LinSSID – A Graphical Wi-Fi Scanner for Linux +LinSSID - 一款Linux下的图形化Wi-Fi扫描器 ================================================================================ -### Introduction ### +### 介绍 ### -As you may know, **LinSSID** is a simple graphical software that can be used to find the wireless networks available.It is completely open source, written in C++ using Linux wireless tools, Qt5, and Qwt 6.1., and is similar to **Inssider** (MS Windows) in terms of look and functionality. +如你所知，**LinSSID** 是一款可以用于寻找可用无线网络的图形化软件。它完全开源，用C++写成，使用了Linux无线工具、Qt5、Qwt6.1，它在外观和功能上与**Inssider** （MS Windows）相近。 -### Installation ### +### 安装 ### -You can install it either using source, or using a PPA if you use DEB based systems such as Ubuntu, and LinuxMint etc. +你可以使用源码安装，如果你使用的是基于DEB的系统比如Ubuntu和LinuxMint等等，你也可以使用PPA安装。 -You can download and install LinSSID using source packages from [this link][1]. +你可用从[this link][1]这个链接下载并安装LinSSID。 -Here, we will install and test this software on Ubuntu 14.04 LTS using PPA. +这里我门将使用PPA来安装并测试这个软件。 -Add the LinSSID PPA, and install it by typing. +添加LinSSID的PPA并输入下面的命令安装。 sudo add-apt-repository ppa:wseverin/ppa sudo apt-get update sudo apt-get install linssid -### Usage ### +### 用法 ### -Once you installed, launch it either from menu or unity. +安装完成之后，你可以从菜单或者unity中启动。 -You”ll be asked to enter the administrative user password of your system. +你将被要求输入管理员密码。 ![Password required for iwlist scan_001](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Password-required-for-iwlist-scan_001.png) -This is how LinSSID interface looks. +这就是LinSSID的界面。 ![LinSSID_002](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/LinSSID_002.png) -Now, select the network interface you used to connect to the Wireless networks, for example wlan0 in my case. Click the Play button to search the list of available wi-fi networks. +现在选择你想要连接无线网络的网卡，比如这里是wlan0.点击Play按钮来搜寻wi-fi网络列表。 -After a new seconds, LinSSID will display the wi-fi networks. +几秒钟之后，LinSSID就会显示wi-fi网络了。 ![LinSSID_003](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/LinSSID_003.png) -As you see in the above screenshot, LinSSID displays the details of SSID names, MAC Id, Channel, Privacy, Cipher, Signal, and Protocol etc. Ofcourse, you can make LinSSID to display more options such as Security, bandwidth details etc. To do that, go to **View** menu, and select the desired option. Also, it displays the graphs of signal strength by channel and over time. Additionally, It works both on 2.4Ghz, and 5Ghz channels. +如你在上面的截屏中所见，LinSSID显示SSID名、MAC ID、通道、隐私、加密方式、信号和协议等等信息。当然，你可以让LinSSID显示更多的选项，比如安全、带宽等等。要显示这些，进入**View**菜单并选择需要的选项。同样，它显示了不同通道中的信号随着时间信号强度的变化。最后，它可以工作在2.4Ghz和5Ghz通道上。 -That’s it. Hope this tool will useful for you. -Cheers!! +就是这样。希望这个工具对你有用。 -Reference Links: +干杯！！ -- [LinSSID Homepage][2] +参考链接： + +- [LinSSID 主页][2] -------------------------------------------------------------------------------- via: http://www.unixmen.com/linssid-graphical-wi-fi-scanner-linux/ 作者：[SK][a] -译者：[译者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/) 荣誉推出 From d561a85fbea44255e02bd2d1577568a8cdb98198 Mon Sep 17 00:00:00 2001 From: geekpi Date: Thu, 29 Jan 2015 11:11:10 +0800 Subject: [PATCH 103/207] Rename sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md to translated/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md --- .../tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {sources => translated}/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md (100%) diff --git a/sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md b/translated/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md similarity index 100% rename from sources/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md rename to translated/tech/20150127 LinSSID--A Graphical Wi-Fi Scanner for Linux.md From 7b143a8b5bcc95550f6577ea400fa095fdf8885e Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Thu, 29 Jan 2015 14:42:46 +0800 Subject: [PATCH 104/207] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...gration From 2.2 to 2.4 on Ubuntu 14.04.md | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md b/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md index f4edd9e627..dc42dae33a 100644 --- a/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md +++ b/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md @@ -1,21 +1,21 @@ -Ubuntu 14.04 Apache2.2迁移2.4问题解决 +小贴士：在 Ubuntu 14.04 中Apache从2.2迁移到2.4的问题 ================================================================================ -如果你进行了一次**Ubuntu**从12.04到14.04的升级，那么这次升级还包括了一个重大的升级--**Apache**从2.2版本到2.4版本。**Apache**的这次升级带来了许多性能提升，但是如果继续使用2.2的配置会导致很多错误。 +如果你进行了一次**Ubuntu**从12.04到14.04的升级，那么它还包括了一个重大的升级--**Apache**从2.2版本升级到2.4版本。**Apache**的这次升级带来了许多性能提升，但是如果继续使用2.2的配置文件会导致很多错误。 ### 访问控制的改变 ### -从**Apache 2.4**起，授权（authorization）开始启用，比起2.2的一个检查一个数据存储，授权更加灵活。过去很难确定那些命令授权应用了，但是授权（authorization）的引入解决了这些问题，现在，配置可以控制什么时候授权方法被调用，什么条件决定何时授权访问。 +从**Apache 2.4**起，授权（authorization）开始启用，比起2.2的一个检查一个数据存储，授权更加灵活。过去很难确定授权如何并且以什么样的顺序被应用，但是授权容器指令的介绍解决了这些问题，现在，配置可以控制什么时候授权方法被调用，什么条件决定何时授权访问。 这就是为什么大多数的升级失败是由于错误配置，2.2的访问控制基于IP地址，主机名和其他字符通过使用指令Order，来设置Allow, Deny或 Satisfy，但是2.4，这些一切被新模板授权（authorization）来替代检查。 -为了弄清楚这些，可以来看一些虚拟主机的例子，这些可以在/etc/apache2/sites-enabled/default 或者 /etc/apache2/sites-enabled/网页名称 中找到: +为了弄清楚这些，可以来看一些虚拟主机的例子，这些可以在/etc/apache2/sites-enabled/default 或者 /etc/apache2/sites-enabled/你的网页名称 中找到: -老2.2虚拟主机配置： +旧的2.2虚拟主机配置： Order allow,deny Allow from all -新2.4虚拟主机配置： +新的2.4虚拟主机配置： Require all granted @@ -23,24 +23,24 @@ Ubuntu 14.04 Apache2.2迁移2.4问题解决 ### .htaccess 问题 ### -升级后如果一些设置不执行或者得到重定向错误，检查是否这些设置是在.htaccess文件中。如果是，2.4已经不再使用.htaccess文件，在2.4中默认使用AllowOverride指令来设置，因此忽略了.htaccess文件。你需要做的就是改变和增加AllowOverride All命令到你的页面配置文件中。 +升级后如果一些设置不执行或者得到重定向错误，检查是否这些设置是在.htaccess文件中。如果是，2.4已经不再使用.htaccess文件，在2.4中默认使用AllowOverride指令来设置，因此忽略了.htaccess文件。你需要做的全部就是改变或者添加AllowOverride All命令到你的网站配置文件中。 上面截图中，可以看见AllowOverride All指令。 ### 丢失配置文件或者模块 ### -根据我的经验，这次升级带了其他问题就是老模块和配置文件不再需要或者不被支持了。所以你必须十分清楚Apache不再支持的各种文件，并且在老配置中移除这些老模块来解决问题。之后你可以搜索和安装相似的模块来替代。 +根据我的经验，这次升级带来的另一个问题就是在2.4中旧模块和配置文件不再需要或者不被支持了。你将会收到一条“Apache不能包含这个相应文件”的明确警告，你需要做的是在配置文件中移除这些导致问题的命令行。之后你可以搜索和安装相似的模块来替代。 -### 其他需要的知道的小改变 ### +### 其他需要了解的小改变 ### 这里还有一些其他改变的需要考虑，虽然这些通常只会发生警告，而不是错误。 -- MaxClients重命名为MaxRequestWorkers，使之有更准确的描述。而异步MPM，如event，客服端最大连接数不量比与工作线程数。老名字依然支持。 +- MaxClients重命名为MaxRequestWorkers，使之有更准确的描述。而异步MPM，如event，客户端最大连接数不量比于工作线程数。旧的名字依然支持。 - DefaultType命令无效，使用它已经没有任何效果了。需要使用其他配置设定来替代它 - EnableSendfile默认关闭 - FileETag 默认"MTime Size"（没有INode） -- KeepAlive 只接受On或Off值。之前的任何值不是Off或者0都认为是On -- Mutex 替代 Directives AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex, 和 WatchdogMutexPath 。需要删除或者替代所有2.2老配置的设置。 +- KeepAlive 只接受“On”或“Off”值。之前的任何不是“Off”或者“0”的值都被认为是“On” +- Mutex 已经替代了 Directives AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex 和 WatchdogMutexPath 。你需要做的是估计一下这些被移动的指令在2.2中的使用情况，来决定是否删除或者使用Mutex来替代。 -------------------------------------------------------------------------------- From 46d31701a4ab2de3ceb43f028d0d14f22c94bba8 Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Thu, 29 Jan 2015 14:43:23 +0800 Subject: [PATCH 105/207] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md b/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md index dc42dae33a..49c465d17d 100644 --- a/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md +++ b/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md @@ -48,7 +48,7 @@ via: http://linoxide.com/linux-how-to/apache-migration-2-2-to-2-4-ubuntu-14-04/ 作者：[Adrian Dinu][a] 译者：[Vic020/VicYu](http://vicyu.net) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 7ad95a117bec657a46f4ca6b4bdf635e01c2fe2b Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Thu, 29 Jan 2015 20:47:02 +0800 Subject: [PATCH 106/207] Delete 20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完毕，删除原文。 --- ...plicate Files Instantly From Hard Drive.md | 100 ------------------ 1 file changed, 100 deletions(-) delete mode 100644 sources/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md diff --git a/sources/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md b/sources/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md deleted file mode 100644 index b9e9598d16..0000000000 --- a/sources/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md +++ /dev/null @@ -1,100 +0,0 @@ -Translating by FSSlc - -dupeGuru – Find And Remove Duplicate Files Instantly From Hard Drive -================================================================================ -### Introduction ### - -Disk full is one of the big trouble for us. No matter how we’re careful, sometimes we might copy the same file to multiple locations, or download the same file twice unknowingly. Therefore, sooner or later we will end up with disk full error message, which is worst when we really need some space to store important data. If you believe your system has multiple duplicate files, then **dupeGuru** might help you. - -dupeGuru team have also developed applications called **dupeGuru Music Edition** to remove duplicate music files, and **dupeGuru Picture Edition** to remove duplicate pictures. - -### 1. dupeGuru (Standard Edition) ### - -For those who don’t know about [dupeGuru][1], It is a free, open source, cross-platform application that can used to find and remove the duplicate files in your system. It will run under Linux, Windows, and Mac OS X platforms. It uses a quick fuzzy matching algorithm to find the duplicate files in minutes. Also, you can tweak dupeGuru to find exactly what kind of duplicate files you want to, and eliminate what kind of files from deletion. It supports English, French, German, Chinese (Simplified), Czech, Italian, Armenian, Russian, Ukrainian, Brazilian, and Vietnamese. - -#### Install dupeGuru On Ubuntu 14.10/14.04/13.10/13.04/12.04 #### - -dupeGuru developers have created a Ubuntu PPA to ease the installation. To install dupeGuru, enter the following commands one by one in your Terminal. - - sudo apt-add-repository ppa:hsoft/ppa - sudo apt-get update - sudo apt-get install dupeguru-se - -#### Usage #### - -Usage is very simple. Launch dupeGuru either from Unity Dash or Menu. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru_007.png) - -Click + button on the bottom, and add the folder you want to scan. Click Scan button to start finding the duplicate files. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru_008.png) - -If the selected folder contains any duplicate files, it will display them. As you in the below screen shot, I have a duplicate file in the Downloads directory. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru-Results_009.png) - -Now, you can decide what to do. You can either delete the duplicate file, or rename it, or copy/move it to another location. To do that select the duplicate files, or check the box that says “**Dupes only**” on the Menu bar. If you selected the Dupes only option, the duplicates files will only visible. So you can select and delete them easily. Click on the **Actions** drop-down box. Finally, select the action you want to perform. Here, I just want to delete the duplicate file, so I selected the option: **Send marked to Recycle bin**. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/Menu_010.png) - -Then, click **Proceed** to delete the duplicate files. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/Deletion-Options_011.png) - -### 2. dupeGuru Music Edition ### - -[dupeGuru Music Edition][2] or dupeGuru ME in short, is just like dupeGuru. It does everything dupeGuru does, but it has more information columns (such as bitrate, duration, tags, etc..) and more scan types (filename with fields, tags and audio content). Like dupeGuru, dupeGuru ME also runs on Linux, Windows, and Mac OS X. - -It supports variety of formats such as MP3, WMA, AAC (iTunes format), OGG, FLAC, loss-less AAC and loss-less WMA etc, - -#### Install dupeGuru ME On Ubuntu 14.10/14.04/13.10/13.04/12.04 #### - -Now, we don’t have to add any PPA, because already the added in the previous steps. So, enter the following command to install from your Terminal. - - sudo apt-get install dupeguru-me - -#### Usage #### - -Launch it either from Unity dash or Menu. The usage, interface, and look of dupeGuru ME is similar to normal dupeGuru. Add the folder you to scan and select the action you want to perform. The duplicate music files will be deleted. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru-Music-Edition-Results_012.png) - -### 3. dupeGuru Picture Edition ### - -[dupeGuru Picture Edition][3], or duepGuru PE in short, is a tool to find duplicate pictures on your computer. It is as like as dupeGuru, but is specialized for duplicate pictures matching. dupeGuru PE runs on Linux, Windows, and Mac OS X. - -dupeGuru PE supports JPG, PNG, TIFF, GIF and BMP formats. All these formats can be compared together. The Mac OS X version of dupeGuru PE also supports PSD and RAW (CR2 and NEF) formats. - -#### Install dupeGuru PE On Ubuntu 14.10/14.04/13.10/13.04/12.04 #### - -As we have already added the PPA, We don’t need to add PPA for dupeGuru either. Just, run the following command to install it. - - sudo apt-get install dupeguru-pe - -#### Usage #### - -It’s also look like dupeGuru, and dupeGuru ME in terms of usage, interface, and look.I wonder why the developer have created there separate versions for each category. It would be better, a single application has all of the above three features combined. - -Launch it, add the folder you want to scan, and select the action you want to perform. That’s it. you duplicated files will be gone. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru-Picture-Edition-Results_014.png) - -If you can’t remove them in case of any security problems, note down the location of the files, and manually delete them either from Terminal or File manager. - -Cheers! - --------------------------------------------------------------------------------- - -via: http://www.unixmen.com/dupeguru-find-remove-duplicate-files-instantly-hard-drive/ - -作者：[SK][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.unixmen.com/author/sk/ -[1]:http://www.hardcoded.net/dupeguru/ -[2]:http://www.hardcoded.net/dupeguru_me/ -[3]:http://www.hardcoded.net/dupeguru_pe/ From ae1bd97ef60a9230a400cee35df766099a65bef4 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Thu, 29 Jan 2015 21:26:35 +0800 Subject: [PATCH 107/207] =?UTF-8?q?=E3=80=90translated=E3=80=91=2020141127?= =?UTF-8?q?=20dupeGuru--Find=20And=20Remove=20Duplicate=20Files=20Instantl?= =?UTF-8?q?y=20From=20Hard=20Drive?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完毕 “20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive” --- ...plicate Files Instantly From Hard Drive.md | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 translated/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md diff --git a/translated/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md b/translated/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md new file mode 100644 index 0000000000..17da6a9508 --- /dev/null +++ b/translated/tech/20141127 dupeGuru--Find And Remove Duplicate Files Instantly From Hard Drive.md @@ -0,0 +1,105 @@ +dupeGuru - 直接从硬盘中查找并移除重复文件 +================================================================================ + +### 简介 ### + +对我们来说，磁盘被装满是一个较大的困扰。无论我们如何小心谨慎，我们总可能将相同的文件复制到多个不同的地方，或者在不知情的情况下，重复下载了同一个文件。因此，迟早你会看到“磁盘已满”的错误提示，若此时我们确实需要一些磁盘空间来存储重要数据，以上情形无疑是最糟糕的。假如你确信自己的系统中有重复文件，那么 **dupeGuru** 可能会帮助到你。 + +dupeGuru 团队也开发了名为 **dupeGuru 音乐版** 的应用来移除重复的音乐文件，和名为 **dupeGuru 图片版** 的应用来移除重复的图片文件。 + +### 1. dupeGuru (标准版) ### + +对于那些不熟悉 [dupeGuru][1] 的人来说，它是一个免费，开源，跨平台的应用，其用途是在系统中查找和移除重复文件。它可以在 Linux, Windows, 和 Mac OS X 等平台下使用。通过使用一个快速的模糊匹配算法，它可以在几分钟内找到重复文件。同时，你还可以调整 dupeGuru 使它去精确查找特定文件类型的重复文件，以及从你想删除的文件中，消除特定的某些文件。它支持英语、 法语、 德语、 中文 （简体）、 捷克语、 意大利语、亚美尼亚语、 俄语、乌克兰语、巴西语和越南语。 + +#### 在 Ubuntu 14.10/14.04/13.10/13.04/12.04 中安装 dupeGuru #### + +dupeGuru 开发者已经构建了一个 Ubuntu PPA (Personal Package Archives)来简化安装过程。为了安装 dupeGuru，依次在终端中键入以下命令： + +``` +sudo apt-add-repository ppa:hsoft/ppa +sudo apt-get update +sudo apt-get install dupeguru-se +``` + +### 使用 ### + +使用非常简单，可从 Unity 面板或菜单中启动 dupeGuru 。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru_007.png) + +点击位于底部的 `+` 按钮来添加你想扫描的文件目录。点击 `扫描` 按钮开始查找重复文件。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru_008.png) + +一旦所选目录中含有重复文件，则它将在窗口中展示重复文件。正如你所看到的，在下面的截图中，我的下载目录中有一个重复文件。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru-Results_009.png) + +现在，你可以决定下一步如何操作。你可以删除这个重复的文件，或者对它进行重命名，抑或是 复制/移动 这个文件到另一个位置。为此，选定该重复文件，或 在菜单栏中选定写有“**仅显示重复**”选项 ，如果你选择了“**仅显示重复**”选项，则只有重复文件在窗口中可见，这样你便可以轻易地选择并删除这些文件。点击“操作”下拉菜单，最后选择你将执行的操作。在这里，我只想删除重复文件，所以我选择了“移动标记文件到垃圾箱”这个选项。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/Menu_010.png) + +接着，点击“继续”选项来移除重复文件。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/Deletion-Options_011.png) + +### 2. dupeGuru 音乐版 ### + +[dupeGuru 音乐版][2] 或 简称 dupeGuru ME ，它的功能与 dupeGuru 类似。它拥有 dupeGuru 的所有功能，但它包含更多的信息列 （如比特率，持续时间，标签等）和更多的扫描类型（如带有字段的文件名，标签以及音频内容）。同 dupeGuru 一样， dupeGuru ME 也运行在 Linux, Windows, 和 Mac OS X 中。 + +它支持众多的格式，诸如 MP3, WMA, AAC (iTunes 格式), OGG, FLAC, 即失真率较少的 AAC 和 WMA 格式等。 + +#### 在 Ubuntu 14.10/14.04/13.10/13.04/12.04 中安装 dupeGuru ME #### + +现在，我们不必再添加任何 PPA，因为在前面的步骤中，我们已经进行了添加。所以在终端中键入以下命令来安装它： + +``` +sudo apt-get install dupeguru-me +``` + +### 使用 ### + +你可以从 Unity 面板或菜单中启动它。dupeGuru ME 的使用方法，操作界面和外观与正常的 dupeGuru 类似。添加你想扫描的目录并选择你想执行的操作。重复的音乐文件就会被删除。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru-Music-Edition-Results_012.png) + +### 3. dupeGuru 图片版 ### + +[dupeGuru 图片版][3],或简称为 duepGuru PE，是一个在你的电脑中查找重复图片的工具。它与 dupeGuru 类似，但独具匹配重复图片的功能。dupeGuru PE 可运行在 Linux, Windows, 和 Mac OS X 中。 + +dupeGuru PE 支持 JPG, PNG, TIFF, GIF 和 BMP 等图片格式。所有的这些格式可以被同时比较。Mac OS X 版的 dupeGuru PE 还支持 PSD 和 RAW (CR2 和 NEF) 格式。 + +#### 在 Ubuntu 14.10/14.04/13.10/13.04/12.04 中安装 dupeGuru PE #### + +由于我们已经添加了 PPA， 我们也不必为 dupeGuru PE 添加 PPA。只需运行如下命令来安装它。 + +``` +sudo apt-get install dupeguru-pe +``` + +#### 使用 #### + +就使用方法，操作界面和外观而言，它与 dupeGuru ，dupeGuru ME 类似。我就纳闷为什么开发者为不同的类别开发了不同的版本。我想如果开发一个结合以上三个版本功能的应用，或许会更好。 + +启动它，添加你想扫描的目录，并选择你想执行的操作。就这样，你的重复文件将消失。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/dupeGuru-Picture-Edition-Results_014.png) + +如若因为任何的安全问题而不能移除某些重复文件，请记下这些文件的位置，通过终端或文件管理器来手动删除它们。 + +欢呼吧！ + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/dupeguru-find-remove-duplicate-files-instantly-hard-drive/ + +作者：[SK][a] +译者：[FSSlc](https://github.com/FSSlc) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/sk/ +[1]:http://www.hardcoded.net/dupeguru/ +[2]:http://www.hardcoded.net/dupeguru_me/ +[3]:http://www.hardcoded.net/dupeguru_pe/ From c2d349c526fb7937b23c78f2cd217f4c5b4384a9 Mon Sep 17 00:00:00 2001 From: wxy Date: Fri, 30 Jan 2015 08:12:32 +0800 Subject: [PATCH 108/207] PUB:20141203 Docker--Present and Future MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @disylee 这篇是挺难的，我校对也花了一晚上呢，辛苦你啦~ --- .../20141203 Docker--Present and Future.md | 158 ++++++++++++++++ .../20141203 Docker--Present and Future.md | 168 ------------------ 2 files changed, 158 insertions(+), 168 deletions(-) create mode 100644 published/20141203 Docker--Present and Future.md delete mode 100644 translated/talk/20141203 Docker--Present and Future.md diff --git a/published/20141203 Docker--Present and Future.md b/published/20141203 Docker--Present and Future.md new file mode 100644 index 0000000000..bdec540363 --- /dev/null +++ b/published/20141203 Docker--Present and Future.md @@ -0,0 +1,158 @@ +Docker 的现状与未来 +================================================================================ + +### Docker - 迄今为止发生的那些事情 ### + +Docker 是一个专为 Linux 容器而设计的工具集，用于‘构建、交付和运行’分布式应用。它最初是 DotCloud 的一个开源项目，于2013年3月发布。这个项目越来越受欢迎，以至于 DotCloud 公司都更名为 Docker 公司（并最终[出售了原有的 PaaS 业务][1])。[Docker 1.0][2]是在2014年6月发布的，而且延续了之前每月更新一个版本的传统。 + +Docker 1.0版本的发布标志着 Docker 公司认为该平台已经充分成熟，足以用于生产环境中（由该公司与合作伙伴提供付费支持选择）。每个月发布的更新表明该项目正在迅速发展，比如增添一些新特性、解决一些他们发现的问题。该项目已经成功地分离了‘运行’和‘交付’两件事，所以来自任何版本的 Docker 镜像源都可以与其它版本共同使用（具备向前和向后兼容的特性），这为 Docker 应对快速变化提供了稳定的保障。 + +Docker 之所以能够成为最受欢迎的开源项目之一可能会被很多人看做是炒作，但是也是由其坚实的基础所决定的。Docker 的影响力已经得到整个行业许多大企业的支持，包括亚马逊, Canonical 公司, CenturyLink, 谷歌, IBM, 微软, New Relic, Pivotal, 红帽和 VMware。这使得只要有 Linux 的地方，Docker 就可以无处不在。除了这些鼎鼎有名的大公司以外，许多初创公司也在围绕着 Docker 发展，或者改变他们的发展方向来与 Docker 更好地结合起来。这些合作伙伴们（无论大或小）都将帮助推动 Docker 核心项目及其周边生态环境的快速发展。 + +### Docker 技术简要综述 ### + +Docker 利用 Linux 的一些内核机制例如 [cGroups][3]、命名空间和 [SElinux][4] 来实现容器之间的隔离。起初 Docker 只是 [LXC][5] 容器管理器子系统的前端，但是在 0.9 版本中引入了 [libcontainer][6]，这是一个原生的 go 语言库，提供了用户空间和内核之间的接口。 + +容器是基于 [AUFS][7] 这样的联合文件系统的，它允许跨多个容器共享组件，如操作系统镜像和已安装的相关库。这种文件系统的分层方法也被 [Dockerfile][8] 的 DevOps 工具所利用，这些工具能够缓存成功完成的操作。这就省下了安装操作系统和相关应用程序依赖包的时间，极大地加速测试周期。另外，在容器之间的共享库也能够减少内存的占用。 + +一个容器是从一个镜像开始运行的，它可以来自本地创建，本地缓存，或者从一个注册库（registry）下载。Docker 公司运营的 [Docker Hub 公有注册库][9]，为各种操作系统、中间件和数据库提供了官方仓库存储。各个组织和个人都可以在 docker Hub 上发布的镜像的公有库，也可以注册成私有仓库。由于上传的镜像可以包含几乎任何内容，所以 Docker 提供了一种自动构建工具（以往称为“可信构建”），镜像可以从一种称之为 Dockerfile 的镜像内容清单构建而成。 + +### 容器 vs. 虚拟机 ### + +容器会比虚拟机更高效，因为它们能够分享一个内核和分享应用程序库。相比虚拟机系统，这也将使得 Docker 使用的内存更小，即便虚拟机利用了内存超量使用的技术。部署容器时共享底层的镜像层也可以减少存储占用。IBM 的 Boden Russel 已经做了一些[基准测试][10]来说明两者之间的不同。 + +相比虚拟机系统，容器具有较低系统开销的优势，所以在容器中，应用程序的运行效率将会等效于在同样的应用程序在虚拟机中运行，甚至效果更佳。IBM 的一个研究团队已经发表了一本名为[虚拟机与 Linux 容器的性能比较]的文章[11]。 + +容器只是在隔离特性上要比虚拟机逊色。虚拟机可以利用如 Intel 的 VT-d 和 VT-x 技术的 ring-1 [硬件隔离][12]技术。这种隔离可以防止虚拟机突破和彼此交互。而容器至今还没有任何形式的硬件隔离，这使它容易受到攻击。一个称为 [Shocker][13] 的概念攻击验证表明，在 Docker 1.0 之前的版本是存在这种脆弱性的。尽管 Docker 1.0 修复了许多由 Shocker 漏洞带来的较为严重的问题，Docker 的 CTO Solomon Hykes 仍然[说][14]，“当我们可以放心宣称 Docker 的开箱即用是安全的，即便是不可信的 uid0 程序（超级用户权限程序），我们将会很明确地告诉大家。”Hykes 的声明承认，其漏洞及相关的风险依旧存在，所以在容器成为受信任的工具之前将有更多的工作要做。 + +对于许多用户案例而言，在容器和虚拟机之间二者选择其一是种错误的二分法。Docker 同样可以在虚拟机中工作的很好，这让它可以用在现有的虚拟基础措施、私有云或者公有云中。同样也可以在容器里跑虚拟机，这也类似于谷歌在其云平台的使用方式。像 IaaS 服务这样普遍可用的基础设施，能够即时提供所需的虚拟机，可以预期容器与虚拟机一起使用的情景将会在数年后出现。容器管理和虚拟机技术也有可能被集成到一起提供一个两全其美的方案；这样，一个硬件信任锚微虚拟化所支撑的 libcontainer 容器，可与前端 Docker 工具链和生态系统整合，而使用提供更好隔离性的不同后端。微虚拟化（例如 Bromium 的 [vSentry][15] 和 VMware 的 [Project Fargo][16])已经用于在桌面环境中以提供基于硬件的应用程序隔离，所以类似的方法也可以用于 libcontainer，作为 Linux内核中的容器机制的替代技术。 + +### ‘容器化’ 的应用程序 ### + +几乎所有 Linux 应用程序都可以在 Docker 容器中运行，并没有编程语言或框架的限制。唯一的实际限制是以操作系统的角度来允许容器做什么。即使如此，也可以在特权模式下运行容器，从而大大减少了限制（与之对应的是容器中的应用程序的风险增加，可能导致损坏主机操作系统）。 + +容器都是从镜像开始运行的，而镜像也可以从运行中的容器获取。本质上说，有两种方法可以将应用程序放到容器中，分别是手动构建和 Dockerfile。 + +#### 手动构建 #### + +手动构建从启动一个基础的操作系统镜像开始，然后在交互式终端中用你所选的 Linux 提供的包管理器安装应用程序及其依赖项。Zef Hemel 在‘[使用 Linux 容器来支持便携式应用程序部署][17]’的文章中讲述了他部署的过程。一旦应用程序被安装之后，容器就可以被推送至注册库（例如Docker Hub）或者导出为一个tar文件。 + +#### Dockerfile #### + +Dockerfile 是一个用于构建 Docker 容器的脚本化系统。每一个 Dockerfile 定义了开始的基础镜像，以及一系列在容器中运行的命令或者一些被添加到容器中的文件。Dockerfile 也可以指定对外的端口和当前工作目录，以及容器启动时默认执行的命令。用 Dockerfile 构建的容器可以像手工构建的镜像一样推送或导出。Dockerfile 也可以用于 Docker Hub 的自动构建系统，即在 Docker 公司的控制下从头构建，并且该镜像的源代码是任何需要使用它的人可见的。 + +#### 单进程? #### + +无论镜像是手动构建还是通过 Dockerfile 构建，有一个要考虑的关键因素是当容器启动时仅启动一个进程。对于一个单一用途的容器，例如运行一个应用服务器，运行一个单一的进程不是一个问题（有些关于容器应该只有一个单独的进程的争议）。对于一些容器需要启动多个进程的情况，必须先启动 [supervisor][18] 进程，才能生成其它内部所需的进程。由于容器内没有初始化系统，所以任何依赖于 systemd、upstart 或类似初始化系统的东西不修改是无法工作的。 + +### 容器和微服务 ### + +全面介绍使用微服务结构体系的原理和好处已经超出了这篇文章的范畴（在 [InfoQ eMag: Microservices][19] 有全面阐述）。然而容器是绑定和部署微服务实例的捷径。 + +大规模微服务部署的多数案例都是部署在虚拟机上，容器只是用于较小规模的部署上。容器具有共享操作系统和公用库的的内存和硬盘存储的能力，这也意味着它可以非常有效的并行部署多个版本的服务。 + +### 连接容器 ### + +一些小的应用程序适合放在单独的容器中，但在许多案例中应用程序需要分布在多个容器中。Docker 的成功包括催生了一连串新的应用程序组合工具、编制工具及平台作为服务(PaaS)的实现。在这些努力的背后，是希望简化从一组相互连接的容器来创建应用的过程。很多工具也在扩展、容错、性能管理以及对已部署资产进行版本控制方面提供了帮助。 + +#### 连通性 #### + +Docker 的网络功能是相当原始的。在同一主机，容器内的服务可以互相访问，而且 Docker 也可以通过端口映射到主机操作系统，使服务可以通过网络访问。官方支持的提供连接能力的库叫做 [libchan][20]，这是一个提供给 Go 语言的网络服务库，类似于[channels][21]。在 libchan 找到进入应用的方法之前，第三方应用仍然有很大空间可提供配套的网络服务。例如，[Flocker][22] 已经采取了基于代理的方法使服务实现跨主机（以及底层存储）的移植。 + +#### 合成 #### + +Docker 本身拥有把容器连接在一起的机制，与元数据相关的依赖项可以被传递到相依赖的容器中，并用于环境变量和主机入口。如 [Fig][23] 和 [geard][24] 这样的应用合成工具可以在单一文件中展示出这种依赖关系图，这样多个容器就可以汇聚成一个连贯的系统。CenturyLink 公司的 [Panamax][25] 合成工具类似 Fig 和 geard 的底层实现方法，但新增了一些基于 web 的用户接口，并直接与 GitHub 相结合，以便于应用程序分享。 + +#### 编制 #### + +像 [Decking][26]、New Relic 公司的 [Centurion][27] 和谷歌公司的 [Kubernetes][28] 这样的编制系统都是旨在协助容器的部署和管理其生命周期系统。也有许多 [Apache Mesos][30] （特别是 [Marathon（马拉松式）持续运行很久的框架]）的案例（例如[Mesosphere][29]）已经被用于配合 Docker 一起使用。通过为应用程序与底层基础架构之间（例如传递 CPU 核数和内存的需求）提供一个抽象的模型，编制工具提供了两者的解耦，简化了应用程序开发和数据中心操作。有很多各种各样的编制系统，因为许多来自内部系统的以前开发的用于大规模容器部署的工具浮现出来了；如 Kubernetes 是基于谷歌的 [Omega][32] 系统的，[Omega][32] 是用于管理遍布谷歌云环境中容器的系统。 + +虽然从某种程度上来说合成工具和编制工具的功能存在重叠，但这也是它们之间互补的一种方式。例如 Fig 可以被用于描述容器间如何实现功能交互，而 Kubernetes pods（容器组）可用于提供监控和扩展。 + +#### 平台（即服务）#### + +有一些 Docker 原生的 PaaS 服务实现，例如 [Deis][33] 和 [Flynn][34] 已经显现出 Linux 容器在开发上的的灵活性（而不是那些“自以为是”的给出一套语言和框架）。其它平台，例如 CloudFoundry、OpenShift 和 Apcera Continuum 都已经采取将 Docker 基础功能融入其现有的系统的技术路线，这样基于 Docker 镜像（或者基于 Dockerfile）的应用程序也可以与之前用支持的语言和框架的开发的应用一同部署和管理。 + +### 所有的云 ### + +由于 Docker 能够运行在任何正常更新内核的 Linux 虚拟机中，它几乎可以用在所有提供 IaaS 服务的云上。大多数的主流云厂商已经宣布提供对 Docker 及其生态系统的支持。 + +亚马逊已经把 Docker 引入它们的 Elastic Beanstalk 系统（这是在底层 IaaS 上的一个编制系统）。谷歌使 Docker 成为了“可管理的 VM”，它提供了GAE PaaS 和GCE IaaS 之间的中转站。微软和 IBM 也都已经宣布了基于 Kubernetes 的服务，这样可以在它们的云上部署和管理多容器应用程序。 + +为了给现有种类繁多的后端提供可用的一致接口，Docker 团队已经引进 [libswarm][35], 它可以集成于众多的云和资源管理系统。Libswarm 所阐明的目标之一是“通过切换服务来源避免被特定供应商套牢”。这是通过呈现一组一致的服务（与API相关联的）来完成的，该服务会通过特定的后端服务所实现。例如 Docker 服务器将支持本地 Docker 命令行工具的 Docker 远程 API 调用，这样就可以管理一组服务供应商的容器了。 + +基于 Docker 的新服务类型仍在起步阶段。总部位于伦敦的 Orchard 实验室提供了 Docker 的托管服务，但是 Docker 公司表示，收购 Orchard 后，其相关服务不会置于优先位置。Docker 公司也出售了之前 DotCloud 的PaaS 业务给 cloudControl。基于更早的容器管理系统的服务例如 [OpenVZ][36] 已经司空见惯了，所以在一定程度上 Docker 需要向主机托管商们证明其价值。 + +### Docker 及其发行版 ### + +Docker 已经成为大多数 Linux 发行版例如 Ubuntu、Red Hat 企业版（RHEL)和 CentOS 的一个标准功能。遗憾的是这些发行版的步调和 Docker 项目并不一致，所以在发布版中找到的版本总是远远落后于最新版本。例如 Ubuntu 14.04 版本中的版本是 Docker 0.9.1，而当 Ubuntu 升级至 14.04.1 时 Docker 版本并没有随之升级（此时 Docker 已经升至 1.1.2 版本）。在发行版的软件仓库中还有一个名字空间的冲突，因为 “Docker” 也是 KDE 系统托盘的名字；所以在 Ubuntu 14.04 版本中相关安装包的名字和命令行工具都是使用“Docker.io”的名字。 + +在企业级 Linux 的世界中，情况也并没有因此而不同。CentOS 7 中的 Docker 版本是 0.11.1，这是 Docker 公司宣布准备发行 Docker 1.0 产品版本之前的开发版。Linux 发行版用户如果希望使用最新版本以保障其稳定、性能和安全，那么最好地按照 Docker 的[安装说明][37]进行，使用 Docker 公司的所提供的软件库而不是采用发行版的。 + +Docker 的到来也催生了新的 Linux 发行版，如 [CoreOS][38] 和红帽的 [Project Atomic][39]，它们被设计为能运行容器的最小环境。这些发布版相比传统的发行版，带着更新的内核及 Docker 版本，对内存的使用和硬盘占用率也更低。新发行版也配备了用于大型部署的新工具，例如 [fleet][40]（一个分布式初始化系统）和[etcd][41]（用于元数据管理）。这些发行版也有新的自我更新机制，以便可以使用最新的内核和 Docker。这也意味着使用 Docker 的影响之一是它抛开了对发行版和相关的包管理解决方案的关注，而对 Linux 内核（及使用它的 Docker 子系统）更加关注。 + +这些新发行版也许是运行 Docker 的最好方式，但是传统的发行版和它们的包管理器对容器来说仍然是非常重要的。Docker Hub 托管的官方镜像有 Debian、Ubuntu 和 CentOS，以及一个‘半官方’的 Fedora 镜像库。RHEL 镜像在Docker Hub 中不可用，因为它是 Red Hat 直接发布的。这意味着在 Docker Hub 的自动构建机制仅仅用于那些纯开源发行版下（并愿意信任那些源于 Docker 公司团队提供的基础镜像）。 + +Docker Hub 集成了如 Git Hub 和 Bitbucket 这样源代码控制系统来自动构建包管理器，用于管理构建过程中创建的构建规范（在Dockerfile中）和生成的镜像之间的复杂关系。构建过程的不确定结果并非是 Docker 的特定问题——而与软件包管理器如何工作有关。今天构建完成的是一个版本，明天构建的可能就是更新的版本，这就是为什么软件包管理器需要升级的原因。容器抽象（较少关注容器中的内容）以及容器扩展（因为轻量级资源利用率）有可能让这种不确定性成为 Docker 的痛点。 + +### Docker 的未来 ### + +Docker 公司对核心功能（libcontainer），跨服务管理(libswarm) 和容器间的信息传递（libchan）的发展上提出了明确的路线。与此同时，该公司已经表明愿意收购 Orchard 实验室，将其纳入自身生态系统。然而 Docker 不仅仅是 Docker 公司的，这个项目的贡献者也来自许多大牌贡献者，其中不乏像谷歌、IBM 和 Red Hat 这样的大公司。在仁慈独裁者、CTO Solomon Hykes 掌舵的形势下，为公司和项目明确了技术领导关系。在前18个月的项目中通过成果输出展现了其快速行动的能力，而且这种趋势并没有减弱的迹象。 + +许多投资者正在寻找10年前 VMware 公司的 ESX/vSphere 平台的特征矩阵，并试图找出虚拟机的普及而带动的企业预期和当前 Docker 生态系统两者的距离（和机会）。目前 Docker 生态系统正缺乏类似网络、存储和（对于容器的内容的）细粒度版本管理，这些都为初创企业和创业者提供了机会。 + +随着时间的推移，在虚拟机和容器（Docker 的“运行”部分）之间的区别将变得没那么重要了，而关注点将会转移到“构建”和“交付”方面。这些变化将会使“Docker发生什么？”变得不如“Docker将会给IT产业带来什么？”那么重要了。 + + +-------------------------------------------------------------------------------- + +via: http://www.infoq.com/articles/docker-future + +作者：[Chris Swan][a] +译者：[disylee](https://github.com/disylee) +校对：[wxy](https://github.com/wxy) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.infoq.com/author/Chris-Swan +[1]:http://blog.dotcloud.com/dotcloud-paas-joins-cloudcontrol +[2]:http://www.infoq.com/news/2014/06/docker_1.0 +[3]:https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt +[4]:http://selinuxproject.org/page/Main_Page +[5]:https://linuxcontainers.org/ +[6]:http://blog.docker.com/2014/03/docker-0-9-introducing-execution-drivers-and-libcontainer/ +[7]:http://aufs.sourceforge.net/aufs.html +[8]:https://docs.docker.com/reference/builder/ +[9]:https://registry.hub.docker.com/ +[10]:http://bodenr.blogspot.co.uk/2014/05/kvm-and-docker-lxc-benchmarking-with.html?m=1 +[11]:http://domino.research.ibm.com/library/cyberdig.nsf/papers/0929052195DD819C85257D2300681E7B/$File/rc25482.pdf +[12]:https://en.wikipedia.org/wiki/X86_virtualization#Hardware-assisted_virtualization +[13]:http://stealth.openwall.net/xSports/shocker.c +[14]:https://news.ycombinator.com/item?id=7910117 +[15]:http://www.bromium.com/products/vsentry.html +[16]:http://cto.vmware.com/vmware-docker-better-together/ +[17]:http://www.infoq.com/articles/docker-containers +[18]:http://docs.docker.com/articles/using_supervisord/ +[19]:http://www.infoq.com/minibooks/emag-microservices +[20]:https://github.com/docker/libchan +[21]:https://gobyexample.com/channels +[22]:http://www.infoq.com/news/2014/08/clusterhq-launch-flocker +[23]:http://www.fig.sh/ +[24]:http://openshift.github.io/geard/ +[25]:http://panamax.io/ +[26]:http://decking.io/ +[27]:https://github.com/newrelic/centurion +[28]:https://github.com/GoogleCloudPlatform/kubernetes +[29]:https://mesosphere.io/2013/09/26/docker-on-mesos/ +[30]:http://mesos.apache.org/ +[31]:https://github.com/mesosphere/marathon +[32]:http://static.googleusercontent.com/media/research.google.com/en/us/pubs/archive/41684.pdf +[33]:http://deis.io/ +[34]:https://flynn.io/ +[35]:https://github.com/docker/libswarm +[36]:http://openvz.org/Main_Page +[37]:https://docs.docker.com/installation/#installation +[38]:https://coreos.com/ +[39]:http://www.projectatomic.io/ +[40]:https://github.com/coreos/fleet +[41]:https://github.com/coreos/etcd diff --git a/translated/talk/20141203 Docker--Present and Future.md b/translated/talk/20141203 Docker--Present and Future.md deleted file mode 100644 index da2b1b7b48..0000000000 --- a/translated/talk/20141203 Docker--Present and Future.md +++ /dev/null @@ -1,168 +0,0 @@ -Docker的现状与未来 -================================================================================ - -### Docker - 故事渊源流长 ### - -Docker是一个专为Linux容器而设计的工具集，用于‘构建，交付和运行’分布式应用。它最初是通过DotCloud作为一个开源项目在2013年3月的时候发布的。这个项目越来越受欢迎，这使得DotCloud更名为Docker公司（并最终 [出售了原有的PaaS业务][1]).[Docker 1.0][2]是在2014年6月发布的，而且延续了之前每月更新一个版本的习惯。 - - -1.0版本的发布标志着Docker公司认为这个平台的充分成熟已经足以用于生产环境中（由本公司与合作伙伴提供付费支持选项）.每个月发布的更新显示，该项目正在迅速发展，增添一些新特性、解决一些他们发现的问题。然而该项目已经成功地从‘运行’和‘交付’实现分离，所以任何版本的Docker镜像源都可以与其它版本共同使用（具备向前和向后兼容的特性），这为Docker使用的快速变化提供了稳定的保障。 - -Docker之所以能够成为最受欢迎的开源项目之一除了很多人会认为是的炒作成分，也是由坚实的物质基础奠定的。Docker的影响力已经得到整个行业许多品牌的支持，包括亚马逊, Canonical公司, 世纪互联, 谷歌, IBM, 微软, New Relic, Pivotal, 红帽和VMware. 这使只要Linux可使用的地方，Docker的使用便无处不在。除了这些鼎鼎有名的大公司以外，许多初创公司也在围绕着Docker在成长，或者改变他们的发展方向来与Docker更好地结合起来。这些合作关系（无论大于小）都将帮助推动Docker核心项目及其周边生态环境的快速发展。 - - -### Docker技术的简要综述 ### - -Docker利用Linux的一些内核工具例如[cGroups][3],命名空间和[SElinux][4]来实现容器之间的隔离。起初Docker只是[LXC][5]容器管理器子系统的前端，但是在0.9版本中引入了[libcontainer][6],这是原生go语言库用于提供用户空间和内核之间的接口。 - -容器位于联合文件系统的顶部，例如[AUFS][7],它允许跨多个容器共享例如操作系统镜和安装相关库的组件。在文件系统中的分层方法也利用[ Dockerfile ] [8]中的DevOps工具，这些工具能够成功地完成高速缓存的操作。利用等待时间来安装操作系统和相关应用程序依赖包将会极大地加速测试周期。容器之间的共享库也能够减少内存的占用。 - -一个容器是从一个镜像开始运行的，它可以本地创建，本地缓存，或者通过注册表来下载。Docker公司经营的 [Docker 公有注册库][9],这为各种操作系统、中间件和数据库提供了主机官方仓库。组织和个人可以在docker公司的为镜像创建公有库，并且也有举办私人仓库的订阅服务。由于上传的镜像会包含几乎所有Docker提供的自动化构建工具（以往称为“受信任的构建”），它的镜像是从Dockerfile创建的，而Dockerfile是镜像内容的清单。 - -### 容器 vs 虚拟机 ### - -容器会比虚拟机更高效，因为它们能够分享一个内核和分享共享应用程序库。相比虚拟机系统，这也将使得Docker使用的内存空间很小，即使虚拟机利用了内存超量使用的技术。部署容器时共享底层的镜像层也可以减少内存的占用。IBM的Boden Russel已经做了一些[基准测试][10]说明两者的不同。 - -相比虚拟机系统，容器呈现出较低系统开销的优势，所以在容器中，应用程序的运行效率将会等效于在同样的应用程序在虚拟机中运行甚至效果更佳。IBM的一个研究团队已经发表了一本名为[虚拟机与Linux容器的性能比较]的文章[11]. - - -容器在隔离特性上要比虚拟机逊色。虚拟机可以利用ring-1[硬件隔离][12]例如Intel的VT-d和VT-x技术。这种隔离可以防止虚拟机爆发和彼此交互。而容器至今还没有任何形式的硬件隔离，这使它容易受到攻击。一个命名为[Shocker][13]的概念攻击验证表明，在之前的1.0版本中Docker是存在这种脆弱性的。尽管Docker1.0修复了许多由于Shocker漏洞引发较为的严重问题，Docker的CTO Solomon Hykes仍然[表态][14],“当我们自然而然地说Docker的开箱即用是安全的，即便包含了不收信任的uid0程序，我们将会很明确地这样表述。”Hykes的声明承认，其它的漏洞及相关的风险依旧存在，所以在容器成为受信任的工具之前将有更多的工作需要被完成。 - -对于许多用户案例而言，在容器和虚拟机两者之间选择一种是一种错误的二分法。Docker同样可以在虚拟机中很好工作，它可以被用于现有的虚拟基础措施、私有云或者公有云。同样也可以在容器里跑虚拟机，这也是谷歌使用云平台的一部分。给予一个广泛可利用的基础设施例如IaaS服务，可以为虚拟机提供合理的预期需求，这个合理的预期即容器与虚拟机一起使用的情景将会在数年后出现。容器管理和虚拟机技术有可能被集成到一起提供一个两全其美的方案；所以，位于libcontainer 容器后面的硬件信任锚微虚拟化实施例，可与前端 Docker 工具链和生态系统整合，而不同于后端使用的是能够提供更好绝缘性。微虚拟化（例如Bromium的[vSentry][15]和VMware的 [Project Fargo][16])已经在桌面环境中使用以提供应用程序之间基于硬件的隔离，所以类似的方法可以用于连接libcontainer代替Linux内核中的容器机制。 - -### ‘Dockerizing’ 应用程序 ### - -几乎所有Linux应用程序都可以在Docker容器中运行。它们不受任何语言的选择或框架的限制。唯一在实践中受限的是从操作系统的角度来允许容器做什么。即使如此，bar可以在特权模式下通过运行容器，从而大大减少了控制（并相应地增加了容器中的应用程序，这将会导致损坏主机操作系统存在的风险）。 - - -容器都是从镜像开始运行的，而镜像也可以从运行中的容器获取。通常使用2中方法从容器中获取应用程序，分别是手动获取和Dockerfile.. - -#### 手动构建 #### - -手动构建首先通过基础操作系统镜像启动一个基本操作。交互式的终端可以安装应用程序和用于包管理的依赖项来选择所需要的Linux风格。Zef Hemel在‘[使用Linux容器来支持便携式应用程序部署][17]’的文章中讲述了他部署的过程。一旦应用程序被安装之后，容器可以被推送至注册中心（例如Docker Hub）或者导出一个tar文件。 - -#### Dockerfile #### - -Dockerfile是一个用于构建Docker容器的脚本化系统。每一个Dockerfile定义了开始的基础镜像，从一系列的命令在容器中运行或者一些列的文件被添加到容器中。当容器启动时默认命令会在启动时被执行，Dockerfile也可以指定对外的端口和当前工作目录。容器类似手工构建一样可以通过可推送或导出的Dockerfiles来构建。Dockerfiles也可以被用于Docker Hub的自动构建系统，使用的镜像受Docker公司的控制并且该镜像源代码是任何人可视的。 - - -####仅仅一个进程? #### - -无论镜像是手动构建还是通过Dockerfile构建，有一个关键的考虑因素是当容器启动时，只有一个进程进程被启动。对于一个容器一对一服务的目的，例如运行一个应用服务器，运行一个单一的进程不是一个问题（有些关于容器应该只有一个单独的进程的争议）。对于一些容器需要启动多个进程的情况，必须先启动 [supervisor][18]进程，才能生成其它内部所需的进程。 - -### 容器和微服务 ### - -一个完整的关于使用微服务结构体系的原理和好处已经远远超出了这篇文章（并已经覆盖了[InfoQ eMag: Microservices][19])的范围）.然而容器是微服务捆绑和部署实例的捷径。 - -尽管大多数实际案例表明大量的微服务目前还是大多数部署在虚拟机，容器相对拥有较小的部署机会。容器具备位操作系统共享内存和硬盘占用量的能力，库常见的应用程序代码也意味着并排部署多个办法的服务是非常高效的。 - -### 连接容器 ### - -一些小的应用程序适合放在单独的容器中，但在许多案例中应用程序将遍布多个容器。Docker的成功包括催生了一连串的新应用程序组合工具、业务流程工具和实现平台作为服务(PaaS)过程。许多工具还帮助实现缩放、容错、业务管理以及对已部署资产进行版本控制。 - - -#### 连接 #### - -Docker的网络功能是相当原始的。在同一主机，容器内的服务和一互相访问，而且Docker也可以通过端口映射到主机操作系统使服务可以通过网络服务被调用。官方的赞助方式是连接到[libchan][20],这是一个提供给Go语言的网络服务库，类似于[channels][21]。直至libcan找到方法进入应用程序，第三方应用仍然有很大空间可提供配套的网络服务。例如，[Flocker][22]已经采取了基于代理的方法使服务实现跨主机（以及底层存储）移植。 - -#### 合成 #### - -Docker本身拥有把容器连接在一起的机制，与元数据相关的依赖项可以被传递到相依赖的容器并用于环境变量和主机入口的消耗。应用合成工具例如[Fig][23]和[geard][24]展示出其依赖关系图在一个独立的文件中，于是多个容器可以汇聚成一个连贯的系统。世纪互联公司的[Panamax][25]合成工具类似底层Fig和 geard的方法，但新增了一些基于web的用户接口，并直接与GitHub相结合，以便于应用程序可以直接被共享。 - -#### 业务流程 #### - -业务流程系统例如[Decking][26],New Relic公司的[Centurion][27]和谷歌公司的[Kubernetes][28]都是旨在帮助部署容器和管理其生命周期系统。也有无数的例子（例如[Apache Mesos][30](特别是[Marathon（马拉松式）持续运行很久的框架] 的 [Mesosphere][29]正在与Docker一起使用。通过为应用程序（例如传递CPU核数和内存的需求）与底层基础架构之间提供一个抽象的模型，业务流程工具提供了解耦，旨在简化应用程序开发和数据中心操作。还有各种各样的业务流程系统，因为人们已经淘汰了以前开发的内部系统，取而代之的是大量容器部署的管理系统；例如Kubernetes是基于谷歌的[Omega][32]系统，这个系统用于管理谷歌区域内的容器。 - -虽然从某种程度上来说合成工具和业务流程工具的功能存在重叠，另外这也是它们之间互补的一种方式。例如Fig可以被用于描述容器间如何实现功能交互，而Kubernetes pods可能用于提供监控和缩放。 - - -#### 平台 (类似一个服务) #### - -大量的Docker已经实现本地PaaS安装部署，例如[Deis][33] 和 [Flynn][34]的出现并在现实中得到利用，Linux容器在很大程度上为开发人员提供了灵活性（而不是“固执己见”地给出一组语言和框架）。其它平台例如CloudFoundry, OpenShift 和 Apcera Continuum都已经采取Docker基础功能融入其现有的系统，这样基于Docker镜像（或者基于Dockerfile）的应用程序也可以用之前支持的语言和框架一起部署和管理。 - -### 支持所有的云 ### - -由于Docker能够在任何的Linux虚拟机中运行并合理地更新内核，它几乎可以为所有云提供IaaS服务。大多数的云厂商已经宣布对码头及其生态系统提供附加支持。 - -亚马逊已经把Docker引入它们的Elastic Beanstalk系统（这是在底层IaaS的一个业务流程系统）。谷歌已经启用‘managed VMs'’,这是提供 -程序引擎PaaS和计算引擎IaaS之间的中转站。微软和IBM都已经宣布基于Kubernetes的服务，所以多容器应用程序可以在它们的云上被部署和管理。 - -为了给现有种类繁多的后端提供可用的一致接口，Docker团队已经引进[libswarm][35], 它能用于集成众多云和资源管理系统。Libswarm所阐明的目标之一是‘避免供应商通过交换任何服务锁定另一个’。这是通过呈现一组一致服务（与API相关联的）来完成的，该服务会附加执行特定的后端服务。例如装有Docker服务的服务器将对Docker命令行工具展示Docker远程API，这样容器就可以被托管在一些列的服务供应商。 - -基于Docker的新服务类型仍在起步阶段。总部位于伦敦的Orchard实验室提供了Docker的托管服务，但是Docker公司表示，收购后，Orchard的服务将不会是一个有优先事项。Docker公司也出售之前DotCloud的PaaS业务给cloudControl。基于就更早前的容器管理系统的服务例如[OpenVZ][36]已经司空见惯了，所以在一定程度上Docker需要向托管供应商证明其价值。 - -### Docker 及其发行版 ### - -Docker已经成为大多数Linux发行版例如Ubuntu，Red Hat企业版（RHEL)和CentOS的一个标准功能。遗憾的是发布是以不同的移动速度到Docker项目，所以在发布版中找到的版本总是远远落后于可用版本。例如Ubuntu 14.04版本是对应Docker 0.9.1版本发布的，但是并没有相应的版本更改点当Ubuntu升级至14.04.1（这个时候Docker已经升至1.1.2版本）。由于Docker也是一个KDE系统托盘，所以在官方库同样存在命名问题；所以在Ubuntu14.04版本中相关安装包的名字和命令行工具都是使用‘Docker.io’命名。 - -在企业版的Linux世界中，情况也并没有因此而不同。CentOS7伴随着Docker 0.11.1的到来，该发行版本即是之前Docker公司宣布准备发行Docker 1.0版本的准备版。Linux发行版用户希望最新版本可以承诺其稳定性，性能和安全性能够更完善，并且更好地结合[安装说明][37]和使用Docker公司的库托管而不是采取包括其分布的版本库。 - -Docker的到来催生了新的Linux发行版本例如[CoreOS][38]和红帽被用于设计为运行容器最小环境的[Project Atomic][39]。这些发布版相比传统的发布版伴随着更多新内核和Docker版本的特性。它们对内存的使用和硬盘占用率更小。新的发行也配备了新的工具用于大型部署例如[fleet][40]，这是‘一个分布式init系统’和[etcd][41]是用于元数据管理。也有新机制用于更新发布版本身来使得内核和Docker可以被使用。这也意味着使用Docker的影响之一是它抛开分布版和相关的包管理解决方案的关注，使Linux内核（即Docker子系统正在使用）更加重要。 - -新的发布版将是运行Docker的最好方式，但是传统的发布版本和它们的包管理对容器来说仍然是非常重要的。Docker Hub托管的官方镜像有Debian，Ubuntu和CentOS。当然也有一个‘半官方’的库用于Fedora镜像。RHEL镜像在Docker Hub中不可用，因为是从Red Hat直接发布的。这意味着在Docker Hub的自动构建机制仅仅用于那些纯粹的开源发布版不（并愿意信任基于Docker公司团队所策划镜像的出处）。 - - -虽然Docker Hub与源代码控制系统相结合，例如Git Hub和Bitbucket在构建过程中用于自动创建包管理及生成规范之间的复杂关系（在Dockerfile中），并在构建过程中建立镜像。在构建过程中的非确定性结果并非是Docker具体的问题——这个是由于软件包如何管理工作的结果。在构建完成的当天将会给出一个版本，这个构建完成的另外一次将会得到最新版本，这就是为什么软件包管理需要升级措施。容器的抽象（较少关注一个容器的内容）以及容器的分散（因为轻量级资源利用率）是更有可能与Docker获取关联的痛点。 - -### Docker的未来 ### - -Docker公司对核心功能（libcontainer），跨服务管理(libswarm) 和容器间的信息传递（libchan）的发展提出了明确的路线。与此同时公司已经表明愿意利用自身生态系统和收购Orchard实验室。然而Docker相比Docker公司意味着更多，随着项目的壮大，越来越多对这个项目的 -大牌贡献者，其中不乏像谷歌、IBM和Red Hat这样的大公司。在仁慈独裁者CTO Solomon Hykes 掌舵的形势下，为公司和项目明确了技术领导的关系。在前18个月的项目中通过成果输出展现了快速行动的能力，而且这种趋势并没有减弱的迹象。 - -许多投资者正在寻找10年前VMware公司的ESX/vSphere平台的特征矩阵，并找出虚拟机的普及而驱动的企业预期和当前Docker生态系统两者的距离（和机会）。目前Docker生态系统正缺乏类似网络、存储和版本细粒度的管理（对容器的内容），这些都为初创企业和在职人员提供机会。 - -随着时间的推移，在虚拟机和容器（Docker的运行部分）之间的区别将变得不重要了，而关注点将会转移到‘构建’和‘交付’缓解。这些变化将会使‘Docker发生什么？’这个问题变得比‘Docker将会给IT产业带来什么？’更不重要了。 - - --------------------------------------------------------------------------------- - -via: http://www.infoq.com/articles/docker-future - -作者：[Chris Swan][a] -译者：[disylee](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.infoq.com/author/Chris-Swan -[1]:http://blog.dotcloud.com/dotcloud-paas-joins-cloudcontrol -[2]:http://www.infoq.com/news/2014/06/docker_1.0 -[3]:https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt -[4]:http://selinuxproject.org/page/Main_Page -[5]:https://linuxcontainers.org/ -[6]:http://blog.docker.com/2014/03/docker-0-9-introducing-execution-drivers-and-libcontainer/ -[7]:http://aufs.sourceforge.net/aufs.html -[8]:https://docs.docker.com/reference/builder/ -[9]:https://registry.hub.docker.com/ -[10]:http://bodenr.blogspot.co.uk/2014/05/kvm-and-docker-lxc-benchmarking-with.html?m=1 -[11]:http://domino.research.ibm.com/library/cyberdig.nsf/papers/0929052195DD819C85257D2300681E7B/$File/rc25482.pdf -[12]:https://en.wikipedia.org/wiki/X86_virtualization#Hardware-assisted_virtualization -[13]:http://stealth.openwall.net/xSports/shocker.c -[14]:https://news.ycombinator.com/item?id=7910117 -[15]:http://www.bromium.com/products/vsentry.html -[16]:http://cto.vmware.com/vmware-docker-better-together/ -[17]:http://www.infoq.com/articles/docker-containers -[18]:http://docs.docker.com/articles/using_supervisord/ -[19]:http://www.infoq.com/minibooks/emag-microservices -[20]:https://github.com/docker/libchan -[21]:https://gobyexample.com/channels -[22]:http://www.infoq.com/news/2014/08/clusterhq-launch-flocker -[23]:http://www.fig.sh/ -[24]:http://openshift.github.io/geard/ -[25]:http://panamax.io/ -[26]:http://decking.io/ -[27]:https://github.com/newrelic/centurion -[28]:https://github.com/GoogleCloudPlatform/kubernetes -[29]:https://mesosphere.io/2013/09/26/docker-on-mesos/ -[30]:http://mesos.apache.org/ -[31]:https://github.com/mesosphere/marathon -[32]:http://static.googleusercontent.com/media/research.google.com/en/us/pubs/archive/41684.pdf -[33]:http://deis.io/ -[34]:https://flynn.io/ -[35]:https://github.com/docker/libswarm -[36]:http://openvz.org/Main_Page -[37]:https://docs.docker.com/installation/#installation -[38]:https://coreos.com/ -[39]:http://www.projectatomic.io/ -[40]:https://github.com/coreos/fleet -[41]:https://github.com/coreos/etcd From 3db0238c24b2c60c9aaf011228d4f563a4249b90 Mon Sep 17 00:00:00 2001 From: bazz2 Date: Fri, 30 Jan 2015 08:38:00 +0800 Subject: [PATCH 109/207] [bazz2 translating] How to Configure Chroot Environment in Ubuntu 14.04 --- ...0114 How to Configure Chroot Environment in Ubuntu 14.04.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150114 How to Configure Chroot Environment in Ubuntu 14.04.md b/sources/tech/20150114 How to Configure Chroot Environment in Ubuntu 14.04.md index 63acd23a67..540789d367 100644 --- a/sources/tech/20150114 How to Configure Chroot Environment in Ubuntu 14.04.md +++ b/sources/tech/20150114 How to Configure Chroot Environment in Ubuntu 14.04.md @@ -1,3 +1,4 @@ +[bazz2222222] How to Configure Chroot Environment in Ubuntu 14.04 ================================================================================ There are many instances when you may wish to isolate certain applications, user, or environments within a Linux system. Different operating systems have different methods of achieving isolation, and in Linux, a classic way is through a `chroot` environment. @@ -143,4 +144,4 @@ via: http://linoxide.com/ubuntu-how-to/configure-chroot-environment-ubuntu-14-04 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://linoxide.com/author/arunp/ -[1]:https://launchpad.net/ubuntu/+archivemirrors \ No newline at end of file +[1]:https://launchpad.net/ubuntu/+archivemirrors From 0f47cdd6f304d3576e79b8725999d5f3ebf7f860 Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Fri, 30 Jan 2015 13:57:52 +0800 Subject: [PATCH 110/207] =?UTF-8?q?20150130=20=E9=80=89=E9=A2=98=202015013?= =?UTF-8?q?0=20OpenJDK=207=20Vulnerabilities=20Closed=20in=20Ubuntu=2014.0?= =?UTF-8?q?4=20and=20Ubuntu=2014.10.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Closed in Ubuntu 14.04 and Ubuntu 14.10.md | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md diff --git a/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md b/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md new file mode 100644 index 0000000000..3b77b69017 --- /dev/null +++ b/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md @@ -0,0 +1,33 @@ +OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10 +---- +*Users have been advised to upgrade as soon as possible* + +##Canonical published details about a new OpenJDK 7 version has been pushed to the Ubuntu 14.04 LTS and Ubuntu 14.10 repositories. This update fixes a number of problems and various vulnerabilities. + +The Ubuntu maintainers have upgraded the OpenJDK packages in the repositories and numerous fixes have been implemented. This is an important update and it covers a few libraries. + +"Several vulnerabilities were discovered in the OpenJDK JRE related to information disclosure, data integrity and availability. An attacker could +exploit these to cause a denial of service or expose sensitive data over the network,” reads the security notice. + +Also, "a vulnerability was discovered in the OpenJDK JRE related to information disclosure and integrity. An attacker could exploit this to +expose sensitive data over the network." + +These are just a couple of the vulnerabilities identified and corrected by the developer and implemented by the maintainers/., and for a more detailed description of the problems, you can see Canonical's security notification. Users have been advised to upgrade their systems as soon as possible. + +The flaws can be fixed if you upgrade your system to the latest openjdk-7-related packages specific to each distribution. To apply the patch, users will have to run the Update Manager application. In general, a standard system update will make all the necessary changes. All Java-related applications will have to be restarted. + +-------------------------------------------------------------------------------- + +via:http://linux.softpedia.com/blog/OpenJDK-7-Vulnerabilities-Closed-in-Ubuntu-14-04-and-Ubuntu-14-10-471605.shtmll + +本文发布时间:29 Jan 2015, 16:53 GMT + +作者：[Silviu Stahie][a] + +译者：[译者ID](https://github.com/译者ID) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/silviu-stahie \ No newline at end of file From f5d8d4a52f166b69a99a8f1c87c6028dac32bae5 Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Fri, 30 Jan 2015 14:04:33 +0800 Subject: [PATCH 111/207] =?UTF-8?q?20150130=20=E9=80=89=E9=A2=98=202015013?= =?UTF-8?q?0=20OpenJDK=207=20Vulnerabilities=20Closed=20in=20Ubuntu=2014.0?= =?UTF-8?q?4=20and=20Ubuntu=2014.10.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... as the Most Beautiful LibreOffice Ever.md | 38 +++++++++++++++++++ ...Closed in Ubuntu 14.04 and Ubuntu 14.10.md | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 sources/news/20150130 LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever.md diff --git a/sources/news/20150130 LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever.md b/sources/news/20150130 LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever.md new file mode 100644 index 0000000000..3718ee58a6 --- /dev/null +++ b/sources/news/20150130 LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever.md @@ -0,0 +1,38 @@ +LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever +---- +*The developer has made a lot of UI improvements* + +![LibreOffice 4.4](http://i1-news.softpedia-static.com/images/news2/LibreOffice-4-4-Releases-As-the-Most-Beautiful-LibreOffice-Ever-471575-2.jpg) + +The Document Foundation has just announced that a new major update has been released for LibreOffice and it brings important UI improvements, enough for them to call this the most beautiful version ever. + +The Document Foundation doesn't usually make the UI the main focus of an update, but now the developers are saying that this is the most beautiful release made so far and that says a lot. Fortunately, this version is not just about interface fixes and there are plenty of other major improvements that should really provide a very good reason to get LibreOffice 4.4. + +LibreOffice has been gaining quite a lot of fans and users, and the past couple of years have been very successful. The office suite is implemented by default in most of the important Linux distributions out there and it was adopted by numerous administrations and companies across the world. LibreOffice is proving to be a difficult adversary for Microsoft's Office and each new version makes it even better. +LibreOffice 4.4 brings a lot of new features + +If we move aside all the improvements made to the interface, we're still left with a ton of fixes and changes. The Document Foundation takes its job very seriously and all upgrades really improve the users' experience tremendously. + +"LibreOffice 4.4 has got a lot of UX and design love, and in my opinion is the most beautiful ever. We have completed the dialog conversion, redesigned menu bars, context menus, toolbars, status bars and rulers to make them much more useful. The Sifr monochrome icon theme is extended and now the default on OS X. We also developed a new Color Selector, improved the Sidebar to integrate more smoothly with menus, and reworked many user interface details to follow today’s UX trends," [says Jan "Kendy" Holesovsky](1), a member of the Membership Committee and the leader of the design team. + +Some of the other improvements include much better support for OOXML file formats, the source code has been "groomed" and cleaned after a Coverity Scan analysis, digital signatures for exported PDF files, improved import filters for Microsoft Visio, Microsoft Publisher and AbiWord files, and Microsoft Works spreadsheets, and much more. + +For now, the PPA doesn't have the latest version, but that should change soon. For the time being, you can download the [LibreOffice 4.4](2) source packages from Softpedia, if you want to compile them yourself. + +-------------------------------------------------------------------------------- + +via:http://news.softpedia.com/news/LibreOffice-4-4-Releases-As-the-Most-Beautiful-LibreOffice-Ever-471575.shtml + +本文发布时间:29 Jan 2015, 14:16 GMT + +作者：[Silviu Stahie][a] + +译者：[译者ID](https://github.com/译者ID) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/silviu-stahie +[1]:http://blog.documentfoundation.org/2015/01/29/libreoffice-4-4-the-most-beautiful-libreoffice-ever/ +[2]:http://linux.softpedia.com/get/Office/Office-Suites/LibreOffice-60713.shtml \ No newline at end of file diff --git a/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md b/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md index 3b77b69017..552f98e3f2 100644 --- a/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md +++ b/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md @@ -18,7 +18,7 @@ The flaws can be fixed if you upgrade your system to the latest openjdk-7-relate -------------------------------------------------------------------------------- -via:http://linux.softpedia.com/blog/OpenJDK-7-Vulnerabilities-Closed-in-Ubuntu-14-04-and-Ubuntu-14-10-471605.shtmll +via:http://linux.softpedia.com/blog/OpenJDK-7-Vulnerabilities-Closed-in-Ubuntu-14-04-and-Ubuntu-14-10-471605.shtml 本文发布时间:29 Jan 2015, 16:53 GMT From 8f67ae408eadcc3ef4fafd11d5e022930ecf0a38 Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Fri, 30 Jan 2015 14:04:33 +0800 Subject: [PATCH 112/207] =?UTF-8?q?20150130=20=E9=80=89=E9=A2=98=202015013?= =?UTF-8?q?0=20OpenJDK=207=20Vulnerabilities=20Closed=20in=20Ubuntu=2014.0?= =?UTF-8?q?4=20and=20Ubuntu=2014.10.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... as the Most Beautiful LibreOffice Ever.md | 38 +++++++++++++++++++ ...Closed in Ubuntu 14.04 and Ubuntu 14.10.md | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 sources/news/20150130 LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever.md diff --git a/sources/news/20150130 LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever.md b/sources/news/20150130 LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever.md new file mode 100644 index 0000000000..ddcd650327 --- /dev/null +++ b/sources/news/20150130 LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever.md @@ -0,0 +1,38 @@ +LibreOffice 4.4 Released as the Most Beautiful LibreOffice Ever +---- +*The developer has made a lot of UI improvements* + +![LibreOffice 4.4](http://i1-news.softpedia-static.com/images/news2/LibreOffice-4-4-Releases-As-the-Most-Beautiful-LibreOffice-Ever-471575-2.jpg) + +The Document Foundation has just announced that a new major update has been released for LibreOffice and it brings important UI improvements, enough for them to call this the most beautiful version ever. + +The Document Foundation doesn't usually make the UI the main focus of an update, but now the developers are saying that this is the most beautiful release made so far and that says a lot. Fortunately, this version is not just about interface fixes and there are plenty of other major improvements that should really provide a very good reason to get LibreOffice 4.4. + +LibreOffice has been gaining quite a lot of fans and users, and the past couple of years have been very successful. The office suite is implemented by default in most of the important Linux distributions out there and it was adopted by numerous administrations and companies across the world. LibreOffice is proving to be a difficult adversary for Microsoft's Office and each new version makes it even better. +LibreOffice 4.4 brings a lot of new features + +If we move aside all the improvements made to the interface, we're still left with a ton of fixes and changes. The Document Foundation takes its job very seriously and all upgrades really improve the users' experience tremendously. + +"LibreOffice 4.4 has got a lot of UX and design love, and in my opinion is the most beautiful ever. We have completed the dialog conversion, redesigned menu bars, context menus, toolbars, status bars and rulers to make them much more useful. The Sifr monochrome icon theme is extended and now the default on OS X. We also developed a new Color Selector, improved the Sidebar to integrate more smoothly with menus, and reworked many user interface details to follow today’s UX trends," [says Jan "Kendy" Holesovsky](1), a member of the Membership Committee and the leader of the design team. + +Some of the other improvements include much better support for OOXML file formats, the source code has been "groomed" and cleaned after a Coverity Scan analysis, digital signatures for exported PDF files, improved import filters for Microsoft Visio, Microsoft Publisher and AbiWord files, and Microsoft Works spreadsheets, and much more. + +For now, the PPA doesn't have the latest version, but that should change soon. For the time being, you can download the [LibreOffice 4.4](2) source packages from Softpedia, if you want to compile them yourself. + +-------------------------------------------------------------------------------- + +via: http://news.softpedia.com/news/LibreOffice-4-4-Releases-As-the-Most-Beautiful-LibreOffice-Ever-471575.shtml + +本文发布时间:29 Jan 2015, 14:16 GMT + +作者：[Silviu Stahie][a] + +译者：[译者ID](https://github.com/译者ID) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/silviu-stahie +[1]:http://blog.documentfoundation.org/2015/01/29/libreoffice-4-4-the-most-beautiful-libreoffice-ever/ +[2]:http://linux.softpedia.com/get/Office/Office-Suites/LibreOffice-60713.shtml \ No newline at end of file diff --git a/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md b/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md index 3b77b69017..a1652fbd04 100644 --- a/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md +++ b/sources/news/20150130 OpenJDK 7 Vulnerabilities Closed in Ubuntu 14.04 and Ubuntu 14.10.md @@ -18,7 +18,7 @@ The flaws can be fixed if you upgrade your system to the latest openjdk-7-relate -------------------------------------------------------------------------------- -via:http://linux.softpedia.com/blog/OpenJDK-7-Vulnerabilities-Closed-in-Ubuntu-14-04-and-Ubuntu-14-10-471605.shtmll +via: http://linux.softpedia.com/blog/OpenJDK-7-Vulnerabilities-Closed-in-Ubuntu-14-04-and-Ubuntu-14-10-471605.shtml 本文发布时间:29 Jan 2015, 16:53 GMT From 06afd512503fcd970c1988522d94ab2dbca144c7 Mon Sep 17 00:00:00 2001 From: zpl1025 Date: Fri, 30 Jan 2015 16:20:31 +0800 Subject: [PATCH 113/207] [translated] 20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md --- ... Your Linux OS X Unix Shell Environment.md | 334 +++++++++--------- 1 file changed, 166 insertions(+), 168 deletions(-) rename {sources => translated}/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md (56%) diff --git a/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md b/translated/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md similarity index 56% rename from sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md rename to translated/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md index 4f46e43dd7..2709602c87 100644 --- a/sources/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md +++ b/translated/tech/20150125 A Shell Primer--Master Your Linux OS X Unix Shell Environment.md @@ -1,45 +1,44 @@ -zpl1025 -A Shell Primer: Master Your Linux, OS X, Unix Shell Environment +Shell入门：掌握Linux，OS X，Unix的Shell环境 ================================================================================ -On a Linux or Unix-like systems each user and process runs in a specific environment. An environment includes variables, settings, aliases, functions and more. Following is a very brief introduction to some useful shell environment commands, including examples of how to use each command and setup your own environment to increase productivity in the command prompt. +在Linux或类Unix系统中，每个用户和进程都运行在一个特定环境中。这个环境包含了变量，设置，别名，函数以及更多的。下面是对Shell环境下一些常用命令的简单介绍，包括每个命令如何使用的例子，以及在命令行下设定你自己的环境来提高效率。 ![](http://s0.cyberciti.org/uploads/cms/2015/01/bash-shell-welcome-image.jpg) -### Finding out your current shell ### +### 找出你当前的shell ### -Type any one of the following command at the Terminal app: +在终端应用中输入下面命令中的任意一个： ps $$ ps -p $$ -OR +或者 echo "$0" -Sample outputs: +输出范例： -[![Fig.01: Finding out your shell name](http://s0.cyberciti.org/uploads/cms/2015/01/finding-your-shell-like-a-pro.jpg)][1] -Fig.01: Finding out your shell name +[![图1: Finding out your shell name](http://s0.cyberciti.org/uploads/cms/2015/01/finding-your-shell-like-a-pro.jpg)][1] +图1：找出当前的shell -### Finding out installed shells ### +### 找出所有已安装的shell ### -To find out the full path for installed shell type: +找到已安装shell的完整路径： type -a zsh type -a ksh type -a sh type -a bash -Sample outputs: +输出范例： [![Fig.02: Finding out your shell path](http://s0.cyberciti.org/uploads/cms/2015/01/finding-and-verifying-shell-path.jpg)][2] -Fig.02: Finding out your shell path +图2：找出shell的路径 -The /etc/shells file contains a list of the shells on the system. For each shell a single line should be present, consisting of the shell's path, relative to root. Type the following [cat command][3] to see shell database: +文件/etc/shells里包含了系统支持的shell列表。每一行代表一个shell，是相对根目录的完整路径。用这个[cat命令][3]来查看这些数据： cat /etc/shells -Sample outputs: +输出范例： # List of acceptable shells for chpass(1). # Ftpd will not allow users to connect who are not using @@ -53,47 +52,47 @@ Sample outputs: /bin/zsh /usr/local/bin/fish -### Changing your current shell temporarily ### +### 临时改变当前shell ### -Just type the shell name. In this example, I'm changing from bash to zsh: +只需要输入shell的名字。在下面的例子里，我从bash切换到了zsh： zsh -You just changed your shell temporarily to zsh. Also known as subshell. To exit from subshell/temporary shell, type the following command or hit CTRL-d: +这只是临时改变了系统shell。也叫做子shell。要从子/临时shell退出，输入下面的命令或者按下CTRL-D： exit -### Finding out subshell level/temporary shell nesting level ### +### 找出子shell的层级或临时shell的嵌套层级 ### -The $SHLVL incremented by one each time an instance of bash is started. Type the following command: +每个bash实例启动后，变量$SHLVL的值都会加一。输入下面的命令： echo "$SHLVL" -Sample outputs: +示例输出： [![Fig. 03: Bash shell nesting level (subshell numbers)](http://s0.cyberciti.org/uploads/cms/2015/01/a-nested-shell-level-command.jpg)][4] -Fig. 03: Bash shell nesting level (subshell numbers) +图3：Bash shell嵌套层级（子shell数目） -### Changing your current shell permanently with chsh command ### +### 通过chsh命令永久变更系统shell ### -Want to change your own shell from bash to zsh permanently? Try: +想要把当前系统shell从bash永久换成zsh？试试这个： chsh -s /bin/zsh -Want to change the other user's shell from bash to ksh permanently? Try: +想把其他用户的shell从bash永久换成ksh？试试这个： sudo chsh -s /bin/ksh userNameHere -### Finding out your current environment ### +### 查看当前的环境 ### -You need to use the +你需要用到 env env | more env | less env | grep 'NAME' -Sample outputs: +示例输出： TERM_PROGRAM=Apple_Terminal SHELL=/bin/bash @@ -116,12 +115,12 @@ Sample outputs: _=/usr/bin/env OLDPWD=/Users/vivek -Here is a table of commonly used bash shell variables: +下面是bash shell里一些常见变量的列表： ![Fig.04: Common bash environment variables](http://s0.cyberciti.org/uploads/cms/2015/01/common-shell-vars.jpg) -Fig.04: Common bash environment variables +图4：常见bash环境变量 -> **Warning**: It is always a good idea not to change the following environment variables. Some can be changed and may results into unstable session for you: +> **注意**：下面这些环境变量没事不要乱改。很可能会造成不稳定的shell会话： > > SHELL > @@ -141,163 +140,162 @@ Fig.04: Common bash environment variables > > LINENO -### Displays the values of environment variables ### +### 显示环境变量的值 ### -Use any one of the following command to show the values of environment variable called HOME: +使用下面任意一条命令显示环境变量HOME的值： - ## Use printenv ## + ## 使用printenv ## printenv HOME - ## or use echo ## + ## 或者用echo ## echo "$HOME" - # or use printf for portability ## + # 考虑到可移植性，也可以用printf ## printf "%s\n" "$HOME" -Sample outputs: +示例输出： /home/vivek -### Adding or setting a new variables ### +### 增加或设定一个新变量 ### -The syntax is as follows in bash or zsh or sh or ksh shell: +下面是bash，zsh，sh和ksh的语法： - ## The syntax is ## + ## 语法 ## VAR=value FOO=bar - ## Set the default editor to vim ## + ## 设定vim为默认文本编辑器 ## EDITOR=vim export $EDITOR - ## Set default shell timeout for security ## + ## 考虑安全性，设定默认shell连接超时时间 ## TMOUT=300 export TMOUT - ## You can directly use export command to set the search path for commands ## + ## 你可以直接使用export命令设定命令的搜素路径 ## export PATH=$PATH:$HOME/bin:/usr/local/bin:/path/to/mycoolapps -Again, use the printenv or echo or printf command to see the values of environment variables called PATH, EDITOR, and TMOUT: +然后，使用printenv或者echo或printf命令查看环境变量PATH，EDITOR，和TMOUT的值： printenv PATH echo "$EDITOR" printf "%s\n" $TMOUT -### How do I change an existing environment variables? ### +### 怎么修改一个现有的环境变量？ ### -The syntax is as follows: +下面是语法： export VAR=value - ## OR ## + ## 或者 ## VAR=value export $VAR - ## Change the default editor from vim to emacs ## - echo "$EDITOR" ## <--- print vim - EDITOR=emacs ## <--- change it - export $EDITOR ## <--- export it for next session too - echo "$EDITOR" ## <--- print emacs + ## 把默认文本编辑器从vim改为emacs ## + echo "$EDITOR" ## <--- 屏幕输出vim + EDITOR=emacs ## <--- 修改 + export $EDITOR ## <--- 让修改在其他会话生效 + echo "$EDITOR" ## <--- 屏幕输出emacs -The syntax is as follows for the **tcsh shell for adding or changing a variables**: +**tcsh shell下增加和修改变量**的语法是下面这样的： - ## Syntax + ## 语法 setenv var value printenv var - ## Set foo variable with bar as a value ## + ## 设置变量foo的值为bar ## setenv foo bar echo "$foo" printenv foo - ## Set PATH variable ## + ## 设置变量PATH ## setenv PATH $PATH\:$HOME/bin echo "$PATH" - ## set PAGER variable ## + ## 设置变量PAGER ## setenv PAGER most printf "%s\n" $PAGER -### Finding your bash shell configuration files ### +### 找出bash shell的配置文件 ### -Type the following command to list your bash shell files, enter: +用下面的命令列出bash shell的文件： ls -l ~/.bash* ~/.profile /etc/bash* /etc/profile -Sample output: +示例输出： [![Fig.05: List all bash environment configuration files](http://s0.cyberciti.org/uploads/cms/2015/01/list-bash-enviroment-variables.jpg)][5] -Fig.05: List all bash environment configuration files +图5：列出bash的所有配置文件 -To look at all your bash config files, enter: +要查看所有的bash配置文件，输入： less ~/.bash* ~/.profile /etc/bash* /etc/profile -You can edit bash config files one by one using the text editor such as vim or emacs: +可以使用文字编辑器比如vim或emacs来一个一个编辑bash配置文件： vim ~/.bashrc -To edit files located in /etc/, type: +编辑/etc/目录下的文件，输入： - ## first make a backup.. just in case + ## 首先是备份，以防万一 sudo cp -v /etc/bashrc /etc/bashrc.bak.22_jan_15 ######################################################################## - ## Alright, edit it to your hearts content and by all means, have fun ## - ## with your environment or just increase the productivity :) ## + ## 然后，随心所欲随便改吧，好好玩玩shell环境或者提高一下效率:) ## ######################################################################## sudo vim /etc/bashrc -### Confused by Bash shell Initialization files? ### +### 被Bash shell初始化过程中应用的文件搞糊涂了吗？ ### -The following "bash file initialization" graph will help you: +下面的"bash初始化文件"流程图应该有些帮助： ![](http://s0.cyberciti.org/uploads/cms/2015/01/BashStartupfiles.jpg) -Depending on which shell is set up as your default, your user profile or system profile can be one of the following: +根据账户设定的默认shell，你的用户配置或系统配置可能是下面其中一种： -### Finding your zsh shell configuration files ### +### 找出zsh shell配置文件 ### -The zsh [wiki][6] recommend the following command: +zsh的[wiki][6]中建议用下面的命令： strings =zsh | grep zshrc -Sample outputs: +示例输出： /etc/zshrc .zshrc -Type the following command to list your zsh shell files, enter: +输入下面的命令列出你的zsh shell文件： ls -l /etc/zsh/* /etc/profile ~/.z* -To look at all your zsh config files, enter: +查看所有zsh配置文件： less /etc/zsh/* /etc/profile ~/.z* -### Finding your ksh shell configuration files ### +### 找出ksh shell配置文件 ### -1. See ~/.profile or /etc/profile file. +1. 查看~/.profile或者/etc/profile文件。 -### Finding your tcsh shell configuration files ### +### 找出tcsh shell配置文件 ### -1. See ~/.login, ~/.cshrc for the C shell. -2. See ~/.tcshrc and ~/.cshrc for the TC shell. +1. C shell查看~/.login，~/.cshrc文件。 +2. TC shell查看~/.tcshrc和~/.cshrc文件。 -### Can I have a script like this execute automatically every time I login? ### +### 我可以写个类似这样每次登录时都自动执行的脚本吗？ ### -Yes, add your commands or aliases or other settings to ~/.bashrc (bash shell) or ~/.profile (sh/ksh/bash) or ~/.login (csh/tcsh) file. +是的，把你的命令或别名或其他设定添加到~/.bashrc（bash shell）或者~/.profile（sh/ksh/bash）或者~/.login（csh/tcsh）文件中。 -### Can I have a script like this execute automatically every time I logout? ### +### 我可以写个类似这样每次登出都自动执行的脚本吗？ ### -Yes, add your commands or aliases or other settings to ~/.bash_logout (bash) or ~/.logout (csh/tcsh) file. +是的，把你的命令或别名或其他设定添加到~/.bash_logout（bash）或者~/.logout（csh/tcsh）文件。 -### History: Getting more info about your shell session ### +### history：获取关于shell会话的更多信息 ### -Just type the history command to see session history: +输入history命令来查看本次会话的历史： history -Sample outputs: +示例输出： 9 ls 10 vi advanced-cache.php @@ -321,56 +319,56 @@ Sample outputs: 98 smartctl -A /dev/sg1 | grep -i temperature 99 sensors -Type history 20 to see the last 20 commands from your history: +输入history 20来查看命令历史的后20条： history 20 -Sample outputs: +示例输出： [![Fig.06: View session history in the bash shell using history command](http://s0.cyberciti.org/uploads/cms/2015/01/history-outputs.jpg)][7] -Fig.06: View session history in the bash shell using history command +图6：在bash shell中使用history命令查看会话历史 -You can reuses commands. Simply hit [Up] and [Down] arrow keys to see previous commands. Press [CTRL-r] from the shell prompt to search backwards through history buffer or file for a command. To repeat last command just type !! at a shell prompt: +你可以重复使用命令。简单地按下[上]或[下]方向键就可以查看之前的命令。在shell提示符下按下[CTRL-R]可以向后搜索历史缓存或文件来查找命令。重复最后一次命令，只需要在shell提示符下输入!!就好了： ls -l /foo/bar !! -To see command #93 (hddtemp /dev/sda)from above history session, type: +在以上的历史记录中查看命令#93 (hddtemp /dev/sda)，输入： !93 -### Changing your identity with sudo or su ### +### 使用sudo或su改变用户 ### -The syntax is as follows: +下面是语法： su userName - ## To log in as a tom user ## + ## 登录为tom用户 ## su tom - ## To start a new login shell for tom user ## + ## 为用户tom打开一个新的shell会话 ## su tom - ## To login as root user ## + ## 登录为root用户 ## su - - ## The sudo command syntax (must be configured on your system) ## + ## sudo命令语法（必须在系统中配置有这个命令） ## sudo -s sudo tom -See "[Linux Run Command As Another User][8]" post for more on sudo, su and runuser commands. +看看帖子"[Linux下使用其他用户身份运行命令][8]"更多地了解sudo，su和runuser命令。 -### Shell aliases ### +### shell别名 ### -An alias is nothing but shortcut to commands. +别名仅仅是命令的一个快捷方式。 -### Listing aliases ### +### 列出所有的别名 ### -Type the following command: +输入下面的命令： alias -Sample outputs: +示例输出： alias ..='cd ..' alias ...='cd ../../../' @@ -388,31 +386,31 @@ Sample outputs: alias egrep='egrep --color=auto' alias ethtool='ethtool eth1' -### Create an alias ### +### 设定一个别名 ### -The bash/zsh syntax is: +bash/zsh语法： alias c='clear' alias down='sudo /sbin/shutdown -h now' -Type c alias for the system command clear, so we can type c instead of clear command to clear the screen: +对于命令clear可以输入c别名，这样我们就可以输入c代替clear命令来清空屏幕： c -Or type down to shutdown the Linux based server: +或者输入down来关闭基于Linux的服务器： down -You can create as many aliases you want. See "[30 Handy Bash Shell Aliases For Linux / Unix / Mac OS X][9]" for practical usage of aliases on Unix-like system. +你可以设定任意多的别名。看下"[Linux/Unix/Mac OS X系统中的30个方便的bash shell别名][9]"了解在类Unix系统中别名的实际应用。 -### Shell functions ### +### shell函数 ### -Bash/ksh/zsh functions allows you further customization of your environment. In this example, I'm creating a simple bash function called memcpu() to display top 10 cpu and memory eating process: +Bash/ksh/zsh函数允许你更进一步地配置shell环境。在这个例子中，我写了一个简单的名叫memcpu()的bash函数，用来显示前10个最占用CPU和内存的进程： memcpu() { echo "*** Top 10 cpu eating process ***"; ps auxf | sort -nr -k 3 | head -10; echo "*** Top 10 memory eating process ***"; ps auxf | sort -nr -k 4 | head -10; } -Just type memcpu to see the info on screen: +输入memcpu就可以在屏幕上看到下面的信息： memcpu @@ -440,95 +438,95 @@ Just type memcpu to see the info on screen: squid 9995 0.0 0.5 175152 72396 ? S 2014 27:00 \_ (squid) -f /etc/squid/squid.conf cybercit 3922 0.0 0.4 303380 56304 ? S Jan10 0:13 | \_ /usr/bin/php-cgi -See "[how to write and use shell functions][10]" for more information. +看下"[如何编写和应用shell函数][10]"了解更多信息。 -### Putting it all together: Customizing your Linux or Unix bash shell working environment ### +### 综合一下：定制你自己的Linux或Unix bash shell工作环境 ### -Now, you are ready to configure your environment using bash shell. I'm only covering bash. But the theory remains same from zsh, ksh and other common shells. Let us see how to adopt shell to my need as a sysadmin. Edit your ~/.bashrc file and append settings. Here are some useful configuration options for you. +现在，你将使用bash shell配置自己的环境。我只介绍bash。但是理论上zsh，ksh和其他常用shell都差不多。让我们看看如何调整shell来适合我作为系统管理员的需求。编辑你的~/.bashrc文件来附加设定。下面是一些常用的配置选项。 -#### #1: Setting up bash path and environment variables #### +#### #1: 设定bash路径和环境变量 #### - # Set path ## + # 设定路径 ## export PATH=$PATH:/usr/local/bin:/home/vivek/bin:/opt/firefox/bin:/opt/oraapp/bin - # Also set path for cd command + # 为cd命令设定路径 export CDPATH=.:$HOME:/var/www -Use less or most command as a pager: +使用less或more命令作为翻页器： export PAGER=less -Set vim as default text editor for us: +设定vim作为默认文本编辑器： export EDITOR=vim export VISUAL=vim export SVN_EDITOR="$VISUAL" -Set Oracle database specific stuff: +设定Oracle数据库特别要求的参数： export ORACLE_HOME=/usr/lib/oracle/xe/app/oracle/product/10.2.0/server export ORACLE_SID=XE export NLS_LANG=$($ORACLE_HOME/bin/nls_lang.sh) -Set JAVA_HOME and other paths for java as per java version: +设定JAVA_HOME和其他java路径，比如java版本： export JAVA_HOME=/usr/lib/jvm/java-6-sun/jre - # Add ORACLE, JAVA to PATH + # 把ORACLE和JAVA加入到PATH里 export PATH=$PATH:$ORACLE_HOME/bin:$JAVA_HOME/bin -Secure my remote [SSH login using keychain for password less login][11]: +[使用密钥实现免密码登录][11]让ssh远程登录更安全： - # No need to input password again ever + # 再也不用输密码了 /usr/bin/keychain $HOME/.ssh/id_rsa source $HOME/.keychain/$HOSTNAME-sh -Finally, [turn on bash command completion][12] +最后，[打开bash命令补齐][12] source /etc/bash_completio -#### #2: Setting up bash command prompt #### +#### #2: 设定bash命令提示符 #### -Set [custom bash prompt (PS1)][13]: +设定[定制的bash提示符(PS1)][13]: PS1='{\u@\h:\w }\$ ' -#### #3: Setting default file permissions #### +#### #3: 设定默认文件权限 #### - ## Set default to 644 ## + ## 设定默认权限为644 ## umask 022 -#### #4: Control your shell history settings #### +#### #4: 调整shell命令历史设定 #### - # Dont put duplicate lines in the history + # 不往命令历史里写入相同的行 HISTCONTROL=ignoreboth - # Ignore these commands + # 忽略这些命令 HISTIGNORE="reboot:shutdown *:ls:pwd:exit:mount:man *:history" - # Set history length via HISTSIZE and HISTFILESIZE + # 通过HISTSIZE和HISTFILESIZE设定命令历史的长度 export HISTSIZE=10000 export HISTFILESIZE=10000 - # Add timestamp to history file. + # 为命令历史文件增加时间戳 export HISTTIMEFORMAT="%F %T " - #Append to history, don't overwrite + # 附加到命令历史文件，俄不是覆盖 shopt -s histappend -#### #5: Set the time zone for your session #### +#### #5: 设定shell会话的时区 #### - ## set to IST for my own session ## + ## 为我自己的shell会话设定IST（印度标准时间） ## TZ=Asia/Kolkata -#### #6: Setting up shell line editing interface #### +#### #6: 设定shell行编辑接口 #### - ## use a vi-style line editing interface for bash from default emacs mode ## + ## 使用vi风格的行编辑接口，替代bash默认的emacs模式 ## set -o vi -#### #7: Setting up your favorite aliases #### +#### #7: 设定自己喜好的别名 #### - ## add protection ## + ## 增加一些保护 ## alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' @@ -538,7 +536,7 @@ Set [custom bash prompt (PS1)][13]: alias mcdshow='/usr/bin/memcached-tool 10.10.29.68:11211 display' alias mcdflush='echo "flush_all" | nc 10.10.29.68 11211' - ## Default command options ## + ## 默认命令参数 ## alias vi='vim' alias grep='grep --color=auto' alias egrep='egrep --color=auto' @@ -551,41 +549,41 @@ Set [custom bash prompt (PS1)][13]: alias rm='rm -I --preserve-root' alias ln='ln -i' -Here are some additional OS X Unix bash shell aliases: +下面是一些额外的OS X Unix bash shell别名： - # Open desktop apps from bash + # 从bash打开桌面应用 alias preview="open -a '$PREVIEW'" alias safari="open -a safari" alias firefox="open -a firefox" alias chrome="open -a google\ chrome" alias f='open -a Finder ' - # Get rid of those .DS_Store files + # 清理那些.DS_Store文件 alias dsclean='find . -type f -name .DS_Store -delete' -#### #8: Colour my world #### +#### #8: 让世界充满色彩 #### - # Get colored grep output + # 彩色的grep输出 alias grep='grep --color=auto' export GREP_COLOR='1;33' - # colored ls too + # 彩色的ls export LSCOLORS='Gxfxcxdxdxegedabagacad' - # Gnu/linux ls + # Gnu/linux的ls ls='ls --color=auto' - # BSD/os x ls command + # BSD/os x的ls命令 # alias ls='ls -G' -#### #9: Setting up your favorite bash functions #### +#### #9: 设定自己喜好的bash函数 #### - # Show top 10 history command on screen + # 在屏幕上显示10个最近的历史命令 function ht { history | awk '{a[$2]++}END{for(i in a){print a[i] " " i}}' | sort -rn | head } - # Wrapper for host and ping command - # Accept http:// or https:// or ftps:// names for domain and hostnames + # host和ping命令的替代 + # 接受http:// 或 https:// 或 ftps:// 名称用作域或主机名 _getdomainnameonly(){ local h="$1" local f="${h,,}" @@ -629,48 +627,48 @@ Here are some additional OS X Unix bash shell aliases: $_host $args $c } -#### #10: Configure bash shell behavior via shell shopt options command #### +#### #10: 通过shell shopt命令设定bash shell行为 #### -Finally, you can [make changes to your bash shell environment using set and shopt][14] commands: +最后，你可以[使用set和shopt命令调整bash shell环境][14]： - # Correct dir spellings + # 目录拼写纠正 shopt -q -s cdspell - # Make sure display get updated when terminal window get resized + # 保证每次终端窗口改变大小后会更新显示 shopt -q -s checkwinsize - # Turn on the extended pattern matching features + # 打开高级模式匹配功能 shopt -q -s extglob - # Append rather than overwrite history on exit + # 退出时附加命令历史而不是覆盖 shopt -s histappend - # Make multi-line commandsline in history + # 在命令历史使用多行 shopt -q -s cmdhist - # Get immediate notification of background job termination + # 在后台任务结束时立刻通知 set -o notify - # Disable [CTRL-D] which is used to exit the shell + # 禁用[CTRL-D]来结束shell set -o ignoreeof -### Conclusion ### +### 总结 ### -This post is by no means comprehensive. It provided a short walkthrough of how to customize your enviorment. For a thorough look at bash/ksh/zsh/csh/tcsh capabilities, I suggest you read the man page by typing the following command: +这个帖子不难理解。它简短地将如何定制用户环境从头介绍了一下。要深入了解bash/ksh/zsh/csh/tcsh/的能力，我建议你用下面的命令阅读man文档： man bash man zsh man tcsh man ksh -> This article was contributed by Aadrika T. J.; Editing and additional content added by admin. You can too [contribute to nixCraft][15]. +> 这篇文章由Aadrika T. J.贡献；由admin编辑并增加了额外内容。你也可以[为nixCraft做出贡献][15]。 -------------------------------------------------------------------------------- via: http://www.cyberciti.biz/howto/shell-primer-configuring-your-linux-unix-osx-environment/ 作者：[nixCraft][a] -译者：[译者ID](https://github.com/译者ID) +译者：[zpl1025](https://github.com/zpl1025) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 217c388f6f0f230f15f6b5d0f385fc63198616a9 Mon Sep 17 00:00:00 2001 From: zpl1025 Date: Fri, 30 Jan 2015 16:28:02 +0800 Subject: [PATCH 114/207] [translating] Bug in Wi-Fi Direct Android Implementation Causes Denial of Service --- ...i Direct Android Implementation Causes Denial of Service.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md b/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md index 8829296d18..4e3337ef3e 100644 --- a/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md +++ b/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md @@ -1,3 +1,4 @@ +zpl1025 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service ---- *Google marks the issue as having low severity, is not in a hurry to fix it* @@ -46,4 +47,4 @@ via:http://news.softpedia.com/news/Bug-In-Wi-Fi-Direct-Android-Implementation-Ca 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://news.softpedia.com/editors/browse/ionut-ilascu -[1]:http://www.coresecurity.com/advisories/android-wifi-direct-denial-service \ No newline at end of file +[1]:http://www.coresecurity.com/advisories/android-wifi-direct-denial-service From db6b82569e8b23d902ea1953a6a6705bf1e6e339 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Fri, 30 Jan 2015 17:04:17 +0800 Subject: [PATCH 115/207] Translating by ZTinoZ --- ...Linux FAQs with Answers--How to check CPU info on Linux.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md index a7c7993d89..9d5d9844cf 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md @@ -2,11 +2,11 @@ Linux有问必答时间--如何查看Linux系统的CPU信息 ================================================================================ > **问题**: 我想要了解我的电脑关于CPU处理器的详细信息，查看CPU信息比较有效地方法是什么？ -根据你的需要，there are various pieces of information you may need to know about the CPU processor(s) of your computer, such as CPU vendor name, model name, clock speed, number of sockets/cores, L1/L2/L3 cache configuration, available processor capabilities (e.g., hardware virtualization, AES, MMX, SSE), and so on. In Linux, there are many command line or GUI-based tools that are used to show detailed information about your CPU hardware. +根据你的需要，有各种各样的关于你的CPU处理器信息你需要了解，比如CPU供应商名、模型名、时钟频率、套接字/内核的数量, L1/L2/L3缓存配置、可用的处理器能力(比如：硬件虚拟化、AES, MMX, SSE)等等。在Linux中，有许多命令行或基于GUI的工具就能来展示你的CPU硬件的相关具体信息。 ### 1. /proc/cpuinfo ### -The simpliest method is to check /proc/cpuinfo. This virtual file shows the configuration of available CPU hardware. +最简单的方法就是查看 /proc/cpuinfo ，这个虚拟文件展示的是可用CPU硬件的配置。 $ more /proc/cpuinfo From 37517534c7d2c72154ca9271dbeca767f11d3755 Mon Sep 17 00:00:00 2001 From: zpl1025 Date: Fri, 30 Jan 2015 17:35:31 +0800 Subject: [PATCH 116/207] [translated] 20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service --- ...Implementation Causes Denial of Service.md | 50 ------------------- ...Implementation Causes Denial of Service.md | 49 ++++++++++++++++++ 2 files changed, 49 insertions(+), 50 deletions(-) delete mode 100644 sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md create mode 100644 translated/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md diff --git a/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md b/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md deleted file mode 100644 index 4e3337ef3e..0000000000 --- a/sources/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md +++ /dev/null @@ -1,50 +0,0 @@ -zpl1025 -Bug in Wi-Fi Direct Android Implementation Causes Denial of Service ----- -*Google marks the issue as having low severity, is not in a hurry to fix it* - -![Wi-Fi Direct glitch crashes Android](http://i1-news.softpedia-static.com/images/news2/Bug-In-Wi-Fi-Direct-Android-Implementation-Causes-Denial-of-Service-471299-2.jpg) - -#A vulnerability in the way Android handles Wi-Fi Direct connections leads to rebooting the device when searching for peers to connect to, which can be anything from other phones, cameras, gaming devices, computers, or printers. - -The Wi-Fi Direct technology allows devices capable of wireless connection to establish communication directly, without the need to join a local network. - -##Security company insisted on proper coordination for a fix - -The vulnerability allows an attacker to send a specially crafted 802.11 Probe Response frame to the device and crashes it due to an unhandled exception occurring on the WiFi monitoring class. - -Core Security discovered the flaw (CVE-2014-0997) through its CoreLabs team, and reported it to Google back in September 2014. The vendor acknowledged it but classified the glitch as having low severity, with no timeline for a fix being provided. - -The same answer was received by Core Security each time they contacted the Android security team to inform of a timeframe for rolling out a fix. The last reply of this kind was received on January 20, meaning that there is no patch for the time being. On Monday, the security company made their findings public. - -The security company created a (proof-of-concept)[1] to demonstrate the validity of the results obtained during their research. - -According to the technical details of the vulnerability, some Android devices can be induced a denial-of-service condition if they receive a malformed wpa_supplicant event, which makes available the interface between the wireless driver and the Android platform framework. - -##Google is not in a hurry to eliminate the problem - -The relaxed stance from the Android security team regarding the issue may be on account of the fact that denial-of-service condition occurs only for a short period of time, when scanning for peers. - -More than this, the result is not severe in nature as it consists in rebooting the device. There is no risk of data exfiltration or an attack that could lead to this, which would make it unappealing to a threat actor. On the other hand, a patch should be provided regardless, in order to mitigate any potential future risks. - -Core Security says that the issue was not detected on Android 5.0.1 and above, and among the devices affected they found Nexus 5 and 4 running version 4.4.4 of the mobile operating system, LG D806 and Samsung SM-T310 with Android 4.2.2, and Motorola RAZR HD with build 4.1.2 of the OS. - -For the time being, mitigation consists in refraining from using Wi-Fi Direct or updating to a non-vulnerable version of Android. - - --------------------------------------------------------------------------------- - -via:http://news.softpedia.com/news/Bug-In-Wi-Fi-Direct-Android-Implementation-Causes-Denial-of-Service-471299.shtml - -本文发布时间:27 Jan 2015, 09:11 GMT - -作者：[Ionut Ilascu][a] - -译者：[译者ID](https://github.com/译者ID) - -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://news.softpedia.com/editors/browse/ionut-ilascu -[1]:http://www.coresecurity.com/advisories/android-wifi-direct-denial-service diff --git a/translated/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md b/translated/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md new file mode 100644 index 0000000000..fa3139f2dc --- /dev/null +++ b/translated/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md @@ -0,0 +1,49 @@ +Wi-Fi直连的Android实现中的Bug导致拒绝服务 +---- +*Google标记这个问题为低严重性，并不急着修复* + +![Wi-Fi Direct glitch crashes Android](http://i1-news.softpedia-static.com/images/news2/Bug-In-Wi-Fi-Direct-Android-Implementation-Causes-Denial-of-Service-471299-2.jpg) + +#Android处理Wi-Fi直连连接的方式中的一个漏洞会导致在搜索连接节点的时候设备重启，这个节点可能是其他手机，摄像头，游戏设备，电脑或是打印机等任何设备。 + +Wi-Fi直连技术允许无线设备之间直接建立通信，而不用加入到本地网络中。 + +##安全公司致力于协调修复这个问题 + +这个漏洞允许攻击者发送一个特定的修改过的802.11侦测响应帧给设备，从而因为WiFi监控类中的一个未处理的异常导致设备重启。 + +Core Security通过自己的CoreLabs团队发现了这个下次（CVE-2014-0997），早在2014年9月就汇报给了Google。这家供应商确认了这个问题，却把它列为低严重性，并不提供修复时间表。 + +每次Core Security联系Android安全组要求提供修复时间表的时候都会收到同样的答复。最后一次答复是1月20日，意味着这么段时间中都没有补丁。在星期一的时候，这家安全公司公布了他们的发现。 + +这家安全公司建立了一个(概念证明)[1]来展示他们研究结果的有效性。 + +根据这个漏洞的技术细节，一些Android设备在收到一个错误的wpa_supplicant事件后可能会进入拒绝服务状态，这些事件让无线驱动和Android平台框架之间的接口有效。 + +##Google并不着急结束这个问题 + +Android安全组对于这个问题的放松态度可能是基于这个原因，这种拒绝服务状态只发生在扫描节点这一小段时间。 + +不仅如此，实际上结果也并不严重，因为它会导致设备重启。不存在数据泄漏的风险或是能引起这个问题的攻击，不会吸引攻击者。另一方面，不管怎样都应该提供一个补丁，以减轻任何未来的潜在风险。 + +Core Security声称在Android 5.0.1及以上版本中没有测试到这个问题，他们发现的受影响的设备有运行移动操作系统版本4.4.4的Nexus 5和4，运行Android 4.2.2的LG D806和Samsung SM-T310，以及4.1.2版本系统的Motorola RAZR HD。 + +目前，减轻影响的方式是尽量不用Wi-Fi直连，或者升级到没有漏洞的Android版本。 + + +-------------------------------------------------------------------------------- + +via:http://news.softpedia.com/news/Bug-In-Wi-Fi-Direct-Android-Implementation-Causes-Denial-of-Service-471299.shtml + +本文发布时间:27 Jan 2015, 09:11 GMT + +作者：[Ionut Ilascu][a] + +译者：[zpl1025](https://github.com/zpl1025) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/ionut-ilascu +[1]:http://www.coresecurity.com/advisories/android-wifi-direct-denial-service From 3121e70dd93a29bc26b1e1372d254cfb21b77bc3 Mon Sep 17 00:00:00 2001 From: zpl1025 Date: Fri, 30 Jan 2015 17:40:11 +0800 Subject: [PATCH 117/207] [transltaing] Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon --- ... Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md b/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md index 1fa678a6c1..9ec2de9a13 100644 --- a/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md +++ b/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md @@ -1,3 +1,4 @@ +zpl1025 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon ---- *A new kernel branch is being tracked by Ubuntu* @@ -30,4 +31,4 @@ via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-W [a]:http://news.softpedia.com/editors/browse/silviu-stahie [1]:https://lists.ubuntu.com/archives/ubuntu-devel/2015-January/038644.html -[2]:http://linux.softpedia.com/get/Linux-Distributions/Ubuntu-Vivid-Vervet-103651.shtml \ No newline at end of file +[2]:http://linux.softpedia.com/get/Linux-Distributions/Ubuntu-Vivid-Vervet-103651.shtml From e05018392e35cd7935fe66da49db56f134e950a6 Mon Sep 17 00:00:00 2001 From: zpl1025 Date: Fri, 30 Jan 2015 18:05:46 +0800 Subject: [PATCH 118/207] [translated] 20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon --- ...Integrate Linux Kernel 3.19 Branch Soon.md | 34 ------------------- ...Integrate Linux Kernel 3.19 Branch Soon.md | 33 ++++++++++++++++++ 2 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md create mode 100644 translated/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md diff --git a/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md b/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md deleted file mode 100644 index 9ec2de9a13..0000000000 --- a/sources/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md +++ /dev/null @@ -1,34 +0,0 @@ -zpl1025 -Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon ----- -*A new kernel branch is being tracked by Ubuntu* - -![Ubuntu 15.04 shortcuts](http://i1-news.softpedia-static.com/images/news2/Ubuntu-15-04-to-Integrate-Linux-Kernel-3-19-Branch-Soon-471121-2.jpg) - -#The Linux kernel is one of the most important components in a distribution and Ubuntu users are interested to know what will be used in the stable edition for the 15.04 branch, which is scheduled to arrive in a couple of months. - -The Ubuntu and the Linux kernel development cycles are not in sync and it's hard to anticipate what version will eventually land in Ubuntu 15.04. For now, Ubuntu 15.04 (Vivid Vervet) is using Linux kernel 3.18, but the developers are already looking to implement the 3.19 branch. - -"Our Vivid kernel remains based on the v3.18.2 upstream stable kernel, but we'll be rebasing to v3.18.3 shortly. We'll also be re-basing our unstable branch to v3.19-rc5 and get that uploaded to our team PPA soon," [said](1) Canonical's Joseph Salisbury. - -Linux kernel 3.19 is still under development and it will take a few weeks to see a stable version, but it's enough time to implement it in Ubuntu and test it properly. It won't be possible to get the 3.20 branch, for example, even if it launches before the April 23. - -You can [download Ubuntu 15.04](2) right now from Softpedia and give it a spin. It's a daily build and it contains all the improvements made so far to the distribution. - --------------------------------------------------------------------------------- - -via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179.shtml - -本文发布时间:25 Jan 2015, 20:39 GMT - -作者：[Silviu Stahie][a] - -译者：[译者ID](https://github.com/译者ID) - -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://news.softpedia.com/editors/browse/silviu-stahie -[1]:https://lists.ubuntu.com/archives/ubuntu-devel/2015-January/038644.html -[2]:http://linux.softpedia.com/get/Linux-Distributions/Ubuntu-Vivid-Vervet-103651.shtml diff --git a/translated/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md b/translated/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md new file mode 100644 index 0000000000..5ff335214f --- /dev/null +++ b/translated/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md @@ -0,0 +1,33 @@ +Ubuntu 15.04即将整合Linux内核3.19分支 +---- +*Ubuntu已经开始跟踪一个新的内核分支* + +![Ubuntu 15.04 shortcuts](http://i1-news.softpedia-static.com/images/news2/Ubuntu-15-04-to-Integrate-Linux-Kernel-3-19-Branch-Soon-471121-2.jpg) + +#Linux内核是一个发行版中最重要的组成部分，Ubuntu用户很想知道哪个版本将用于15.04分支的稳定版中，预计几个月后就会发布。 + +Ubuntu和Linux内核开发周期并不同步，所以很难预测最终哪个版本将应用在Ubuntu 15.04中。目前，Ubuntu 15.04（长尾黑颚猴）使用的是Linux内核3.18，但是开发者们已经准备应用3.19分支了。 + +“我们的Vivid内核仍然基于v3.18.2的稳定内核上游，但是我们很快将基础变更到v3.18.3。我们也将把我们的非稳定版分支的基础变更到v3.19-rc5，然后上传到我们的团队PPA。”Canonical的Joseph Salisbury[说](1)。 + +Linux内核3.19仍然处于开发阶段，预计还要几个星期才会出稳定版本，但是有充足的时间将它加入到Ubuntu中并测试。不可能等到3.20分支了，举个例子，即使它能在4月23日前发布。 + +你现在就可以从Softpedia[下载Ubuntu 15.04](2)，试用一下。这是一个每日构建版本，会包含发行版中目前已经做出的所有改善。 + +-------------------------------------------------------------------------------- + +via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179.shtml + +本文发布时间:25 Jan 2015, 20:39 GMT + +作者：[Silviu Stahie][a] + +译者：[zpl1025](https://github.com/zpl1025) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/silviu-stahie +[1]:https://lists.ubuntu.com/archives/ubuntu-devel/2015-January/038644.html +[2]:http://linux.softpedia.com/get/Linux-Distributions/Ubuntu-Vivid-Vervet-103651.shtml From 4ff41b3e8b0f403569df77bd1bc6f8874752d861 Mon Sep 17 00:00:00 2001 From: zpl1025 Date: Fri, 30 Jan 2015 18:13:38 +0800 Subject: [PATCH 119/207] [translating] Test drive Linux with nothing but a flash drive --- ...20141030 Test drive Linux with nothing but a flash drive.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20141030 Test drive Linux with nothing but a flash drive.md b/sources/tech/20141030 Test drive Linux with nothing but a flash drive.md index 84d5b7a9d4..7b5c5511c8 100644 --- a/sources/tech/20141030 Test drive Linux with nothing but a flash drive.md +++ b/sources/tech/20141030 Test drive Linux with nothing but a flash drive.md @@ -1,3 +1,4 @@ +zpl1025 Test drive Linux with nothing but a flash drive ================================================================================ ![Penguins gathered together: Linux for the win](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/OSDC_Penguin_Image_520x292_12324207_0714_mm_v1a.png) @@ -72,4 +73,4 @@ via: https://opensource.com/life/14/10/test-drive-linux-nothing-flash-drive [a]:https://opensource.com/users/scottnesbitt [1]:http://en.wikipedia.org/wiki/ISO_image [2]:http://unetbootin.sourceforge.net/ -[3]:http://en.wikipedia.org/wiki/BIOS \ No newline at end of file +[3]:http://en.wikipedia.org/wiki/BIOS From af6cb2be2ec5021489295cfdedad8fc88f918bce Mon Sep 17 00:00:00 2001 From: Vic___ Date: Sat, 31 Jan 2015 09:56:09 +0800 Subject: [PATCH 120/207] =?UTF-8?q?=E5=BC=BA=E5=9C=B0=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/tech/20150126 4 lvcreate Command Examples on Linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150126 4 lvcreate Command Examples on Linux.md b/sources/tech/20150126 4 lvcreate Command Examples on Linux.md index ae7e177116..bce08cc203 100644 --- a/sources/tech/20150126 4 lvcreate Command Examples on Linux.md +++ b/sources/tech/20150126 4 lvcreate Command Examples on Linux.md @@ -1,3 +1,5 @@ + Vic020 + 4 lvcreate Command Examples on Linux ================================================================================ Logical volume management (LVM) is a widely-used technique and extremely flexible disk management scheme. It basically contain three basic command : @@ -117,4 +119,4 @@ via: http://www.ehowstuff.com/4-lvcreate-command-examples-on-linux/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[a]:http://www.ehowstuff.com/author/mhstar/ \ No newline at end of file +[a]:http://www.ehowstuff.com/author/mhstar/ From 1611855c9b25df3a870ff5c935b4607975f331d7 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Sat, 31 Jan 2015 11:15:16 +0800 Subject: [PATCH 121/207] Update 20150127 How to limit network bandwidth on Linux.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 准备翻译这篇文章。 by FSSlc --- .../tech/20150127 How to limit network bandwidth on Linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150127 How to limit network bandwidth on Linux.md b/sources/tech/20150127 How to limit network bandwidth on Linux.md index 1deaa38b49..5507b3283d 100644 --- a/sources/tech/20150127 How to limit network bandwidth on Linux.md +++ b/sources/tech/20150127 How to limit network bandwidth on Linux.md @@ -1,3 +1,5 @@ +[Translating] by FSSlc + How to limit network bandwidth on Linux ================================================================================ If you often run multiple networking applications on your Linux desktop, or share bandwidth among multiple computers at home, you will want to have a better control over bandwidth usage. Otherwise, when you are downloading a big file with a downloader, your interactive SSH session may become sluggish to the point where it's unusable. Or when you sync a big folder over Dropbox, your roommate may complain that video streaming at her computer gets choppy. @@ -87,4 +89,4 @@ via: http://xmodulo.com/limit-network-bandwidth-linux.html [4]:http://lartc.org/wondershaper/ [5]:http://lartc.org/manpages/tc.txt [6]:http://xmodulo.com/how-to-set-up-epel-repository-on-centos.html -[7]:http://www.lartc.org/lartc.html \ No newline at end of file +[7]:http://www.lartc.org/lartc.html From 2d9fe2df0130c2a4af2710b6d11922db6ae92998 Mon Sep 17 00:00:00 2001 From: Stevearzh Date: Sat, 31 Jan 2015 19:16:18 +0800 Subject: [PATCH 122/207] translated by Stevearzh --- ...114 Why Mac users don't switch to Linux.md | 82 ------------------- ...114 Why Mac users don't switch to Linux.md | 81 ++++++++++++++++++ 2 files changed, 81 insertions(+), 82 deletions(-) delete mode 100644 sources/talk/20150114 Why Mac users don't switch to Linux.md create mode 100644 translated/talk/20150114 Why Mac users don't switch to Linux.md diff --git a/sources/talk/20150114 Why Mac users don't switch to Linux.md b/sources/talk/20150114 Why Mac users don't switch to Linux.md deleted file mode 100644 index 6a72276819..0000000000 --- a/sources/talk/20150114 Why Mac users don't switch to Linux.md +++ /dev/null @@ -1,82 +0,0 @@ -[Translating by Stevearzh] -Why Mac users don’t switch to Linux -================================================================================ -Linux and Mac users share at least one common thing: they prefer not to use Windows. But after that the two groups part company and tend to go their separate ways. But why don’t more Mac users switch to Linux? Is there something that prevents Mac users from making the jump? - -[Datamation took a look at these questions][1] and tried to answer them. Datamation’s conclusion was that it’s really about the applications and workflow, not the operating system: - -> …there are some instances where replacing existing applications with new options isn’t terribly practical – both in workflow and in overall functionality. This is an area where, sadly, Apple has excelled in. So while it’s hardly “impossible” to get around these issues, they are definitely a large enough challenge that it will give the typical Mac enthusiast pause. -> -> But outside of Web developers, honestly, I don’t see Mac users “en masse,” seeking to disrupt their workflows for the mere idea of avoiding the upgrade to OS X Yosemite. Granted, having seen Yosemite up close – Mac users who are considered power users will absolutely find this change-up to be hideous. However, despite poor OS X UI changes, the core workflow for existing Mac users will remain largely unchanged and unchallenged. -> -> No, I believe Linux adoption will continue to be sporadic and random. Ever-growing, but not something that is easily measured or accurately calculated. - -I agree to a certain extent with Datamation’s take on the importance of applications and workflows, both things are important and matter in the choice of a desktop operating system. But I think there’s something more going on with Mac users than just that. I believe that there’s a different mentality that exists between Linux and Mac users, and I think that’s the real reason why many Mac users don’t switch to Linux. - -![](http://jimlynch.com/wp-content/uploads/2015/01/mac-users-switch-to-linux.jpeg) - -### It’s all about control for Linux users ### - -Linux users tend to want control over their computing experience, they want to be able to change things to make them the way that they want them. One simply cannot do that in the same way with OS X or any other Apple products. With Apple you get what they give you for the most part. - -For Mac (and iOS) users this is fine, they seem mostly content to stay within Apple’s walled garden and live according to whatever standards and options Apple gives them. But this is totally unacceptable to most Linux users. People who move to Linux usually come from Windows, and it’s there that they develop their loathing for someone else trying to define or control their computing experiences. - -And once someone like that has tasted the freedom that Linux offers, it’s almost impossible for them to want to go back to living under the thumb of Apple, Microsoft or anyone else. You’d have to pry Linux from their cold, dead fingers before they’d accept the computing experience created for them Apple or Microsoft. - -But you won’t find that same determination to have control among most Mac users. For them it’s mostly about getting the most out of whatever Apple has done with OS X in its latest update. They tend to adjust fairly quickly to new versions of OS X and even when unhappy with Apple’s changes they seem content to continue living within Apple’s walled garden. - -So the need for control is a huge difference between Mac and Linux users. I don’t see it as a problem though since it just reflects the reality of two very different attitudes toward using computers. - -### Mac users need Apple’s support mechanisms ### - -Linux users are also different in the sense that they don’t mind getting their hands dirty by getting “under the hood” of their computers. Along with control comes the personal responsibility of making sure that their Linux systems work well and efficiently, and digging into the operating system is something that many Linux users have no problem doing. - -When a Linux user needs to fix something, chances are they will attempt to do so immediately themselves. If that doesn’t work then they’ll seek additional information online from other Linux users and work through the problem until it has been resolved. - -But Mac users are most likely not going to do that to the same extent. That is probably one of the reasons why Apple stores are so popular and why so many Mac users opt to buy Apple Care when they get a new Mac. A Mac user can simply take his or her computer to the Apple store and ask someone to fix it for them. There they can belly up to the Genius Bar and have their computer looked at by someone Apple has paid to fix it. - -Most Linux users would blanche at the thought of doing such a thing. Who wants some guy you don’t even know to lay hands on your computer and start trying to fix it for you? Some Linux users would shudder at the very idea of such a thing happening. - -So it would be hard for a Mac user to switch to Linux and suddenly be bereft of the support from Apple that he or she was used to getting in the past. Some Mac users might feel very vulnerable and uncertain if they were cut off from the Apple mothership in terms of support. - -### Mac users love Apple’s hardware ### - -The Datamation article focused on software, but I believe that hardware also matters to Mac users. Most Apple customers tend to love Apple’s hardware. When they buy a Mac, they aren’t just buying it for OS X. They are also buying Apple’s industrial design expertise and that can be an important differentiator for Mac users. Mac users are willing to pay more because they perceive that the overall value they are getting from Apple for a Mac is worth it. - -Linux users, on the other hand, seem less concerned by such things. I think they tend to focus more on cost and less on the looks or design of their computer hardware. For them it’s probably about getting the most value from the hardware at the lowest cost. They aren’t in love with the way their computer hardware looks in the same way that some Mac users probably are, and so they don’t make buying decisions based on it. - -I think both points of view on hardware are equally valid. It ultimately gets down to the needs of the individual user and what matters to them when they choose to buy or, in the case of some Linux users, build their computer. Value is the key for both groups, and each has its own perceptions of what constitutes real value in a computer. - -Of course it is [possible to run Linux on a Mac][2], directly or indirectly via virtual machine. So a user that really liked Apple’s hardware does have the option of keeping their Mac but installing Linux on it. - -### Too many Linux distros to choose from? ### - -Another reason that might make it hard for a Mac user to move to Linux is the sheer number of distributions to choose from in the world of Linux. While most Linux users probably welcome the huge diversity of distros available, it could also be very confusing for a Mac user who hasn’t learned to navigate those choices. - -Over time I think a Mac user would learn and adjust by figuring out which distribution worked best for him or her. But in the short term it might be a very daunting hurdle to overcome after being used to OS X for a long period of time. I don’t think it’s insurmountable, but it’s definitely something that is worth mentioning here. - -Of course we do have helpful resources like [DistroWatch][3] and even my own [Desktop Linux Reviews][4] blog that can help people find the right Linux distribution. Plus there are many articles available about “the best Linux distro” and that sort of thing that Mac users can use as resources when trying to figure out the distribution they want to use. - -But one of the reasons why Apple customers buy Macs is the simplicity and all-in-one solution that they offer in terms of the hardware and software being unified by Apple. So I am not sure how many Mac users would really want to spend the time trying to find the right Linux distribution. It might be something that puts them off really considering the switch to Linux. - -### Mac users are apples and Linux users are oranges ### - -I see nothing wrong with Mac and Linux users going their separate ways. I think we’re just talking about two very different groups of people, and it’s a good thing that both groups can find and use the operating system and software that they prefer. Let Mac users enjoy OS X and let Linux users enjoy Linux, and hopefully both groups will be happy and content with their computers. - -Every once in a while a Mac user might stray over to Linux or vice versa, but for the most part I think the two groups live in different worlds and mostly prefer to stay separate and apart from one another. I generally don’t compare the two because when you get right down to it, it’s really just a case of apples and oranges. - --------------------------------------------------------------------------------- - -via: http://jimlynch.com/linux-articles/why-mac-users-dont-switch-to-linux/ - -作者：[Jim Lynch][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://jimlynch.com/author/Jim/ -[1]:http://www.datamation.com/open-source/why-linux-isnt-winning-over-mac-users-1.html -[2]:http://www.howtogeek.com/187410/how-to-install-and-dual-boot-linux-on-a-mac/ -[3]:http://distrowatch.com/ -[4]:http://desktoplinuxreviews.com/ \ No newline at end of file diff --git a/translated/talk/20150114 Why Mac users don't switch to Linux.md b/translated/talk/20150114 Why Mac users don't switch to Linux.md new file mode 100644 index 0000000000..ae5337b1f2 --- /dev/null +++ b/translated/talk/20150114 Why Mac users don't switch to Linux.md @@ -0,0 +1,81 @@ +为什么 Mac 用户不选择 Linux +================================================================================ +Linux 与 Mac 用户至少有一个共同点：他们都不太喜欢用 Windows。但除了这点外，二者再也无法达成其他共识，只得分道扬镳。为什么 Mac 用户不选择 Linux 呢？是什么因素致使 Mac 用户做出了这种选择的？ + +[Datamation 就此问题做了一番调查][1]，并试图进行解答。Datamation 的结论是，所有原因都只归结于众多应用及工作区，而非操作系统的关系： + +> …某些事例表明，尝试用新应用接替现有应用，并非会是很糟糕的体验 - 对工作区和实用性来说都是如此。但不幸的是，苹果在这些方面做得非常好。因此，在几乎不可能改变这些事实的情况下，想要拉拢那些 Mac忠实用户实在是很大的挑战。 + +> 不过老实来说，除了 Web 开发者，我还没见过 Mac 用户仅仅为了避免升级到 OS X Yosemite 而 “ +en masse”(法语：共同，一起) 尝试变更他们的工作区。诚然，经历过 Yosemite 更新后 - 考虑过权限的用户应该会发现这方面已经变得非常令人讨厌。并且，OS X 除了在 UI 方面几乎没有变化，针对现有 Mac 用户的核心工作区也在最大程度上保持了原样。 + +> 但，我相信 Linux 在未来将会继续保持多样化特点。Linux 会继续成长，但绝不是经过精确计量般得一成不变。 + +我大体上同意 Datamation 关于应用和工作区的重要性的结论，在选择操作系统时这两方面是必须要考虑顾及的。但我认为对 Mac 用户来说，选择 Mac 有比这两方面更重要的因素。我相信是不同的心态造就了 Linux 和 Mac 用户，并且我认为这才是为什么 Mac 用户不选择 Linux 的真实原因。 + +![](http://jimlynch.com/wp-content/uploads/2015/01/mac-users-switch-to-linux.jpeg) + +### 控制权才是 Linux 用户最看重的地方 ### +Linux 用户倾向于控制电脑上的所有细节，他们试图作出一切能做的努力使操作系统变成他们想要的样子。但这种方式并不适用于 OS X 以及其他任何苹果的产品。如果你使用了苹果的产品，就意味着绝大多数情况下，你只能按照苹果预先设定的模式来使用它们。 + +对 Mac（以及 iOS）用户来说这没什么，因为他们似乎并不在乎生活在苹果那围墙高筑的花园里，仅仅使用那些苹果给予他们的标准和选择。但这对绝大多数 Linux 用户来说是完全不能接受的。Linux 的新用户通常来自 Windows，正是从那里，他们开始厌恶那些告诉他们什么才叫操作系统，并试图限制操作系统权限的东西的。 + +自从他们尝到使用自由的 Linux 系统所带来的甜头之后，他们就再也不会再回到苹果或者微软的监牢里去了。即使你在他们死后，把 Linux 从他们那冰冷僵硬的手指下撬出来，他们也不会接受苹果和微软那种糟糕的操作系统。 + +但绝大部分 Mac 用户不会有这样的意志和决心。对他们来说当苹果升级 OS X 时放弃他们现有的习惯方式是非常容易的。在苹果那围墙高筑的花园里，即使他们不满意苹果的变化，他们也会迅速地接受。 + +因此，对控制权的渴望是 Mac 用户与 Linux 用户的最大不同。但我并未把它视为一个问题，尽管这反映出使用电脑的两类人的截然不同的态度。 + +### Mac 用户离不开苹果的技术支持 ### + +Linux 用户与 Mac 用户的区别也体现在 Linux 用户并不介意亲自维护自己的电脑。虽然维护电脑及控制操作系统都是很大的责任，但 Linux 用户还是愿意独自承担，愿意通过自己的力量使他们的系统工作得更棒更有效率，并且深入了解操作系统是每一位 Linux 用户都乐衷的事情。 + +当 Linux 用户遇到问题的时，他们会迅速地尝试自己来解决问题。如果这不奏效的话，他们会在网上寻找其他用户在遇到类似问题是怎么解决的，并不断进行尝试，直到问题解决。 + +但 Mac 用户却不大会这样。这也许是为什么苹果零售店如此火爆、为什么如此多的 Mac 用户在拿到新 Mac 的时候会选择购买苹果维护服务的原因。Mac 用户会很轻易得带着 TA 的电脑去苹果零售店，走进天才吧并要求苹果的工作人员为其查看和修复电脑。 + +绝大多数 Linux 用户连想都不会像这种事情。谁会愿意让一个你都不认识的家伙碰你的电脑并维修它呢？ + +因此对 Mac 用户来说，很难抛弃过去可以从苹果那里得到的技术支持，转而使用 Linux。这种选择会令某些 Mac 用户觉得自己的电脑将变得非常脆弱、容易被攻击，他们如同离开母亲怀抱的婴儿般充满了无助感。 + +### Mac 用户喜爱苹果的硬件 ### + +Datamation 发表的文章中主要研究了软件方面的原因，但我认为硬件因素同样对 Mac 用户有很大影响。绝大部分 Mac 用户非常喜爱苹果的硬件。TA 们购买 Mac 并不仅仅是为了 OS X。苹果那精美的工艺设计也是 Mac 用户购买时着重考虑的一点。Mac 用户愿意支付高价购买电脑，因为他们认为这样绝对是物有所值的。 + +另一方面，Linux 用户似乎并不会考虑这些东西。我认为他们更偏向于在他们的电脑外观上花费较少的金钱。对他们来说，花费最少的金钱来获取尽可能好的硬件才是最重要的。他们并不像 Mac 用户一样热衷于电脑的外观，因此这一点并不是他们在购买电脑时考虑的地方。 + +我认为对于硬件的两种不同观点是没有高低之分的。这仅仅和用户的不同需求有关，仅仅会在他们购买电脑时影响他们，或者对某些 Linux 用户来说只是因为他们想要自己组装电脑而已。两种观点只是因为出发点不同、对于电脑的真正价值体现所在之处的理解不同罢了。 + +当然[在 Mac 上运行 Linux 是可能的][2]，直接运行或者间接地通过虚拟机运行。因此真心喜欢苹果硬件的 Mac 用户是可以选择在 Mac 上安装 Linux 的。 + +### Linux 发行版太多了不知道选哪个？ ### + +另一个让 Mac 用户无法选择 Linux 的原因是：要从从众多 Linux 发行版当中选择一个实在是太困难了。在大多数 Linux 并不抗拒的多元化发行版时代，没有任何相关知识的 Mac 用户感到十分困惑。 + +我认为，随着时间的推移，Mac 用户是可以找出不适应最适合自己的发行版的。但在短时间内，尤其是在长时期得使用 OS X 之后，这是一个艰巨的任务。我不认为这个问题是无法克服的，但却有必要在这里提一下。 + +当然我们可以给 Mac 用户指明道路，推荐参考 [DistroWatch][3] 还有我们人的博客 [Desktop Linux Reviews][4]，这都有助于 Mac 用户找到正确的 Linux 发行版。再说一条，网上有很多诸如“最好的 Linux 发行版”等类似的文章，当 Mac 用户想要寻找适合自己使用的发行版时可以参考一下。 + +但有苹果顾客购买 Mac 的其中一个原因是苹果硬件软件协调统一起来的简便性和易用性。所以我不确定有多少 Mac 用户愿意花费时间找出适合自己的 Linux 发行版。也许是否要使用 Linux 确实会令 TA 们考虑一阵子了。 + +### Mac 用户是苹果，Linux 用户是橘子 ### + +Mac 用户与 Linux 用户分道扬镳我认为并没有什么不妥。我认为我们只是在谈论两类完全不同的人群，这是一件好事，因为两类人群都在按自己四环的方式去使用操作系统和软件。让 Mac 用户和 Linux 用户各自沉浸在 OS X 和 Linux 中吧，希望他们都能高兴，都能对自己的电脑满意。 + +也许 Mac 用户会偶然走入 Linux 的世界并开始转向 Linux，但我认为绝大多数时候，两类人都愿意呆在在不同的世界并不与对方接触。通常来说我并不会随意比较二者，尤其是你已经自己拿定主意的时候，况且这只不过是选苹果还是选橘子的问题罢了。 + +-------------------------------------------------------------------------------- + +via: http://jimlynch.com/linux-articles/why-mac-users-dont-switch-to-linux/ + +作者：[Jim Lynch][a] +译者：[Stevearzh](https://github.com/Stevearzh) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://jimlynch.com/author/Jim/ +[1]:http://www.datamation.com/open-source/why-linux-isnt-winning-over-mac-users-1.html +[2]:http://www.howtogeek.com/187410/how-to-install-and-dual-boot-linux-on-a-mac/ +[3]:http://distrowatch.com/ +[4]:http://desktoplinuxreviews.com/ \ No newline at end of file From f97c46490fbe9cb77142a52ea0510bccca8dc1be Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Sat, 31 Jan 2015 21:56:30 +0800 Subject: [PATCH 123/207] =?UTF-8?q?20150131=20=E9=80=89=E9=A2=98=202015013?= =?UTF-8?q?1=20WordPress=20Can=20Be=20Used=20to=20Leverage=20Critical=20Gh?= =?UTF-8?q?ost=20Flaw=20in=20Linux.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...o Leverage Critical Ghost Flaw in Linux.md | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 sources/news/20150131 WordPress Can Be Used to Leverage Critical Ghost Flaw in Linux.md diff --git a/sources/news/20150131 WordPress Can Be Used to Leverage Critical Ghost Flaw in Linux.md b/sources/news/20150131 WordPress Can Be Used to Leverage Critical Ghost Flaw in Linux.md new file mode 100644 index 0000000000..3d132079a4 --- /dev/null +++ b/sources/news/20150131 WordPress Can Be Used to Leverage Critical Ghost Flaw in Linux.md @@ -0,0 +1,49 @@ +WordPress Can Be Used to Leverage Critical Ghost Flaw in Linux +----- +*Users are advised to apply available patches immediately* + +![WordPress validating pingback’s post URL](http://i1-news.softpedia-static.com/images/news2/WordPress-Can-Be-Used-to-Leverage-Critical-Ghost-Flaw-in-Linux-471730-2.jpg) + +**The vulnerability revealed this week by security researchers at Qualys, who dubbed it [Ghost](1), could be taken advantage of through WordPress or other PHP applications to compromise web servers.** + +The glitch is a buffer overflow that can be triggered by an attacker to gain command execution privileges on a Linux machine. It is present in the glibc’s “__nss_hostname_digits_dots()” function that can be used by the “gethostbyname()” function. + +##PHP applications can be used to exploit the glitch + +Marc-Alexandre Montpas at Sucuri says that the problem is significant because these functions are used in plenty of software and server-level mechanism. + +“An example of where this could be a big issue is within WordPress itself: it uses a function named wp_http_validate_url() to validate every pingback’s post URL,” which is carried out through the “gethostbyname()” function wrapper used by PHP applications, he writes in a blog post on Wednesday. + +An attacker could use this method to introduce a malicious URL designed to trigger the vulnerability on the server side and thus obtain access to the machine. + +In fact, security researchers at Trustwave created [proof-of-concept](2) code that would cause the buffer overflow using the pingback feature in WordPress. + +##Multiple Linux distributions are affected + +Ghost is present in glibc versions up to 2.17, which was made available in May 21, 2013. The latest version of glibc is 2.20, available since September 2014. + +However, at that time it was not promoted as a security fix and was not included in many Linux distributions, those offering long-term support (LTS) in particular. + +Among the impacted operating systems are Debian 7 (wheezy), Red Hat Enterprise Linux 6 and 7, CentOS 6 and 7, Ubuntu 12.04. Luckily, Linux vendors have started to distribute updates with the fix that mitigates the risk. Users are advised to waste no time downloading and applying them. + +In order to demonstrate the flaw, Qualys has created an exploit that allowed them remote code execution through the Exim email server. The security company said that it would not release the exploit until the glitch reached its half-life, meaning that the number of the affected systems has been reduced by 50%. + +Vulnerable application in Linux are clockdiff, ping and arping (under certain conditions), procmail, pppd, and Exim mail server. + +-------------------------------------------------------------------------------- + +via:http://news.softpedia.com/news/WordPress-Can-Be-Used-to-Leverage-Critical-Ghost-Flaw-in-Linux-471730.shtml + +本文发布时间:30 Jan 2015, 17:36 GMT + +作者：[Ionut Ilascu][a] + +译者：[译者ID](https://github.com/译者ID) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/ionut-ilascu +[1]:http://news.softpedia.com/news/Linux-Systems-Affected-by-14-year-old-Vulnerability-in-Core-Component-471428.shtml +[2]:http://blog.spiderlabs.com/2015/01/ghost-gethostbyname-heap-overflow-in-glibc-cve-2015-0235.html From a9b73de3d3340c03ce805e268857621f80a7b102 Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 1 Feb 2015 10:16:31 +0800 Subject: [PATCH 124/207] PUB:20150121 Linux FAQs with Answers--How to check disk space on Linux with df command @mtunique --- ...eck disk space on Linux with df command.md | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) rename {translated/tech => published}/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md (88%) diff --git a/translated/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md b/published/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md similarity index 88% rename from translated/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md rename to published/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md index 6b1d65ca8b..adecdd2520 100644 --- a/translated/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md +++ b/published/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md @@ -1,4 +1,4 @@ -Linux有问必答：在Linux下如何用df命令检查磁盘空间？ +在 Linux 下你所不知道的 df 命令的那些功能 ================================================================================ > **问题**: 我知道在Linux上我可以用df命令来查看磁盘使用空间。你能告诉我df命令的实际例子使我可以最大限度得利用它吗？ @@ -10,7 +10,7 @@ df命令可以展示任何“mounted”文件系统的磁盘利用率。该命 ### 用人们可读的方式展示 ### -默认情况下，df命令用1K为块来展示磁盘空间，这不容易解释。“-h”参数使df用更可读的方式打印磁盘空间（例如 100K，200M，3G）。 +默认情况下，df命令用1K为块来展示磁盘空间，这看起来不是很直观。“-h”参数使df用更可读的方式打印磁盘空间（例如 100K，200M，3G）。 $ df -h @@ -28,7 +28,7 @@ df命令可以展示任何“mounted”文件系统的磁盘利用率。该命 ### 展示Inode使用情况 ### -当你监视磁盘使用情况时，你必须注意的不仅仅是磁盘空间还有“inode”的使用情况。在Linux中，inode是用来存储特定文件的元数据的一种数据结构，在创建一个文件系统时，inode的预先定义数量将被分配。这意味着，一个文件系统可能耗尽空间不只是因为大文件用完了所有可用空间，也可能是因为很多小文件用完了所有可能的inode。用“-i”选项展示inode使用情况。 +当你监视磁盘使用情况时，你必须注意的不仅仅是磁盘空间还有“inode”的使用情况。在Linux中，inode是用来存储特定文件的元数据的一种数据结构，在创建一个文件系统时，inode的预先定义数量将被分配。这意味着，**一个文件系统可能耗尽空间不只是因为大文件用完了所有可用空间，也可能是因为很多小文件用完了所有可能的inode**。用“-i”选项展示inode使用情况。 $ df -i @@ -46,7 +46,8 @@ df命令可以展示任何“mounted”文件系统的磁盘利用率。该命 ### 展示磁盘总利用率 ### -默认情况下， df命令显示磁盘的单个文件系统的利用率。如果你想知道的所有文件系统的总磁盘使用量，增加“ --total ”选项。 +默认情况下， df命令显示磁盘的单个文件系统的利用率。如果你想知道的所有文件系统的总磁盘使用量，增加“ --total ”选项（见最下面的汇总行）。 + $ df -h --total ---------- @@ -64,7 +65,7 @@ df命令可以展示任何“mounted”文件系统的磁盘利用率。该命 ### 展示文件系统类型 ### -默认情况下，df命令不现实文件系统类型信息。用“-T”选项来添加文件系统信息到输出中。 +默认情况下，df命令不显示文件系统类型信息。用“-T”选项来添加文件系统信息到输出中。 $ df -T @@ -92,13 +93,13 @@ df命令可以展示任何“mounted”文件系统的磁盘利用率。该命 /dev/mapper/ubuntu-root 952893348 591583380 312882756 66% / /dev/sda1 233191 100025 120725 46% /boot -排除特定的文件系统类型，用“-x ”选项。同样，你可以用这个选项多次。 +排除特定的文件系统类型，用“-x ”选项。同样，你可以用这个选项多次来排除多种文件系统类型。 $ df -x tmpfs ### 显示一个具体的挂载点磁盘使用情况 ### -如果你用df指定一个挂载点，它将报告挂载在那个地方的文件系统的磁盘使用情况。如果你指定一个普通文件（或一个目录）而不是一个挂载点，df将现实包含这个文件（或目录）的文件系统的磁盘利用率。 +如果你用df指定一个挂载点，它将报告挂载在那个地方的文件系统的磁盘使用情况。如果你指定一个普通文件（或一个目录）而不是一个挂载点，df将显示包含这个文件（或目录）的文件系统的磁盘利用率。 $ df / @@ -116,9 +117,9 @@ df命令可以展示任何“mounted”文件系统的磁盘利用率。该命 Filesystem 1K-blocks Used Available Use% Mounted on /dev/mapper/ubuntu-root 952893348 591583528 312882608 66% / -### 现实虚拟文件系统的信息 ### +### 显示虚拟文件系统的信息 ### -如果你想显示所有已经存在的文件系统（包括虚拟文件系统）的磁盘空间信息，用“-a”选项。这里，虚拟文件系统是指没有相对应的物理设备的假的文件系统，例如，tmpfs，cgroup虚拟文件系统或FUSE文件安系统。这些虚拟文件系统大小为0，不用“-a”选项将不会被报告出来。 +如果你想显示所有已经存在的文件系统（包括虚拟文件系统）的磁盘空间信息，用“-a”选项。这里，虚拟文件系统是指没有相对应的物理设备的假文件系统，例如，tmpfs，cgroup虚拟文件系统或FUSE文件安系统。这些虚拟文件系统大小为0，不用“-a”选项将不会被报告出来。 $ df -a @@ -149,7 +150,7 @@ df命令可以展示任何“mounted”文件系统的磁盘利用率。该命 via: http://ask.xmodulo.com/check-disk-space-linux-df-command.html 译者：[mtunique](https://github.com/mtunique) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 98e68b6b8b5f25fa311fc170a0410423862d38cc Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 1 Feb 2015 10:35:04 +0800 Subject: [PATCH 125/207] PUB:20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu @GOLinux --- ... Track of Multiple Time Zones in Ubuntu.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) rename {translated/tech => published}/20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md (78%) diff --git a/translated/tech/20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md b/published/20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md similarity index 78% rename from translated/tech/20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md rename to published/20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md index 273d949490..57ff68b6d2 100644 --- a/translated/tech/20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md +++ b/published/20141204 The Easy Way to Keep Track of Multiple Time Zones in Ubuntu.md @@ -2,13 +2,13 @@ Ubuntu中跟踪多个时区的简捷方法 ================================================================================ ![date-time](http://www.omgubuntu.co.uk/wp-content/uploads/2014/11/date-time.jpg) -**我是否要确保在我醒来时或者安排与*山姆陈*，Ohso的半个开发商，进行Skype通话时，澳大利亚一个关于Chromebook销售的推特已经售罄，我大脑同时在多个时区下工作。** +**无论我是要在醒来时发个关于澳大利亚的 Chromebook 销售已经售罄的推特，还是要记着和Ohso的半个开发商山姆陈进行Skype通话，我大脑都需要同时工作在多个时区下。** 那里头有个问题，如果你认识我，你会知道我的脑容量也就那么丁点，跟金鱼差不多，里头却塞着像Windows Vista这样一个臃肿货（也就是，不是很好）。我几乎记不得昨天之前的事情，更记不得我的门和金门大桥脚之间的时间差！ -作为臂助，我使用一些小部件和菜单项来让我保持同步。在我常规工作日的空间里，我在多个操作系统间游弋，涵盖移动系统和桌面系统，但只有一个让我最快速便捷地设置“世界时钟”。 +作为臂助，我使用一些小部件和菜单项来让我保持同步。在我常规工作日的空间里，我在多个操作系统间游弋，涵盖移动系统和桌面系统，但只有一个可以让我最快速便捷地设置“世界时钟”。 -**而它刚好是那个名字放在门上方的东西。** +**它的名字就是我们标题上提到的那个。** ![](http://www.omgubuntu.co.uk/wp-content/uploads/2014/11/timezones-300x180.jpg) @@ -16,10 +16,10 @@ Ubuntu中跟踪多个时区的简捷方法 Unity中默认的日期-时间指示器提供了添加并查看多个时区的支持，不需要附加组件，不需要额外的包。 -1. 点击时钟小应用，然后uxuanze‘**时间和日期设置**’条目 +1. 点击时钟小应用，然后选择‘**时间和日期设置**’条目 1. 在‘**时钟**’标签中，选中‘**其它位置的时间**’选框 1. 点击‘**选择位置**’按钮 -1. 点击‘**+**’，然后输入位置名称那个 +1. 点击‘**+**’，然后输入位置名称 #### 其它桌面环境 #### @@ -34,13 +34,13 @@ Unity中默认的日期-时间指示器提供了添加并查看多个时区的 ![World Clock Calendar in Cinnamon 2.4](http://www.omgubuntu.co.uk/wp-content/uploads/2014/12/cinnamon-applet.jpg) -Cinnamon 2.4中的世界时钟日历 +*Cinnamon 2.4中的世界时钟日历* -**XFCE**和**LXDE**就不那么慷慨了，除了自带的“工作区”作为**多个时钟**添加到面板外，每个都需要手动配置以指定位置。两个都支持‘指示器小部件’，所以，如果你没有依赖于Unity，你可以安装/添加单独的日期/时间指示器。 +**XFCE**和**LXDE**就不那么慷慨了，除了自带的“工作区”作为**多个时钟**添加到面板外，每个都需要手动配置以指定位置。两个都支持‘指示器小部件’，所以，如果你不用Unity的话，你可以安装/添加单独的日期/时间指示器。 -**Budgie**还刚初出茅庐，不足以胜任角落里的需求，因为Pantheon我还没试过——希望你们通过评论来让我知道得更多。 +**Budgie**还刚初出茅庐，不足以胜任这种角落里的需求，因为Pantheon我还没试过——希望你们通过评论来让我知道得更多。 -#### Desktop Apps, Widgets & Conky Themes桌面应用、不见和Conky主题 #### +#### 桌面应用、部件和Conky主题 #### 当然，面板小部件只是收纳其它国家多个时区的一种方式。如果你不满意通过面板去访问，那里还有各种各样的**桌面应用**可供使用，其中许多都可以跨版本，甚至跨平台使用。 @@ -54,7 +54,7 @@ via: http://www.omgubuntu.co.uk/2014/12/add-time-zones-world-clock-ubuntu 作者：[Joey-Elijah Sneddon][a] 译者：[GOLinux](https://github.com/GOLinux) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 02766f1a2b07ce87a31aba09d77ef0a70326b99f Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 1 Feb 2015 11:07:13 +0800 Subject: [PATCH 126/207] PUB:20141223 20 Linux Commands Interview Questions & Answers @ZTinoZ --- ... Commands Interview Questions & Answers.md | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) rename {translated/talk => published}/20141223 20 Linux Commands Interview Questions & Answers.md (71%) diff --git a/translated/talk/20141223 20 Linux Commands Interview Questions & Answers.md b/published/20141223 20 Linux Commands Interview Questions & Answers.md similarity index 71% rename from translated/talk/20141223 20 Linux Commands Interview Questions & Answers.md rename to published/20141223 20 Linux Commands Interview Questions & Answers.md index 40d5019c52..d7e20f6b24 100644 --- a/translated/talk/20141223 20 Linux Commands Interview Questions & Answers.md +++ b/published/20141223 20 Linux Commands Interview Questions & Answers.md @@ -8,7 +8,7 @@ 答: 用 “route -n” 和 “netstat -nr” 命令，我们可以查看默认网关。除了默认的网关信息，这两个命令还可以显示当前的路由表。 -**问:3 如何在Linux上重建初始化内存盘影响文件？** +**问:3 如何在Linux上重建初始化内存盘镜像文件？** 答: 在CentOS 5.X / RHEL 5.X中，可以用mkinitrd命令来创建初始化内存盘文件，举例如下： @@ -30,7 +30,7 @@ **问:5 patch命令是什么？如何使用？** -答: 顾名思义，patch命令就是用来将修改（或补丁）写进文本文件里。Patch命令通常是接收diff的输出并把文件的旧版本转换为新版本。举个例子，Linux内核源代码由百万行代码文件构成，所以无论何时，任何代码贡献者贡献出代码，只需发送改动的部分而不是整个源代码，然后接收者用patch命令将改动写进原始的源代码里。 +答: 顾名思义，patch命令就是用来将修改（或补丁）写进文本文件里。patch命令通常是接收diff的输出并把文件的旧版本转换为新版本。举个例子，Linux内核源代码由百万行代码文件构成，所以无论何时，任何代码贡献者贡献出代码，只需发送改动的部分而不是整个源代码，然后接收者用patch命令将改动写进原始的源代码里。 创建一个diff文件给patch使用， @@ -44,7 +44,7 @@ **问:6 aspell有什么用 ?** -答: 顾名思义，aspell就是Linux操作系统上的一款交互式拼写检查器。aspell命令继任了更早的一个名为ispell的程序，并且作为一款嵌入式替代品 ，最重要的是它非常好用。当aspell程序主要被其它一些需要拼写检查能力的程序所使用的时候，在命令行中作为一个独立运行的工具的它也能十分有效。 +答: 顾名思义，aspell就是Linux操作系统上的一款交互式拼写检查器。aspell命令继任了更早的一个名为ispell的程序，并且作为一款免费替代品 ，最重要的是它非常好用。当aspell程序主要被其它一些需要拼写检查能力的程序所使用的时候，在命令行中作为一个独立运行的工具的它也能十分有效。 **问:7 如何从命令行查看域SPF记录？** @@ -56,7 +56,7 @@ 答: # rpm -qf /etc/fstab -以上命令能列出供应给“/etc/fstab”文件的包。 +以上命令能列出提供“/etc/fstab”这个文件的包。 **问:9 哪条命令用来查看bond0的状态？** @@ -64,7 +64,7 @@ **问:10 Linux系统中的/proc文件系统有什么用？** -答: /proc文件系统是一个基于维护关于当前正在运行的内核状态信息的文件系统的随机存取存储器（RAM），其中包括CPU、内存、分区划分、I/O地址、直接内存访问通道和正在运行的进程。这个文件系统所代表的是各种不实际存储信息的文件，它们指向的是内存里的信息。/proc文件系统是由系统自动维护的。 +答: /proc文件系统是一个基于内存的文件系统，其维护着关于当前正在运行的内核状态信息，其中包括CPU、内存、分区划分、I/O地址、直接内存访问通道和正在运行的进程。这个文件系统所代表的并不是各种实际存储信息的文件，它们指向的是内存里的信息。/proc文件系统是由系统自动维护的。 **问:11 如何在/usr目录下找出大小超过10MB的文件？** @@ -78,21 +78,21 @@ 答: # find /var \\! -atime -90 -**问:14 在整个目录树下查找核心文件，如发现则删除它们且不提示确认信息。** +**问:14 在整个目录树下查找文件“core”，如发现则无需提示直接删除它们。** 答: # find / -name core -exec rm {} \; **问:15 strings命令有什么作用？** -答: strings命令用来提取和显示非文本文件的清晰内容。 +答: strings命令用来提取和显示非文本文件中的文本字符串。（LCTT 译注：当用来分析你系统上莫名其妙出现的二进制程序时，可以从中找到可疑的文件访问，对于追查入侵有用处） -**问:16 tee filter有什么作用 ?** +**问:16 tee 过滤器有什么作用 ?** -答: tee filter用来向多个目标发送输出内容。它可以向一个文件发送一份输出的拷贝并且如果使用管道的话可以在屏幕上（或一些其它程序）输出其它内容。 +答: tee 过滤器用来向多个目标发送输出内容。如果用于管道的话，它可以将输出复制一份到一个文件，并复制另外一份到屏幕上（或一些其它程序）。 linuxtechi@localhost:~$ ll /etc | nl | tee /tmp/ll.out -在以上例子中，从ll输出的是在 /tmp/ll.out 文件中被捕获的，输出同样在屏幕上显示了出来。 +在以上例子中，从ll输出可以捕获到 /tmp/ll.out 文件中，并且同样在屏幕上显示了出来。 **问:17 export PS1 = ”$LOGNAME@`hostname`:\$PWD: 这条命令是在做什么？** @@ -108,7 +108,7 @@ **问:20 linux中lspci命令的作用是什么？** -答: lspci命令用来显示你的系统上PCI总线和附加设备的信息。指定-v，-vv或-vvv来获取详细输出，加上-r参数的话，命令的输出则会更具有易读性。 +答: lspci命令用来显示你的系统上PCI总线和附加设备的信息。指定-v，-vv或-vvv来获取越来越详细的输出，加上-r参数的话，命令的输出则会更具有易读性。 -------------------------------------------------------------------------------- @@ -116,7 +116,7 @@ via: http://www.linuxtechi.com/20-linux-commands-interview-questions-answers/ 作者：[Pradeep Kumar][a] 译者：[ZTinoZ](https://github.com/ZTinoZ) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From c5b7cdcd7b0340a7627878e5782fa79786a39865 Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 1 Feb 2015 11:29:31 +0800 Subject: [PATCH 127/207] PUB:20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux @Vic020 --- ...swers--How to install Kingsoft Office on Linux.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) rename {translated/tech => published}/20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md (79%) diff --git a/translated/tech/20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md b/published/20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md similarity index 79% rename from translated/tech/20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md rename to published/20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md index 0c7a0110b1..28cef519f8 100644 --- a/translated/tech/20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md +++ b/published/20141224 Linux FAQs with Answers--How to install Kingsoft Office on Linux.md @@ -1,13 +1,11 @@ -Linux有问必答 - linux如何安装WPS +Linux有问必答 - 如何在linux上安装WPS ================================================================================ > **问题**: 我听说一个好东西Kingsoft Office（译注：就是WPS），所以我想在我的Linux上试试。我怎样才能安装Kingsoft Office呢？ -Kingsoft Office 一套办公套件，支持多个平台，包括Windows, Linux, iOS 和 Android。它包含三个组件：Writer（WPS文字）用来文字处理，Presentation（WPS演示）支持幻灯片，Spereadsheets（WPS表格）为电子表格。使用免费增值模式，其中基础版本是免费使用。比较其他的linux办公套件，如LibreOffice、 OpenOffice，最大优势在于，Kingsoft Office能最好的兼容微软的Office（译注：版权问题？了解下wps和Office的历史问题，可以得到一些结论）。因此如果你需要在windowns和linux平台间交互，Kingsoft office是一个很好的选择。 - +Kingsoft Office 是一套办公套件，支持多个平台，包括Windows, Linux, iOS 和 Android。它包含三个组件：Writer（WPS文字）用来文字处理，Presentation（WPS演示）支持幻灯片，Spereadsheets（WPS表格）是电子表格。其使用免费增值模式，其中基础版本是免费使用。比较其他的linux办公套件，如LibreOffice、 OpenOffice，其最大优势在于，Kingsoft Office能最好的兼容微软的Office（译注：版权问题？了解下wps和Office的历史问题，可以得到一些结论）。因此如果你需要在windows和linux平台间交互，Kingsoft office是一个很好的选择。 ### CentOS, Fedora 或 RHEL中安装Kingsoft Office ### - 在[官方页面][1]下载RPM文件.官方RPM包只支持32位版本linux，但是你可以在64位中安装。 需要使用yum命令并用"localinstall"选项来本地安装这个RPM包 @@ -39,7 +37,7 @@ DEB包同样遇到一堆依赖。因此使用[gdebi][3]命令来代替dpkg来自 ### 启动 Kingsoft Office ### -安装完成后，你就可以在桌面管理器轻松启动Witer（WPS文字）, Presentation（WPS演示）, and Spreadsheets（WPS表格），如下图 +安装完成后，你就可以在桌面管理器轻松启动Witer（WPS文字）, Presentation（WPS演示）, and Spreadsheets（WPS表格），如下图。 Ubuntu Unity中: @@ -49,7 +47,7 @@ GNOME桌面中: ![](https://farm9.staticflickr.com/8617/16039583622_4e7c1d8545_b.jpg) -不但如此，你也可以在命令行中启动Kingsoft Office +不但如此，你也可以在命令行中启动Kingsoft Office。 启动Wirter（WPS文字），使用这个命令： @@ -74,7 +72,7 @@ GNOME桌面中: via: http://ask.xmodulo.com/install-kingsoft-office-linux.html 译者：[Vic020/VicYu](http://www.vicyu.net) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 27bf18f3a648bd04a2c5eeecc308a0d72901802d Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 1 Feb 2015 11:40:04 +0800 Subject: [PATCH 128/207] PUB:20150127 Install Jetty Web Server On CentOS 7 @geekpi --- .../20150127 Install Jetty Web Server On CentOS 7.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename {translated/tech => published}/20150127 Install Jetty Web Server On CentOS 7.md (79%) diff --git a/translated/tech/20150127 Install Jetty Web Server On CentOS 7.md b/published/20150127 Install Jetty Web Server On CentOS 7.md similarity index 79% rename from translated/tech/20150127 Install Jetty Web Server On CentOS 7.md rename to published/20150127 Install Jetty Web Server On CentOS 7.md index 3cdb89ca76..3de2c7d9fb 100644 --- a/translated/tech/20150127 Install Jetty Web Server On CentOS 7.md +++ b/published/20150127 Install Jetty Web Server On CentOS 7.md @@ -1,8 +1,8 @@ 在CentOS 7中安装Jetty服务器 ================================================================================ -[Jetty][1] 是一款纯Java的HTTP **(Web) 服务器**和Java Servlet容器。 通常在更大的网络框架中，Jetty经常用于设备间的通信。但是其他Web服务器通常给人类传递文件。Jetty是一个Eclipse基金中免费开源项目。这个Web服务器用于如Apache ActiveMQ、 Alfresco、 Apache Geronimo、 Apache Maven、 Apache Spark、Google App Engine、 Eclipse、 FUSE、 Twitter的 Streaming API 和 Zimbra中。 +[Jetty][1] 是一款纯Java的HTTP **(Web) 服务器**和Java Servlet容器。 通常在更大的网络框架中，Jetty经常用于设备间的通信，而其他Web服务器通常给“人类”传递文件 :D。Jetty是一个Eclipse基金会的免费开源项目。这个Web服务器用于如Apache ActiveMQ、 Alfresco、 Apache Geronimo、 Apache Maven、 Apache Spark、Google App Engine、 Eclipse、 FUSE、 Twitter的 Streaming API 和 Zimbra中。 -这篇文章会解释‘如何在CentOS服务器中安装Jetty服务器’。 +这篇文章会介绍‘如何在CentOS服务器中安装Jetty服务器’。 **首先我们要用下面的命令安装JDK：** @@ -58,7 +58,7 @@ 完成了！ -现在你可以在 **http://:8080** 中访问了 +现在你可以在 **http://\<你的 IP 地址>:8080** 中访问了 就是这样。 @@ -70,7 +70,7 @@ via: http://www.unixmen.com/install-jetty-web-server-centos-7/ 作者：[Jijo][a] 译者：[geekpi](https://github.com/geekpi) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 3888bd0147bf3c0e18235eca2696d71c6d35c7a3 Mon Sep 17 00:00:00 2001 From: geekpi Date: Sun, 1 Feb 2015 11:40:53 +0800 Subject: [PATCH 129/207] translating --- ...To Monitor Access Point Signal Strength With wifi-linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md b/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md index d652b15d8c..e4d380aa94 100644 --- a/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md +++ b/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md @@ -1,3 +1,5 @@ +Translating----geekpi + How To Monitor Access Point Signal Strength With wifi-linux ================================================================================ As a python geek I love exploring new python tools on github that target the linux users. Today I discovered a simple application written in python programming language that can be used to monitor access point signal strength. @@ -83,4 +85,4 @@ via: http://linoxide.com/linux-how-to/monitor-access-point-signal-strength-wifi- 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[a]:http://linoxide.com/author/oltjano/ \ No newline at end of file +[a]:http://linoxide.com/author/oltjano/ From 4bba943f961bc8f6d6ceb84af662644a8aa16830 Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 1 Feb 2015 11:41:31 +0800 Subject: [PATCH 130/207] =?UTF-8?q?=E5=BD=92=E6=A1=A3=20201501?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md | 0 ...0701 Easy File Comparisons With These Great Free Diff Tools.md | 0 ...th Apple Watch Unveiled, Could an Ubuntu Smartwatch Be Next.md | 0 ...40912 What' s wrong with IPv4 and Why we are moving to IPv6.md | 0 .../20140915 10 Open Source Cloning Software For Linux Users.md | 0 .../20140926 ChromeOS vs Linux--The Good, the Bad and the Ugly.md | 0 .../20140928 What is a good subtitle editor on Linux.md | 0 .../20140929 What Linux Users Should Know About Open Hardware.md | 0 ...8 How to configure HTTP load balancer with HAProxy on Linux.md | 0 ...1009 How to convert image audio and video formats on Ubuntu.md | 0 .../20141013 How to configure peer-to-peer VPN on Linux.md | 0 ... How to turn your CentOS box into a BGP router using Quagga.md | 0 .../20141023 What are useful Bash aliases and functions.md | 0 published/{ => 201501}/20141027 ntpq -p output.md | 0 ...Open Source Backup Software For Linux and Unix-like Systems.md | 0 published/{ => 201501}/20141108 When hackers grow old.md | 0 .../20141112 How to Debug CPU Regressions Using Flame Graphs.md | 0 ...5 How to perform system backup with backup-manager on Linux.md | 0 .../20141115 What are some obscure but useful Vim commands.md | 0 ...stricting process CPU usage using nice cpulimit and cgroups.md | 0 .../20141118 How to boot on an ISO image from Grub.md | 0 ...0141119 Smartctl--Monitoring & Analysis tool for Hard drive.md | 0 ...41120 How to configure and secure your Postfix email server.md | 0 .../20141120 How to install an Opensource VPN Server on Linux.md | 0 .../20141124 Important 10 Linux ps command Practical Examples.md | 0 .../20141124 Linux blkid Command to Find Block Devices Details.md | 0 ...5 Four ways Linux is headed for no-downtime kernel patching.md | 0 ...w to install Cacti (Monitoring tool) on ubuntu 14.10 server.md | 0 .../20141127 Five Magnificent Linux Music Streaming Clients.md | 0 ...How To Create A Multiboot USB From Ubuntu Using MultiSystem.md | 0 published/{ => 201501}/20141203 Docker--Present and Future.md | 0 .../20141204 How To Delete Oracle 11g Database Manually.md | 0 ... To Run Linux Programs From The Terminal In Background Mode.md | 0 .../20141205 10 free Commands to Check Memory Usage in Linux.md | 0 ...0141205 Find Out Network Adapters Available In Ubuntu Linux.md | 0 ...5 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md | 0 ... (Java servlet engine and webserver) on Ubuntu 14.10 Server.md | 0 ...s--How to disable Apport internal error reporting on Ubuntu.md | 0 ...ants to Change OS for Radar System from Windows XP to Linux.md | 0 ...20141210 How to use Evernote from the command line on Linux.md | 0 published/{ => 201501}/20141211 NetHack.md | 0 ..., This Trojan Infects Linux. No, It' s Not The Tuxpocalypse.md | 0 ...141222 A Great Tool To Show Linux Command Progress Like ETA.md | 0 ...222 How to Sync Time Properly with NTP Server in CentOS 7.x.md | 0 .../20141224 Calife--A lightweight alternative to sudo.md | 0 ...Qs with Answers--How to check SSH protocol version on Linux.md | 0 ...41224 Linux FAQs with Answers--How to install 7zip on Linux.md | 0 ...x FAQs with Answers--How to install kernel headers on Linux.md | 0 .../20141226 The Good The Bad And The Ugly Of Linux In 2014.md | 0 ...ix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md | 0 ...0141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md | 0 published/{ => 201501}/20150104 Docker Image Insecurity.md | 0 .../20150106 2015--Open Source Has Won, But It Isn't Finished.md | 0 ...20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md | 0 ... Answers--How to boot into command line on Ubuntu or Debian.md | 0 ...0150126 Data of 20 Million Users Stolen from Dating Website.md | 0 .../How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md | 0 .../How to filter, split or merge pcap files on Linux.md | 0 published/{ => 201501}/Quick systemd-nspawn guide.md | 0 59 files changed, 0 insertions(+), 0 deletions(-) rename published/{ => 201501}/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md (100%) rename published/{ => 201501}/20140701 Easy File Comparisons With These Great Free Diff Tools.md (100%) rename published/{ => 201501}/20140910 With Apple Watch Unveiled, Could an Ubuntu Smartwatch Be Next.md (100%) rename published/{ => 201501}/20140912 What' s wrong with IPv4 and Why we are moving to IPv6.md (100%) rename published/{ => 201501}/20140915 10 Open Source Cloning Software For Linux Users.md (100%) rename published/{ => 201501}/20140926 ChromeOS vs Linux--The Good, the Bad and the Ugly.md (100%) rename published/{ => 201501}/20140928 What is a good subtitle editor on Linux.md (100%) rename published/{ => 201501}/20140929 What Linux Users Should Know About Open Hardware.md (100%) rename published/{ => 201501}/20141008 How to configure HTTP load balancer with HAProxy on Linux.md (100%) rename published/{ => 201501}/20141009 How to convert image audio and video formats on Ubuntu.md (100%) rename published/{ => 201501}/20141013 How to configure peer-to-peer VPN on Linux.md (100%) rename published/{ => 201501}/20141023 How to turn your CentOS box into a BGP router using Quagga.md (100%) rename published/{ => 201501}/20141023 What are useful Bash aliases and functions.md (100%) rename published/{ => 201501}/20141027 ntpq -p output.md (100%) rename published/{ => 201501}/20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems.md (100%) rename published/{ => 201501}/20141108 When hackers grow old.md (100%) rename published/{ => 201501}/20141112 How to Debug CPU Regressions Using Flame Graphs.md (100%) rename published/{ => 201501}/20141115 How to perform system backup with backup-manager on Linux.md (100%) rename published/{ => 201501}/20141115 What are some obscure but useful Vim commands.md (100%) rename published/{ => 201501}/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md (100%) rename published/{ => 201501}/20141118 How to boot on an ISO image from Grub.md (100%) rename published/{ => 201501}/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md (100%) rename published/{ => 201501}/20141120 How to configure and secure your Postfix email server.md (100%) rename published/{ => 201501}/20141120 How to install an Opensource VPN Server on Linux.md (100%) rename published/{ => 201501}/20141124 Important 10 Linux ps command Practical Examples.md (100%) rename published/{ => 201501}/20141124 Linux blkid Command to Find Block Devices Details.md (100%) rename published/{ => 201501}/20141125 Four ways Linux is headed for no-downtime kernel patching.md (100%) rename published/{ => 201501}/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md (100%) rename published/{ => 201501}/20141127 Five Magnificent Linux Music Streaming Clients.md (100%) rename published/{ => 201501}/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md (100%) rename published/{ => 201501}/20141203 Docker--Present and Future.md (100%) rename published/{ => 201501}/20141204 How To Delete Oracle 11g Database Manually.md (100%) rename published/{ => 201501}/20141204 How To Run Linux Programs From The Terminal In Background Mode.md (100%) rename published/{ => 201501}/20141205 10 free Commands to Check Memory Usage in Linux.md (100%) rename published/{ => 201501}/20141205 Find Out Network Adapters Available In Ubuntu Linux.md (100%) rename published/{ => 201501}/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md (100%) rename published/{ => 201501}/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md (100%) rename published/{ => 201501}/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md (100%) rename published/{ => 201501}/20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md (100%) rename published/{ => 201501}/20141210 How to use Evernote from the command line on Linux.md (100%) rename published/{ => 201501}/20141211 NetHack.md (100%) rename published/{ => 201501}/20141211 Yes, This Trojan Infects Linux. No, It' s Not The Tuxpocalypse.md (100%) rename published/{ => 201501}/20141222 A Great Tool To Show Linux Command Progress Like ETA.md (100%) rename published/{ => 201501}/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md (100%) rename published/{ => 201501}/20141224 Calife--A lightweight alternative to sudo.md (100%) rename published/{ => 201501}/20141224 Linux FAQs with Answers--How to check SSH protocol version on Linux.md (100%) rename published/{ => 201501}/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md (100%) rename published/{ => 201501}/20141224 Linux FAQs with Answers--How to install kernel headers on Linux.md (100%) rename published/{ => 201501}/20141226 The Good The Bad And The Ugly Of Linux In 2014.md (100%) rename published/{ => 201501}/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md (100%) rename published/{ => 201501}/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md (100%) rename published/{ => 201501}/20150104 Docker Image Insecurity.md (100%) rename published/{ => 201501}/20150106 2015--Open Source Has Won, But It Isn't Finished.md (100%) rename published/{ => 201501}/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md (100%) rename published/{ => 201501}/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md (100%) rename published/{ => 201501}/20150126 Data of 20 Million Users Stolen from Dating Website.md (100%) rename published/{ => 201501}/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md (100%) rename published/{ => 201501}/How to filter, split or merge pcap files on Linux.md (100%) rename published/{ => 201501}/Quick systemd-nspawn guide.md (100%) diff --git a/published/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md b/published/201501/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md similarity index 100% rename from published/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md rename to published/201501/20100105 How to Backup and Restore Your Apps and PPAs in Ubuntu Using Aptik.md diff --git a/published/20140701 Easy File Comparisons With These Great Free Diff Tools.md b/published/201501/20140701 Easy File Comparisons With These Great Free Diff Tools.md similarity index 100% rename from published/20140701 Easy File Comparisons With These Great Free Diff Tools.md rename to published/201501/20140701 Easy File Comparisons With These Great Free Diff Tools.md diff --git a/published/20140910 With Apple Watch Unveiled, Could an Ubuntu Smartwatch Be Next.md b/published/201501/20140910 With Apple Watch Unveiled, Could an Ubuntu Smartwatch Be Next.md similarity index 100% rename from published/20140910 With Apple Watch Unveiled, Could an Ubuntu Smartwatch Be Next.md rename to published/201501/20140910 With Apple Watch Unveiled, Could an Ubuntu Smartwatch Be Next.md diff --git a/published/20140912 What' s wrong with IPv4 and Why we are moving to IPv6.md b/published/201501/20140912 What' s wrong with IPv4 and Why we are moving to IPv6.md similarity index 100% rename from published/20140912 What' s wrong with IPv4 and Why we are moving to IPv6.md rename to published/201501/20140912 What' s wrong with IPv4 and Why we are moving to IPv6.md diff --git a/published/20140915 10 Open Source Cloning Software For Linux Users.md b/published/201501/20140915 10 Open Source Cloning Software For Linux Users.md similarity index 100% rename from published/20140915 10 Open Source Cloning Software For Linux Users.md rename to published/201501/20140915 10 Open Source Cloning Software For Linux Users.md diff --git a/published/20140926 ChromeOS vs Linux--The Good, the Bad and the Ugly.md b/published/201501/20140926 ChromeOS vs Linux--The Good, the Bad and the Ugly.md similarity index 100% rename from published/20140926 ChromeOS vs Linux--The Good, the Bad and the Ugly.md rename to published/201501/20140926 ChromeOS vs Linux--The Good, the Bad and the Ugly.md diff --git a/published/20140928 What is a good subtitle editor on Linux.md b/published/201501/20140928 What is a good subtitle editor on Linux.md similarity index 100% rename from published/20140928 What is a good subtitle editor on Linux.md rename to published/201501/20140928 What is a good subtitle editor on Linux.md diff --git a/published/20140929 What Linux Users Should Know About Open Hardware.md b/published/201501/20140929 What Linux Users Should Know About Open Hardware.md similarity index 100% rename from published/20140929 What Linux Users Should Know About Open Hardware.md rename to published/201501/20140929 What Linux Users Should Know About Open Hardware.md diff --git a/published/20141008 How to configure HTTP load balancer with HAProxy on Linux.md b/published/201501/20141008 How to configure HTTP load balancer with HAProxy on Linux.md similarity index 100% rename from published/20141008 How to configure HTTP load balancer with HAProxy on Linux.md rename to published/201501/20141008 How to configure HTTP load balancer with HAProxy on Linux.md diff --git a/published/20141009 How to convert image audio and video formats on Ubuntu.md b/published/201501/20141009 How to convert image audio and video formats on Ubuntu.md similarity index 100% rename from published/20141009 How to convert image audio and video formats on Ubuntu.md rename to published/201501/20141009 How to convert image audio and video formats on Ubuntu.md diff --git a/published/20141013 How to configure peer-to-peer VPN on Linux.md b/published/201501/20141013 How to configure peer-to-peer VPN on Linux.md similarity index 100% rename from published/20141013 How to configure peer-to-peer VPN on Linux.md rename to published/201501/20141013 How to configure peer-to-peer VPN on Linux.md diff --git a/published/20141023 How to turn your CentOS box into a BGP router using Quagga.md b/published/201501/20141023 How to turn your CentOS box into a BGP router using Quagga.md similarity index 100% rename from published/20141023 How to turn your CentOS box into a BGP router using Quagga.md rename to published/201501/20141023 How to turn your CentOS box into a BGP router using Quagga.md diff --git a/published/20141023 What are useful Bash aliases and functions.md b/published/201501/20141023 What are useful Bash aliases and functions.md similarity index 100% rename from published/20141023 What are useful Bash aliases and functions.md rename to published/201501/20141023 What are useful Bash aliases and functions.md diff --git a/published/20141027 ntpq -p output.md b/published/201501/20141027 ntpq -p output.md similarity index 100% rename from published/20141027 ntpq -p output.md rename to published/201501/20141027 ntpq -p output.md diff --git a/published/20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems.md b/published/201501/20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems.md similarity index 100% rename from published/20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems.md rename to published/201501/20141106 5 Awesome Open Source Backup Software For Linux and Unix-like Systems.md diff --git a/published/20141108 When hackers grow old.md b/published/201501/20141108 When hackers grow old.md similarity index 100% rename from published/20141108 When hackers grow old.md rename to published/201501/20141108 When hackers grow old.md diff --git a/published/20141112 How to Debug CPU Regressions Using Flame Graphs.md b/published/201501/20141112 How to Debug CPU Regressions Using Flame Graphs.md similarity index 100% rename from published/20141112 How to Debug CPU Regressions Using Flame Graphs.md rename to published/201501/20141112 How to Debug CPU Regressions Using Flame Graphs.md diff --git a/published/20141115 How to perform system backup with backup-manager on Linux.md b/published/201501/20141115 How to perform system backup with backup-manager on Linux.md similarity index 100% rename from published/20141115 How to perform system backup with backup-manager on Linux.md rename to published/201501/20141115 How to perform system backup with backup-manager on Linux.md diff --git a/published/20141115 What are some obscure but useful Vim commands.md b/published/201501/20141115 What are some obscure but useful Vim commands.md similarity index 100% rename from published/20141115 What are some obscure but useful Vim commands.md rename to published/201501/20141115 What are some obscure but useful Vim commands.md diff --git a/published/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md b/published/201501/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md similarity index 100% rename from published/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md rename to published/201501/20141117 Restricting process CPU usage using nice cpulimit and cgroups.md diff --git a/published/20141118 How to boot on an ISO image from Grub.md b/published/201501/20141118 How to boot on an ISO image from Grub.md similarity index 100% rename from published/20141118 How to boot on an ISO image from Grub.md rename to published/201501/20141118 How to boot on an ISO image from Grub.md diff --git a/published/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md b/published/201501/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md similarity index 100% rename from published/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md rename to published/201501/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md diff --git a/published/20141120 How to configure and secure your Postfix email server.md b/published/201501/20141120 How to configure and secure your Postfix email server.md similarity index 100% rename from published/20141120 How to configure and secure your Postfix email server.md rename to published/201501/20141120 How to configure and secure your Postfix email server.md diff --git a/published/20141120 How to install an Opensource VPN Server on Linux.md b/published/201501/20141120 How to install an Opensource VPN Server on Linux.md similarity index 100% rename from published/20141120 How to install an Opensource VPN Server on Linux.md rename to published/201501/20141120 How to install an Opensource VPN Server on Linux.md diff --git a/published/20141124 Important 10 Linux ps command Practical Examples.md b/published/201501/20141124 Important 10 Linux ps command Practical Examples.md similarity index 100% rename from published/20141124 Important 10 Linux ps command Practical Examples.md rename to published/201501/20141124 Important 10 Linux ps command Practical Examples.md diff --git a/published/20141124 Linux blkid Command to Find Block Devices Details.md b/published/201501/20141124 Linux blkid Command to Find Block Devices Details.md similarity index 100% rename from published/20141124 Linux blkid Command to Find Block Devices Details.md rename to published/201501/20141124 Linux blkid Command to Find Block Devices Details.md diff --git a/published/20141125 Four ways Linux is headed for no-downtime kernel patching.md b/published/201501/20141125 Four ways Linux is headed for no-downtime kernel patching.md similarity index 100% rename from published/20141125 Four ways Linux is headed for no-downtime kernel patching.md rename to published/201501/20141125 Four ways Linux is headed for no-downtime kernel patching.md diff --git a/published/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md b/published/201501/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md similarity index 100% rename from published/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md rename to published/201501/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md diff --git a/published/20141127 Five Magnificent Linux Music Streaming Clients.md b/published/201501/20141127 Five Magnificent Linux Music Streaming Clients.md similarity index 100% rename from published/20141127 Five Magnificent Linux Music Streaming Clients.md rename to published/201501/20141127 Five Magnificent Linux Music Streaming Clients.md diff --git a/published/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md b/published/201501/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md similarity index 100% rename from published/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md rename to published/201501/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md diff --git a/published/20141203 Docker--Present and Future.md b/published/201501/20141203 Docker--Present and Future.md similarity index 100% rename from published/20141203 Docker--Present and Future.md rename to published/201501/20141203 Docker--Present and Future.md diff --git a/published/20141204 How To Delete Oracle 11g Database Manually.md b/published/201501/20141204 How To Delete Oracle 11g Database Manually.md similarity index 100% rename from published/20141204 How To Delete Oracle 11g Database Manually.md rename to published/201501/20141204 How To Delete Oracle 11g Database Manually.md diff --git a/published/20141204 How To Run Linux Programs From The Terminal In Background Mode.md b/published/201501/20141204 How To Run Linux Programs From The Terminal In Background Mode.md similarity index 100% rename from published/20141204 How To Run Linux Programs From The Terminal In Background Mode.md rename to published/201501/20141204 How To Run Linux Programs From The Terminal In Background Mode.md diff --git a/published/20141205 10 free Commands to Check Memory Usage in Linux.md b/published/201501/20141205 10 free Commands to Check Memory Usage in Linux.md similarity index 100% rename from published/20141205 10 free Commands to Check Memory Usage in Linux.md rename to published/201501/20141205 10 free Commands to Check Memory Usage in Linux.md diff --git a/published/20141205 Find Out Network Adapters Available In Ubuntu Linux.md b/published/201501/20141205 Find Out Network Adapters Available In Ubuntu Linux.md similarity index 100% rename from published/20141205 Find Out Network Adapters Available In Ubuntu Linux.md rename to published/201501/20141205 Find Out Network Adapters Available In Ubuntu Linux.md diff --git a/published/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md b/published/201501/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md similarity index 100% rename from published/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md rename to published/201501/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md diff --git a/published/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md b/published/201501/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md similarity index 100% rename from published/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md rename to published/201501/20141208 Install Jetty 9 (Java servlet engine and webserver) on Ubuntu 14.10 Server.md diff --git a/published/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md b/published/201501/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md similarity index 100% rename from published/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md rename to published/201501/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md diff --git a/published/20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md b/published/201501/20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md similarity index 100% rename from published/20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md rename to published/201501/20141208 U.S. Marine Corps Wants to Change OS for Radar System from Windows XP to Linux.md diff --git a/published/20141210 How to use Evernote from the command line on Linux.md b/published/201501/20141210 How to use Evernote from the command line on Linux.md similarity index 100% rename from published/20141210 How to use Evernote from the command line on Linux.md rename to published/201501/20141210 How to use Evernote from the command line on Linux.md diff --git a/published/20141211 NetHack.md b/published/201501/20141211 NetHack.md similarity index 100% rename from published/20141211 NetHack.md rename to published/201501/20141211 NetHack.md diff --git a/published/20141211 Yes, This Trojan Infects Linux. No, It' s Not The Tuxpocalypse.md b/published/201501/20141211 Yes, This Trojan Infects Linux. No, It' s Not The Tuxpocalypse.md similarity index 100% rename from published/20141211 Yes, This Trojan Infects Linux. No, It' s Not The Tuxpocalypse.md rename to published/201501/20141211 Yes, This Trojan Infects Linux. No, It' s Not The Tuxpocalypse.md diff --git a/published/20141222 A Great Tool To Show Linux Command Progress Like ETA.md b/published/201501/20141222 A Great Tool To Show Linux Command Progress Like ETA.md similarity index 100% rename from published/20141222 A Great Tool To Show Linux Command Progress Like ETA.md rename to published/201501/20141222 A Great Tool To Show Linux Command Progress Like ETA.md diff --git a/published/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md b/published/201501/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md similarity index 100% rename from published/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md rename to published/201501/20141222 How to Sync Time Properly with NTP Server in CentOS 7.x.md diff --git a/published/20141224 Calife--A lightweight alternative to sudo.md b/published/201501/20141224 Calife--A lightweight alternative to sudo.md similarity index 100% rename from published/20141224 Calife--A lightweight alternative to sudo.md rename to published/201501/20141224 Calife--A lightweight alternative to sudo.md diff --git a/published/20141224 Linux FAQs with Answers--How to check SSH protocol version on Linux.md b/published/201501/20141224 Linux FAQs with Answers--How to check SSH protocol version on Linux.md similarity index 100% rename from published/20141224 Linux FAQs with Answers--How to check SSH protocol version on Linux.md rename to published/201501/20141224 Linux FAQs with Answers--How to check SSH protocol version on Linux.md diff --git a/published/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md b/published/201501/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md similarity index 100% rename from published/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md rename to published/201501/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md diff --git a/published/20141224 Linux FAQs with Answers--How to install kernel headers on Linux.md b/published/201501/20141224 Linux FAQs with Answers--How to install kernel headers on Linux.md similarity index 100% rename from published/20141224 Linux FAQs with Answers--How to install kernel headers on Linux.md rename to published/201501/20141224 Linux FAQs with Answers--How to install kernel headers on Linux.md diff --git a/published/20141226 The Good The Bad And The Ugly Of Linux In 2014.md b/published/201501/20141226 The Good The Bad And The Ugly Of Linux In 2014.md similarity index 100% rename from published/20141226 The Good The Bad And The Ugly Of Linux In 2014.md rename to published/201501/20141226 The Good The Bad And The Ugly Of Linux In 2014.md diff --git a/published/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md b/published/201501/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md similarity index 100% rename from published/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md rename to published/201501/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md diff --git a/published/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md b/published/201501/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md similarity index 100% rename from published/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md rename to published/201501/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md diff --git a/published/20150104 Docker Image Insecurity.md b/published/201501/20150104 Docker Image Insecurity.md similarity index 100% rename from published/20150104 Docker Image Insecurity.md rename to published/201501/20150104 Docker Image Insecurity.md diff --git a/published/20150106 2015--Open Source Has Won, But It Isn't Finished.md b/published/201501/20150106 2015--Open Source Has Won, But It Isn't Finished.md similarity index 100% rename from published/20150106 2015--Open Source Has Won, But It Isn't Finished.md rename to published/201501/20150106 2015--Open Source Has Won, But It Isn't Finished.md diff --git a/published/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md b/published/201501/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md similarity index 100% rename from published/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md rename to published/201501/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md diff --git a/published/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md b/published/201501/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md similarity index 100% rename from published/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md rename to published/201501/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md diff --git a/published/20150126 Data of 20 Million Users Stolen from Dating Website.md b/published/201501/20150126 Data of 20 Million Users Stolen from Dating Website.md similarity index 100% rename from published/20150126 Data of 20 Million Users Stolen from Dating Website.md rename to published/201501/20150126 Data of 20 Million Users Stolen from Dating Website.md diff --git a/published/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md b/published/201501/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md similarity index 100% rename from published/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md rename to published/201501/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md diff --git a/published/How to filter, split or merge pcap files on Linux.md b/published/201501/How to filter, split or merge pcap files on Linux.md similarity index 100% rename from published/How to filter, split or merge pcap files on Linux.md rename to published/201501/How to filter, split or merge pcap files on Linux.md diff --git a/published/Quick systemd-nspawn guide.md b/published/201501/Quick systemd-nspawn guide.md similarity index 100% rename from published/Quick systemd-nspawn guide.md rename to published/201501/Quick systemd-nspawn guide.md From 2d7384b45d476540935fe38eef4589a75badf0c8 Mon Sep 17 00:00:00 2001 From: geekpi Date: Sun, 1 Feb 2015 12:35:53 +0800 Subject: [PATCH 131/207] translated --- ...s Point Signal Strength With wifi-linux.md | 88 ------------------- ...s Point Signal Strength With wifi-linux.md | 86 ++++++++++++++++++ 2 files changed, 86 insertions(+), 88 deletions(-) delete mode 100644 sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md create mode 100644 translated/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md diff --git a/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md b/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md deleted file mode 100644 index e4d380aa94..0000000000 --- a/sources/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md +++ /dev/null @@ -1,88 +0,0 @@ -Translating----geekpi - -How To Monitor Access Point Signal Strength With wifi-linux -================================================================================ -As a python geek I love exploring new python tools on github that target the linux users. Today I discovered a simple application written in python programming language that can be used to monitor access point signal strength. - -I have been experimenting for about two hours with **wifi-linux** and it works great but I would like to see some unittests in the near future from the author as the command **plot** is not working on my machine and is also causing some errors. - -### What is wifi-linux ### - -According to the official readme.md file on author's github account wifi-linux is a very simple python script which collects RSSI information about wifi access points around you and draws graphics showing RSSI activity. - -The author states that the program also draws RSSI activity graphic and this can be generated with the command plot but unfortunetly it is not working for me. wifi-linux supports other commands such as **bp** to add a breakpoint, **print** to print some statistics and **start changer**. - -The wifi-linux application has the folowing dependencies: - -- dbus-python -- gnuplot-py - -So first we have to install all the package dependencies for our project in order to run it in our linux machine. - -### Install pakages required by wifi-linux ### - -I tried to install python-dbus by using the pip tool which is used to manage python packages but it did not work and the reason for this is that pip looks for setup.py, which dbus-python doesn't have. So the following command is not going to work. - - pip install dbus-python - -And to make sure it does not work give it a try. It is a very high probability that you will get the following error displayed on your console. - - IOError: [Errno 2] No such file or directory: '/tmp/pip_build_oltjano/dbus-python/setup.py' - -How did I manage to solve this problem? It is very simple. I installed the the system package for the Python DBUS bindings using the following command. - - sudo apt-get install python-dbus - -The above command will work only in machines that make use of the apt-get package manager such as Debian and Ubuntu. - -Then the second dependency we have to take care is the gnuplot-py. Download it, extract using the tar utility and then run setup.py install to install the python package. - -First step is to download gnuplot-py. - - wget http://prdownloads.sourceforge.net/gnuplot-py/gnuplot-py-1.8.tar.gz - -Then use the tar utility to extract it. - - tar xvf gnuplot-py-1.8.tar.gz - -Then use the cd command to change directory. - - cd gnuplot-py-1.8 - -Once there then run the following command to install the package gunplot-py on your system. - - sudo setup.py install - -Once the installation is finished you are ready to run the wifi-linux on your machine. Just download it and use the following command to run the script. - -Download wifi-linux on your local machine by using the following command. - - wget https://github.com/dixel/wifi-linux/archive/master.zip - -Extract the master.zip archive and then use the following command to run the python script list_rsssi.py - - python list_rssi.py - -The following screenshot shows wifi-linux in action. - -![wifi-linux to monitor wifi signal strength](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux.png) - -Then the command **bp** is executed to add a breakpoint like shown below. - -![the bp command in wifi-linux](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux2.png) - -The command **print** can be used to display stats on the console of your machine. An example of its usage is shown below. - -![the print command](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux3.png) - --------------------------------------------------------------------------------- - -via: http://linoxide.com/linux-how-to/monitor-access-point-signal-strength-wifi-linux/ - -作者：[Oltjano Terpollari][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linoxide.com/author/oltjano/ diff --git a/translated/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md b/translated/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md new file mode 100644 index 0000000000..db2ae3c05a --- /dev/null +++ b/translated/tech/20150128 How To Monitor Access Point Signal Strength With wifi-linux.md @@ -0,0 +1,86 @@ +如何用wifi-linux检测AP信号强度 +================================================================================ +作为一名python极客，我喜欢在github上发现新的针对linux用户的python工具。今天我发现了一款用python写成的用于检测AP信号强度的工具。 + +我已经在**wifi-linux**上实验了大约两个小时，并且它工作的很好但是我希望在不久的将来在作者那里看到一些单元测试，因为命令**plot**无法在我的电脑上工作，并且会导致一些问题。 + +### 什么是wifi-linux ### + +根据github作者账号的官方的offical readme.md文件， wifi-linux是一个简单的收集你周围AP的RSSI信息的python脚本，它还会画出RSSI活动图形。 + +，这同样可以用命令plot生成，但是不幸的是，这对我不可行。wifi-linux支持其他的命令，比如**bp** 来加入一个断点，**print**会打印一些统计和**启动开关**。 + +wifi-linux程序有下面这些依赖： + +- dbus-python +- gnuplot-py + +首先我们需要安装所有的包依赖以使它可以运行在我们的linux机器上。 + +### 安装wifi-linux需要的包 ### + +我怕尝试使用python包管理工具pip安装python-dbus但是失败了，因为pip会查找setup.py，但是python-dbus中没有。因此下面的命令不工作。 + + pip install dbus-python + +你可以试一下但是很有可能会在终端中下面的错误。 + + IOError: [Errno 2] No such file or directory: '/tmp/pip_build_oltjano/dbus-python/setup.py' + +我该怎么解决这个问题呢？很简单，用下面命令中的系统包管理工具安装Python DBUS。 + + sudo apt-get install python-dbus + +上面的命令只有在有apt-get包管理器的机器中才可以使用，比如Debian和Ubuntu。 + +我们要安装的第二个依赖是gnuplot-py。下载并用tar解压，接着运行setup.py来安装包。 + +第一步是下载gnuplot-py。 + + wget http://prdownloads.sourceforge.net/gnuplot-py/gnuplot-py-1.8.tar.gz + +接着使用tar工具解压。 + + tar xvf gnuplot-py-1.8.tar.gz + +接着使用cd命令改变目录。 + + cd gnuplot-py-1.8 + +接着运行下面的命令在你的系统中安装gnuplot-py。 + + sudo setup.py install + +安装完成后，你就可以在你的系统中运行wifi-linux了。只需下载并用下面的命令运行脚本。 + +用下面的命令下载wifi-linux到你的机器中。 + + wget https://github.com/dixel/wifi-linux/archive/master.zip + +解压master.zip接着使用下面的命令运行list_rsssi.py脚本。 + + python list_rssi.py + +下面的截图说明wifi-linux在工作了。 + +![wifi-linux to monitor wifi signal strength](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux.png) + +命令**bp**用于像下面那样添加一个断点。 + +![the bp command in wifi-linux](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux2.png) + +命令**print**可以用于显示你机器的状态。下面就是一个例子。 + +![the print command](http://blog.linoxide.com/wp-content/uploads/2015/01/wifi-linux3.png) + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-how-to/monitor-access-point-signal-strength-wifi-linux/ + +作者：[Oltjano Terpollari][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/oltjano/ From 7dafdee8905fb84bbfbccfe92df3e83a5c6952c0 Mon Sep 17 00:00:00 2001 From: Frank Zhang Date: Sun, 1 Feb 2015 16:55:55 +0800 Subject: [PATCH 132/207] [translated] 20141030 Test drive Linux with nothing but a flash drive.md --- ...ve Linux with nothing but a flash drive.md | 76 ------------------- ...ve Linux with nothing but a flash drive.md | 75 ++++++++++++++++++ 2 files changed, 75 insertions(+), 76 deletions(-) delete mode 100644 sources/tech/20141030 Test drive Linux with nothing but a flash drive.md create mode 100644 translated/tech/20141030 Test drive Linux with nothing but a flash drive.md diff --git a/sources/tech/20141030 Test drive Linux with nothing but a flash drive.md b/sources/tech/20141030 Test drive Linux with nothing but a flash drive.md deleted file mode 100644 index 7b5c5511c8..0000000000 --- a/sources/tech/20141030 Test drive Linux with nothing but a flash drive.md +++ /dev/null @@ -1,76 +0,0 @@ -zpl1025 -Test drive Linux with nothing but a flash drive -================================================================================ -![Penguins gathered together: Linux for the win](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/OSDC_Penguin_Image_520x292_12324207_0714_mm_v1a.png) -Image by : Opensource.com - -Maybe you’ve heard about Linux and are intrigued by it. So intrigued that you want to give it a try. But you might not know where to begin. - -You’ve probably done a bit of research online and have run across terms like dual booting and virtualization. Those terms might mean nothing to you, and you’re definitely not ready to sacrifice the operating system that you’re currently using to give Linux a try. So what can you do? - -If you have a USB flash drive lying around, you can test drive Linux by creating a live USB. It’s a USB flash drive that contains an operating system that can start from the flash drive. It doesn’t take much technical ability to create one. Let’s take a look at how to do that and how to run Linux using a live USB. - -### What you’ll need ### - -Aside from a desktop or laptop computer, you’ll need: - -- A blank USB flash drive—preferably one that has a capacity of 4 GB or more. -- An [ISO image][1] (an archive of the contents of a hard disk) of the Linux distribution that you want to try. More about this in a moment. -- An application called [Unetbootin][2], an open source tool, cross platform tool that creates a live USB. You don’t need to be running Linux to use it. In the instructions that below, I’m running Unetbootin on a MacBook. - -### Getting to work ### - -Plug your flash drive into a USB port on your computer and then fire up Unetbootin. You’ll be asked for the password that you use to log into your computer. - -![Unetbootin main window](http://opensource.com/sites/default/files/images/life-uploads/unetbootin-main.png) - -Remember the ISO image that was mentioned a few moments ago? There are two ways you can get one: either by downloading it from the website of the Linux distribution that you want to try, or by having Unetbootin download it for you. To do that latter, click **Select Distribution** at the top of the window, choose the distribution that you want to download, and then click **Select Version** to select the version of the distribution that you want to try. - -![Downloading a Linux distribution](http://opensource.com/sites/default/files/images/life-uploads/unetbootin-download-distro.png) - -Or, you can download the distribution yourself. Usually, the Linux distributions that I want to try aren’t in the list. If you go the second route, click **Disk image** and then click the button to search for the .iso file that you downloaded. - -Notice the **Space used to preserve files across reboots (Ubuntu only)** option? If you’re testing Ubuntu or one of its derivatives (like Lubuntu or Xubuntu), you can set aside a few megabytes of space on your flash drive to save files like web browser bookmarks or documents that you create. When you load Ubuntu from the flash drive again, you can reuse those files. - -![Ready to create a live USB](http://opensource.com/sites/default/files/images/life-uploads/unetbootin-ready-to-go.png) - -Once the ISO image is loaded, click **OK**. It takes anywhere from a couple of minutes to 10 minutes for Unetbootin to create the live USB. - -![Creating the live USB](http://opensource.com/sites/default/files/images/life-uploads/unetbootin-creating-disk.png) - -### Testing out the live USB ### - -This is the point where you have to embrace your inner geek a bit. Not too much, but you will be taking a peek into the innards of your computer by going into the [BIOS][3]. Your computer’s BIOS starts various bits of hardware and controls where the computer’s operating system starts, or boots, from. - -The BIOS usually looks for the operating system in this order (or something like it): hard drive, then CD-ROM or DVD drive, and then an external drive. You’ll want to change that order so that the external drive (in this case, your live USB) is the one that the BIOS checks first. - -To do that, restart your computer with the flash drive plugged into a USB port. When you see the message **Press F2 to enter setup**, do just that. On some computers, the key might be F10. - -In the BIOS, use the right arrow key on your keyboard to navigate to the **Boot** menu. You’ll see a list of drives on your computer. Use the down arrow key on your keyboard to navigate to the item labeled **USB HDD** and then press **F6** to move that item to the top of the list. - -Once you’ve done that, press **F10** to save the changes. You’ll be kicked out of the BIOS and your computer will start up. After a short amount of time, you’ll be presented with a menu listing the options for starting the Linux distribution you’re trying out. Select **Run without installing** (or the menu item closest to it). - -Once the desktop loads, you can connect to a wireless or wired network, browse the web, and give the pre-installed software a whirl. You can also check to see if, for example, your printer or scanner works with the Linux distribution you’re testing. If you really, really want to you can also fiddle at the command line. - -### What to expect ### - -Depending on the Linux distribution you’re testing and the speed of the flash drive you’re using, the operating system might take longer to load and it might run a bit slower than it would if it was installed on your hard drive. - -As well, you’ll only have the basic software that the Linux distribution packs out of the box. You generally get a web browser, a word processor, a text editor, a media player, an image viewer, and a set of utilities. That should be enough to give you a feel for what it’s like to use Linux. - -If you decide that you like using Linux, you can install it from the flash drive by double clicking on the installer. - --------------------------------------------------------------------------------- - -via: https://opensource.com/life/14/10/test-drive-linux-nothing-flash-drive - -作者：[Scott Nesbitt][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:https://opensource.com/users/scottnesbitt -[1]:http://en.wikipedia.org/wiki/ISO_image -[2]:http://unetbootin.sourceforge.net/ -[3]:http://en.wikipedia.org/wiki/BIOS diff --git a/translated/tech/20141030 Test drive Linux with nothing but a flash drive.md b/translated/tech/20141030 Test drive Linux with nothing but a flash drive.md new file mode 100644 index 0000000000..9c1c8684d6 --- /dev/null +++ b/translated/tech/20141030 Test drive Linux with nothing but a flash drive.md @@ -0,0 +1,75 @@ +试试只用U盘加载Linux系统 +================================================================================ +![Penguins gathered together: Linux for the win](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/OSDC_Penguin_Image_520x292_12324207_0714_mm_v1a.png) +图片来源：Opensource.com + +也许你听过Linux并对它有点好奇，终于想要实际体验一下，但可能不知道从哪儿开始。 + +很可能你已经在网上搜索过一些信息，然后遇到一些像双系统和虚拟机这样的词汇。它们对你来说也许太专业了，所以你肯定不会仅仅为了尝试一下Linux而牺牲正在使用的操作系统。那我们该怎么办？ + +如果你手上正好有个U盘的话，那就可以试试做一个USB Linux启动盘。它是一个包含了整个操作系统并可以直接引导开机的U盘。创建它并不需要什么专业技术能力，让我们来看看怎么做，以及如何从USB引导进入Linux系统。 + +### 你需要准备的 ### + +除了一台台式机或笔记本电脑外，你还需要： + +- 一个空白的U盘-最好容量能有4GB或更多。 +- 一个你想尝试的Linux发行版[ISO镜像][1]（一种把所有磁盘内容打包起来的档案文件）。待会再详细介绍。 +- 一个叫[Unetbootin][2]的应用程序，它是一个开源的，跨平台的工具，用来创建USB启动盘。运行它并不需要启动Linux。在下面的教程中，我是在MacBook上运行的Unetbootiin。 + +### 开始干活 ### + +把U盘插到你电脑的USB端口上，然后启动Unetbootin。然后会要求你输入电脑的登录密码。 + +![Unetbootin main window](http://opensource.com/sites/default/files/images/life-uploads/unetbootin-main.png) + +还记得之前提到的ISO镜像文件吗？有两种方式可以获得：要么自己从你想尝试的Linux发行版网站上下载，或者让Unetbootin帮你下载。还是选后者，在窗口顶部点击**选择发行版**，选择你想下载的发行版，然后点击**选择版本**来选择你希望尝试的发行版版本。 + +![Downloading a Linux distribution](http://opensource.com/sites/default/files/images/life-uploads/unetbootin-download-distro.png) + +或者，你也可以自己下载发行版。通常，我想尝试的Linux发行版都没有在列表中。如果选择另一个方向，点击**磁盘镜像**，然后点击按钮来选择你下载好的.iso文件。 + +注意到下面的选项**预留每次重新启动后保存文件的空间（仅Ubuntu有效）**吗？如果你尝试的是Ubuntu或它的任一个衍生版（比如Lubuntu或Xubuntu），你可以在U盘上留出几M空间用来保存文件，比如网页书签或你自己创建的文档。当用这个U盘下次启动Ubuntu的时候，你可以继续使用这些文件。 + +![Ready to create a live USB](http://opensource.com/sites/default/files/images/life-uploads/unetbootin-ready-to-go.png) + +在加载好ISO镜像后，点击**确定**。Unetbootin大概需要不到10分钟来创建USB启动盘。 + +![Creating the live USB](http://opensource.com/sites/default/files/images/life-uploads/unetbootin-creating-disk.png) + +### 检验USB启动盘 ### + +这个时候，你需要拥抱一下自己内在的极客精神。不会太难，不过你将需要进入[BIOS][3]去偷看一下你电脑内部空间。你的电脑的BIOS会加载各种硬件，并控制电脑操作系统的引导或启动。 + +BIOS通常会按这个顺序搜索操作系统（或者类似的顺序）：硬盘，然后是CD/DVD光驱，然后是外部存储设备。你需要调整这个顺序，让外部存储设备（在这里，意味着你的U盘启动盘）成为BIOS第一个搜索的设备。 + +要做到这个，把U盘插到电脑上再重启电脑。在看到提示信息**Press F2 to enter setup**之后，按它要求的做。在有的电脑上，这个键可能是F10。 + +在BIOS里，用键盘上的向右方向键切换到**Boot**菜单。然后你将看到你电脑上的驱动器列表。使用键盘上的向下方向键选中名字为**USB HDD**的选项，然后按下**F6**移动这个选项到列表的顶部。 + +完成后，按下**F10**来保存改动。然后你会从BIOS里被踢出来，然后电脑会自己启动。等一小会，你就会看到一个你正在尝试的Linux发行版的启动菜单。选择**Run without installing**（或者最接近的选项）。 + +在进入桌面后，你可以连接上无线或有线网络，看看网页，试一试预装的软件。你还可以看看，比如说，你的打印机或扫描仪是否能在你试的这个发行版下正常工作。你要是真的想不开，也可以去摸一下命令行。 + +### 能干什么 ### + +根据你尝试的Linux发行版和你使用的U盘的速度，操作系统可能会需要更长的时间来加载，而且很可能比直接装到硬盘上会慢一点。 + +还有，你也只能运行Linux发行版里预装好的基本软件。通常会有网页浏览器，一个文字处理软件，一个文本编辑器，一个媒体播放器，一个相片浏览器，以及一套实用工具。这些应该足够给你使用Linux的感觉了。 + +如果你决定使用Linux，你可以双击安装器从U盘安装到硬盘。 + +-------------------------------------------------------------------------------- + +via: https://opensource.com/life/14/10/test-drive-linux-nothing-flash-drive + +作者：[Scott Nesbitt][a] +译者：[zpl1025](https://github.com/zpl1025) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:https://opensource.com/users/scottnesbitt +[1]:http://en.wikipedia.org/wiki/ISO_image +[2]:http://unetbootin.sourceforge.net/ +[3]:http://en.wikipedia.org/wiki/BIOS From 7ed53ce0e4c294af1cac5143503c62f38d9d37d2 Mon Sep 17 00:00:00 2001 From: KayGuoWhu Date: Sun, 1 Feb 2015 21:54:17 +0800 Subject: [PATCH 133/207] translated --- .../20150121 If a 32-bit integer overflows.md | 96 ------------------- .../20150121 If a 32-bit integer overflows.md | 93 ++++++++++++++++++ 2 files changed, 93 insertions(+), 96 deletions(-) delete mode 100644 sources/talk/20150121 If a 32-bit integer overflows.md create mode 100644 translated/talk/20150121 If a 32-bit integer overflows.md diff --git a/sources/talk/20150121 If a 32-bit integer overflows.md b/sources/talk/20150121 If a 32-bit integer overflows.md deleted file mode 100644 index fc8c375919..0000000000 --- a/sources/talk/20150121 If a 32-bit integer overflows.md +++ /dev/null @@ -1,96 +0,0 @@ -KayGuoWhu translating -If a 32-bit integer overflows, can we use a 40-bit structure instead of a 64-bit long one? ---------- - -#Q: - -If, say, a 32-bit integer is overflowing, instead of upgrading int to long, can we make use of some 40-bit type if we need a range only within 240, so that we save 24 (64-40) bits for every integer? - -If so, how? - -I have to deal with billions and space is a bigger constraint. - -#A: - -##Yes, but... - -It is certainly possible, but it is usually nonsensical (for any program that doesn't use billions of these numbers): - -```C -#include // don't want to rely on something like long long -struct bad_idea -{ - uint64_t var : 40; -}; -``` - -Here, var will indeed have a width of 40 bits at the expense of much less efficient code generated (it turns out that "much" is very much wrong -- the measured overhead is a mere 1-2%, see timings below), and usually to no avail. Unless you have need for another 24-bit value (or an 8 and 16 bit value) which you wish to pack into the same structure, alignment will forfeit anything that you may gain. - -In any case, unless you have billions of these, the effective difference in memory consumption will not be noticeable (but the extra code needed to manage the bit field will be noticeable!). - -###Note: - -The question has in the mean time been updated to reflect that indeed billions of numbers are needed, so this may be a viable thing to do, presumed that you take measures not to lose the gains due to structure alignment and padding, i.e. either by storing something else in the remaining 24 bits or by storing your 40-bit values in structures of 8 each or multiples thereof). -Saving three bytes a billion times is worthwhile as it will require noticeably fewer memory pages and thus cause fewer cache and TLB misses, and above all page faults (a single page fault weighting tens of millions instructions). - -While the above snippet does not make use of the remaining 24 bits (it merely demonstrates the "use 40 bits" part), something akin to the following will be necessary to really make the approach useful in a sense of preserving memory -- presumed that you indeed have other "useful" data to put in the holes: - -```C -struct using_gaps -{ - uint64_t var : 40; - uint64_t useful_uint16 : 16; - uint64_t char_or_bool : 8; -}; -``` - -Structure size and alignment will be equal to a 64 bit integer, so nothing is wasted if you make e.g. an array of a billion such structures (even without using compiler-specific extensions). If you don't have use for an 8-bit value, you could also use an 48-bit and a 16-bit value (giving a bigger overflow margin). -Alternatively you could, at the expense of usability, put 8 40-bit values into a structure (least common multiple of 40 and 64 being 320 = 8*40). Of course then your code which accesses elements in the array of structures will become much more complicated (though one could probably implement an operator[] that restores the linear array functionality and hides the structure complexity). - -Update: -Wrote a quick test suite, just to see what overhead the bitfields (and operator overloading with bitfield refs) would have. Posted code (due to length) at gcc.godbolt.org, test output from my Win7-64 machine is: - -```TXT -Running test for array size = 1048576 -what alloc seq(w) seq(r) rand(w) rand(r) free ------------------------------------------------------------ -uint32_t 0 2 1 35 35 1 -uint64_t 0 3 3 35 35 1 -bad40_t 0 5 3 35 35 1 -packed40_t 0 7 4 48 49 1 - - -Running test for array size = 16777216 -what alloc seq(w) seq(r) rand(w) rand(r) free ------------------------------------------------------------ -uint32_t 0 38 14 560 555 8 -uint64_t 0 81 22 565 554 17 -bad40_t 0 85 25 565 561 16 -packed40_t 0 151 75 765 774 16 - - -Running test for array size = 134217728 -what alloc seq(w) seq(r) rand(w) rand(r) free ------------------------------------------------------------ -uint32_t 0 312 100 4480 4441 65 -uint64_t 0 648 172 4482 4490 130 -bad40_t 0 682 193 4573 4492 130 -packed40_t 0 1164 552 6181 6176 130 -``` - -What one can see is that the extra overhead of bitfields is neglegible, but the operator overloading with bitfield reference as a convenience thing is rather drastic (about 3x increase) when accessing data linearly in a cache-friendly manner. On the other hand, on random access it barely even matters. - -These timings suggest that simply using 64-bit integers would be better since they are still faster overall than bitfields (despite touching more memory), but of course they do not take into account the cost of page faults with much bigger datasets. It might look very different once you run out of physical RAM (I didn't test that). - ------- - -via:[stackoverflow](http://stackoverflow.com/questions/27705409/if-a-32-bit-integer-overflows-can-we-use-a-40-bit-structure-instead-of-a-64-bit/27705562#27705562) - -作者：[Damon][a][Michael Kohne][b] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://stackoverflow.com/users/572743/damon -[b]:http://stackoverflow.com/users/5801/michael-kohne \ No newline at end of file diff --git a/translated/talk/20150121 If a 32-bit integer overflows.md b/translated/talk/20150121 If a 32-bit integer overflows.md new file mode 100644 index 0000000000..651e829189 --- /dev/null +++ b/translated/talk/20150121 If a 32-bit integer overflows.md @@ -0,0 +1,93 @@ +如果使用32位整型会溢出，那么是否可以使用一个40位结构体代替64位长整型？ +--------- + +#问题： +假如说，使用32位的整型会溢出，在不考虑使用长整型的情况下，如果我们只需要表示2的40次方范围内的数，是否可以利用某些40位长的数据类型来表示呢？这样的话，每个整型数就可以节省24位的空间。 + +如果可以，该怎么做？ + +需求是：我现在必须处理数以亿计的数字，所以在存储空间上受到了很大的限制。 + +#回答： + +##可以是可以，但是…… + +这种方法的确可行，但这么做通常没什么意义（因为几乎没有程序需要处理多达十亿的数字）： + +```C +#include // 不要考虑使用long long类型 +struct bad_idea +{ + uint64_t var : 40; +}; +``` + +在这里，变量var占据40位大小，但是以生成代码时拥有非常低的运行效率来换取的（事实证明“非常”二字言过其实了——测试中程序开销仅仅增加了1%到2%，正如下面的测试时间所示），而且这么做通常没什么用。除非你还需要保存一个24位的值（或者是8位、16位的值），这样你皆可以它们放到同一个结构中。不然的话，因为对齐内存地址产生的开销会抵消这么做带来的好处。 + +在任何情况下，除非你是真的需要保存数以亿计的数字，否则这样做给内存消耗带来的好处是可以忽略不计的（但是为了处理这些位字段的额外代码量是不可忽略的！）。 + +###说明： + +在此期间，这个问题已经被更新了，是为了说明实际上确实有需要处理数以亿计数字的情况。假设，采取某些措施来防止因为结构体对齐和填充抵消好处（比如在后24位中存储其它的内容，或者使用多个8位来存储40位），那么这么做就变得有意义了。 +如果有十亿个数，每个数都节省三个字节的空间，那么这么做就非常有用了。因为使用更小的空间存储要求更少的内存页，也就会产生更少的cache和TLB不命中和内存缺页（单个缺页会产生数以千万计的指令（译者注：直译是这样，但语义说不通！））。 + +尽管上面提到的情况不足以充分利用到剩余的24位（它仅仅使用了40位部分），如果确实在剩余位中放入了有用的数据，那么使用类似下面的方法会使得这种思路就管理内存而言显得非常有用。 + +```C +struct using_gaps +{ + uint64_t var : 40; + uint64_t useful_uint16 : 16; + uint64_t char_or_bool : 8; +}; +``` + +结构体大小和对齐长度等于64位整型的大小，所以只要使用得当就不会浪费空间，比如对一个保存10亿个数的数组使用这个结构（不考虑使用指定编译器的扩展）。如果你不会用到一个8位的值，那么你可以使用一个48位和16位的值（giving a bigger overflow margin）。 +或者以牺牲可用性为代价，把8个64位的值放入这样的结构体中（或者使用40和64的组合使得其和满足320）。当然，在这种情况下，通过代码去访问数组结构体中的元素会变得非常麻烦（尽管一种方法是实现一个operator[]在功能上还原线性数组，隐藏结构体的复杂性）。 + +更新： + +我写了一个快速测试工具，只是为了获得位字段的开销（以及伴随位字段引用的重载操作）。由于长度限制将代码发布在gcc.godbolt.org上，在本人64位Win7上的测试结果如下： + +```TXT +运行测试的数组大小为1048576 +what alloc seq(w) seq(r) rand(w) rand(r) free +----------------------------------------------------------- +uint32_t 0 2 1 35 35 1 +uint64_t 0 3 3 35 35 1 +bad40_t 0 5 3 35 35 1 +packed40_t 0 7 4 48 49 1 + +运行测试的数组大小为16777216 +what alloc seq(w) seq(r) rand(w) rand(r) free +----------------------------------------------------------- +uint32_t 0 38 14 560 555 8 +uint64_t 0 81 22 565 554 17 +bad40_t 0 85 25 565 561 16 +packed40_t 0 151 75 765 774 16 + +运行测试的数组大小为134177228 +what alloc seq(w) seq(r) rand(w) rand(r) free +----------------------------------------------------------- +uint32_t 0 312 100 4480 4441 65 +uint64_t 0 648 172 4482 4490 130 +bad40_t 0 682 193 4573 4492 130 +packed40_t 0 1164 552 6181 6176 130 +``` + +我们看到，位字段的额外开销是微不足道的，但是当以友好的方式线性访问数据时伴随位字段引用的操作符重载产生的开销则相当显著（大概有3倍）。在另一方面，随机访问产生的开销则无足轻重。 + +这些时间表明简单的使用64位整型会更好，因为它们在整体性能上要比位字段好（尽管占用更多的内存），但是显然它们并没有考虑随着数据集增大带来的缺页开销。一旦程序内存超过RAM大小，结果可能就不一样了（未亲自考证）。 + +------ + +via:[stackoverflow](http://stackoverflow.com/questions/27705409/if-a-32-bit-integer-overflows-can-we-use-a-40-bit-structure-instead-of-a-64-bit/27705562#27705562) + +作者：[Damon][a][Michael Kohne][b] +译者：[KayGuoWhu](https://github.com/KayGuoWhu) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://stackoverflow.com/users/572743/damon +[b]:http://stackoverflow.com/users/5801/michael-kohne \ No newline at end of file From d3efeb3beefaea1fd307d4eb9bec641796718c16 Mon Sep 17 00:00:00 2001 From: Tao Meng Date: Mon, 2 Feb 2015 10:35:26 +0800 Subject: [PATCH 134/207] Translating 20150128 Docker-1 Moving to Docker.md --- sources/tech/20150128 Docker-1 Moving to Docker.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sources/tech/20150128 Docker-1 Moving to Docker.md b/sources/tech/20150128 Docker-1 Moving to Docker.md index 6917b3b7b1..1c1d4b78cc 100644 --- a/sources/tech/20150128 Docker-1 Moving to Docker.md +++ b/sources/tech/20150128 Docker-1 Moving to Docker.md @@ -1,3 +1,4 @@ +Translating by mtunique Moving to Docker ================================================================================ ![](http://cocoahunter.com/content/images/2015/01/docker1.jpeg) @@ -53,7 +54,7 @@ In the following articles we'll see how to setup a semi-automated Docker based d via: http://cocoahunter.com/2015/01/23/docker-1/ 作者：[Michelangelo Chasseur][a] -译者：[译者ID](https://github.com/译者ID) +译者：[mtunique](https://github.com/mtunique) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 @@ -78,4 +79,4 @@ via: http://cocoahunter.com/2015/01/23/docker-1/ [17]: [18]: [19]: -[20]: \ No newline at end of file +[20]: From c034190b14f1741acc98cc47fe8d5b1bf0a150fe Mon Sep 17 00:00:00 2001 From: KayGuoWhu Date: Mon, 2 Feb 2015 10:40:18 +0800 Subject: [PATCH 135/207] translating by KayGuoWhu --- sources/tech/20150127 How to limit network bandwidth on Linux.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/tech/20150127 How to limit network bandwidth on Linux.md b/sources/tech/20150127 How to limit network bandwidth on Linux.md index 1deaa38b49..78c97cfec6 100644 --- a/sources/tech/20150127 How to limit network bandwidth on Linux.md +++ b/sources/tech/20150127 How to limit network bandwidth on Linux.md @@ -1,3 +1,4 @@ +translating by KayGuoWhu How to limit network bandwidth on Linux ================================================================================ If you often run multiple networking applications on your Linux desktop, or share bandwidth among multiple computers at home, you will want to have a better control over bandwidth usage. Otherwise, when you are downloading a big file with a downloader, your interactive SSH session may become sluggish to the point where it's unusable. Or when you sync a big folder over Dropbox, your roommate may complain that video streaming at her computer gets choppy. From 180b9d6ba9261a22cb96df8a50bc16bcd9487d11 Mon Sep 17 00:00:00 2001 From: Junkai <2q1w2007@163.com> Date: Mon, 2 Feb 2015 14:46:34 +0800 Subject: [PATCH 136/207] =?UTF-8?q?20150202=20=E9=80=89=E9=A2=98=202015020?= =?UTF-8?q?2=20The=20Pirate=20Bay=20Is=20Now=20Back=20Online.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...50202 The Pirate Bay Is Now Back Online.md | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 sources/news/20150202 The Pirate Bay Is Now Back Online.md diff --git a/sources/news/20150202 The Pirate Bay Is Now Back Online.md b/sources/news/20150202 The Pirate Bay Is Now Back Online.md new file mode 100644 index 0000000000..acde800ad8 --- /dev/null +++ b/sources/news/20150202 The Pirate Bay Is Now Back Online.md @@ -0,0 +1,38 @@ +The Pirate Bay Is Now Back Online +------ +*The website was closed for about seven weeks* +![The Pirate Bay](http://i1-news.softpedia-static.com/images/news2/The-Pirate-Bay-Is-Now-Back-Online-471802-2.jpg) +##After being [raided](1) by the police almost two months ago, (in)famous torrent website The Pirate Bay is now back online. Those who thought the website will never return will be either disappointed or happy given that The Pirate Bay seems to live once again. + +In order to celebrate its coming back, The Pirate Bay admins have posted a Phoenix bird on the front page, which signifies the fact that the website can't be killed only damaged. + +About two weeks after The Pirate Bay was raided the domain miraculously came back to life. Soon after a countdown appeared on the temporary homepage of The Pirate Bay indicating that the website is almost ready for a comeback. + +The countdown hinted to February 1, as the possible date for The Pirate Bay's comeback, but it looks like those who manage the website manage to pull it out one day earlier. + +Beginning today, those who have accounts on The Pirate Bay can start downloading the torrents they want. Other than the Phoenix on the front page there are no other messages that might point to the resurrection The Pirate Bay except for the fact that it's now operational. + +Admins of the website said a few weeks ago they will find ways to manage and optimize The Pirate Bay, so that there will be minimal chances for the website to be closed once again. Let's see how it lasts this time. + +##Another version of The Pirate Bay may be launched soon + +In related news, one of the members of the original staff was dissatisfied with the decisions made by the majority regarding some of the changes made in the way admins interact with the website. + +He told [Torrentfreak](2) earlier this week that he, along with a few others, will open his version of The Pirate Bay, which they claim will be the "real" one. + +------ +via:http://news.softpedia.com/news/The-Pirate-Bay-Is-Now-Back-Online-471802.shtml + +本文发布时间:31 Jan 2015, 22:49 GMT + +作者：[Cosmin Vasile][a] + +译者：[译者ID](https://github.com/译者ID) + +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/cosmin-vasile +[1]:http://news.softpedia.com/news/The-Pirate-Bay-Is-Down-December-9-2014-466987.shtml +[2]:http://torrentfreak.com/pirate-bay-back-online-150131/ \ No newline at end of file From 6bde453367b19ddab93037de75ba8194645629a0 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Mon, 2 Feb 2015 15:06:25 +0800 Subject: [PATCH 137/207] Translating by ZTinoZ --- ...Linux FAQs with Answers--How to check CPU info on Linux.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md index 9d5d9844cf..a1cf20c2ce 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md @@ -12,11 +12,11 @@ Linux有问必答时间--如何查看Linux系统的CPU信息 ![](https://farm8.staticflickr.com/7572/15934711577_4136a8e0b9_c.jpg) -By inspecting this file, you can [identify][1] the number of physical processors, the number of cores per CPU, available CPU flags, and a number of other things. +通过查看这个文件，你能[识别出][1]物理处理器数、每个CPU核心数、可用的CPU标志寄存器以及其它东西的数量。 ### 2. cpufreq-info ### -The cpufreq-info command (which is part of **cpufrequtils** package) collects and reports CPU frequency information from the kernel/hardware. The command shows the hardware frequency that the CPU currently runs at, as well as the minimum/maximum CPU frequency allowed, CPUfreq policy/statistics, and so on. To check up on CPU #0: +cpufreq-info命令(**cpufrequtils**包的一部分)从内核/硬件中收集并报告CPU频率信息。这条命令展示了CPU当前运行的硬件频率，包括CPU所允许的最小/最大频率、CPUfreq策略/统计数据等等。来看下CPU #0上的信息： $ cpufreq-info -c 0 From 42b67205ce597b2b7f6262e3aaf19d95231f2bc0 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 2 Feb 2015 16:36:42 +0800 Subject: [PATCH 138/207] =?UTF-8?q?20150202-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...entation from the command line on Linux.md | 186 ++++++++++++++++ ... filter BGP routes in Quagga BGP router.md | 201 ++++++++++++++++++ 2 files changed, 387 insertions(+) create mode 100644 sources/tech/20150202 How to create and show a presentation from the command line on Linux.md create mode 100644 sources/tech/20150202 How to filter BGP routes in Quagga BGP router.md diff --git a/sources/tech/20150202 How to create and show a presentation from the command line on Linux.md b/sources/tech/20150202 How to create and show a presentation from the command line on Linux.md new file mode 100644 index 0000000000..d80b385544 --- /dev/null +++ b/sources/tech/20150202 How to create and show a presentation from the command line on Linux.md @@ -0,0 +1,186 @@ +How to create and show a presentation from the command line on Linux +================================================================================ +When you prepare a talk for audience, the first thing that will probably come to your mind is shiny presentation charts filled with fancy diagrams, graphics and animation effects. Fine. No one can deny the power of visually charming presentation. However, not all presentations need to be Ted talk quality. Often times, the purpose of a presentation is to convey specific information, which can easily be done with textual messages. In such cases, your time can be better spent on gathering information and checking facts, rather than searching for good-looking graphics from Google Image. + +In the world of Linux, you can do presentation in several different ways, e.g., Impress for multimedia-rich content, [Impress.js][1] for stunning visualization, Beamer for hardcore LaTex users, and so on. If you are looking for a simple means to create and show a textual presentation, look no further. [mdp][2] can get the job done for you. + +### What is Mdp? ### + +mdp is an ncurses-based command-line presentation tool for Linux. What I like about mdp is its [markdown][3] support, which makes it easy to create slides with familiar markdown format. Naturally, it becomes painless to publish the slides in HTML format as well. Another plus is its support for UTF-8 character encoding, which comes in handy when showing non-English characters (e.g., Greek or Cyrillic alphabets). + +### Install Mdp on Linux ### + +Installation of mdp is mostly painless due to its light dependency requirement (i.e., ncursesw). + +#### Debian, Ubuntu or their derivatives #### + + $ sudo apt-get install git gcc make libncursesw5-dev + $ git clone https://github.com/visit1985/mdp.git + $ cd mdp + $ make + $ sudo make install + +#### Fedora or CentOS/RHEL #### + + $ sudo yum install git gcc make ncurses-devel + $ git clone https://github.com/visit1985/mdp.git + $ cd mdp + $ make + $ sudo make install + +#### Arch Linux #### + +On Arch Linux, you can easily install mdp from [AUR][4]. + +### Create a Presentation from the Command Line ### + +Once you installed mdp, you can easily create a presentation by using your favorite text editor. If you are familiar with markdown, it will take no time to master mdp. For those of you who are not familiar with markdown, starting with an example is the best way to learn mdp. + +Here is a 6-page sample presentation for your reference. + + %title: Sample Presentation made with mdp (Xmodulo.com) + %author: Dan Nanni + %date: 2015-01-28 + + -> This is a slide title <- + ========= + + -> mdp is a command-line based presentation tool with markdown support. <- + + *_Features_* + + * Multi-level headers + * Code block formatting + * Nested quotes + * Nested list + * Text highlight and underline + * Citation + * UTF-8 special characters + + ------------------------------------------------- + + -> # Example of nested list <- + + This is an example of multi-level headers and a nested list. + + # first-level title + + second-level + ------------ + + - *item 1* + - sub-item 1 + - sub-sub-item 1 + - sub-sub-item 2 + - sub-sub-item 3 + - sub-item 2 + + ------------------------------------------------- + + -> # Example of code block formatting <- + + This example shows how to format a code snippet. + + 1 /* Hello World program */ + 2 + 3 #include + 4 + 5 int main() + 6 { + 7 printf("Hello World"); + 8 return 0; + 9 } + + This example shows inline code: `sudo reboot` + + ------------------------------------------------- + + -> # Example of nested quotes <- + + This is an example of nested quotes. + + # three-level nested quotes + + > This is the first-level quote. + >> This is the second-level quote + >> and continues. + >>> *This is the third-level quote, and so on.* + + ------------------------------------------------- + + -> # Example of citations <- + + This example shows how to place a citation inside a presentation. + + This tutorial is published at [Xmodulo](http://xmodulo.com) + + You are welcome to connect with me at [LinkedIn](http://www.linkedin.com/in/xmodulo) + + Pretty cool, huh? + + ------------------------------------------------- + + -> # Example of UTF-8 special characters <- + + This example shows UTF-8 special characters. + + ae = ä, oe = ö, ue = ü, ss = ß + alpha = ?, beta = ?, upsilon = ?, phi = ? + Omega = ?, Delta = ?, Sigma = ? + + ??????????? + ?rectangle? + ??????????? + +### Show a Presentation from the Command Line ### + +Once you save the above code as slide.md text file, you can show the presentation by simply running: + + $ mdp slide.md + +You can navigate the presentation by pressing Enter/Space/Page-Down/Down-Arrow (next slide), Backspace/Page-Up/Up-Arrow (previous slide), Home (first slide), End (last slide), or numeric-N (N-th slide). + +The title of the presentation appears on top of each slide, and your name and page number are shown at the bottom. + +![](https://farm9.staticflickr.com/8637/16392457702_ec732d0094_c.jpg) + +This is an example of a nested list and multi-level headers. + +![](https://farm9.staticflickr.com/8567/16367397606_29be7df633_c.jpg) + +This is an example of a code snippet and inline code. + +![](https://farm9.staticflickr.com/8682/15770926144_0f982b0863_b.jpg) + +This is an example of nested quotes. + +![](https://farm9.staticflickr.com/8587/16393383115_0865c8b89b_c.jpg) + +This is an example of placing citations. + +![](https://farm8.staticflickr.com/7409/16392457712_ed36c14bc2_c.jpg) + +This is an example of UTF-8 special characters. + +![](https://farm9.staticflickr.com/8648/16205981560_7fa3debc75_c.jpg) + +### Summary ### + +In this tutorial, I showed you how to use mdp to create and show a presentation from the command line. Its markdown compatibility saves us the trouble and hassle of having to learn any new formatting, which is an advantage compared to [tpp][5], another command-line presentation tool. Due to its limitations, mdp may not qualify as your default presentation tool, but there should be definitely a use case for that. What do you think of mdp? Do you prefer something else? + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/presentation-command-line-linux.html + +作者：[Dan Nanni][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/nanni +[1]:http://bartaz.github.io/impress.js/ +[2]:https://github.com/visit1985/mdp +[3]:http://daringfireball.net/projects/markdown/ +[4]:https://aur.archlinux.org/packages/mdp-git/ +[5]:http://www.ngolde.de/tpp.html \ No newline at end of file diff --git a/sources/tech/20150202 How to filter BGP routes in Quagga BGP router.md b/sources/tech/20150202 How to filter BGP routes in Quagga BGP router.md new file mode 100644 index 0000000000..d92c47c774 --- /dev/null +++ b/sources/tech/20150202 How to filter BGP routes in Quagga BGP router.md @@ -0,0 +1,201 @@ +How to filter BGP routes in Quagga BGP router +================================================================================ +In the [previous tutorial][1], we demonstrated how to turn a CentOS box into a BGP router using Quagga. We also covered basic BGP peering and prefix exchange setup. In this tutorial, we will focus on how we can control incoming and outgoing BGP prefixes by using **prefix-list** and **route-map**. + +As described in earlier tutorials, BGP routing decisions are made based on the prefixes received/advertised. To ensure error-free routing, it is recommended that you use some sort of filtering mechanism to control these incoming and outgoing prefixes. For example, if one of your BGP neighbors starts advertising prefixes which do not belong to them, and you accept such bogus prefixes by mistake, your traffic can be sent to that wrong neighbor, and end up going nowhere (so-called "getting blackholed"). To make sure that such prefixes are not received or advertised to any neighbor, you can use prefix-list and route-map. The former is a prefix-based filtering mechanism, while the latter is a more general prefix-based policy mechanism used to fine-tune actions. + +We will show you how to use prefix-list and route-map in Quagga. + +### Topology and Requirement ### + +In this tutorial, we assume the following topology. + +![](https://farm8.staticflickr.com/7394/16407625405_4f7d24d1f6_c.jpg) + +Service provider A has already established an eBGP peering with service provider B, and they are exchanging routing information between them. The AS and prefix details are as stated below. + +- **Peering block**: 192.168.1.0/24 +- **Service provider A**: AS 100, prefix 10.10.0.0/16 +- **Service provider B**: AS 200, prefix 10.20.0.0/16 + +In this scenario, service provider B wants to receive only prefixes 10.10.10.0/23, 10.10.10.0/24 and 10.10.11.0/24 from provider A. + +### Quagga Installation and BGP Peering ### + +In the [previous tutorial][1], we have already covered the method of installing Quagga and setting up BGP peering. So we will not go through the details here. Nonetheless, I am providing a summary of BGP configuration and prefix advertisements: + +![](https://farm8.staticflickr.com/7428/16219986668_97cb193b15_c.jpg) + +The above output indicates that the BGP peering is up. Router-A is advertising multiple prefixes towards router-B. Router-B, on the other hand, is advertising a single prefix 10.20.0.0/16 to router-A. Both routers are receiving the prefixes without any problems. + +### Creating Prefix-List ### + +In a router, a prefix can be blocked with either an ACL or prefix-list. Using prefix-list is often preferred to ACLs since prefix-list is less processor intensive than ACLs. Also, prefix-list is easier to create and maintain. + + ip prefix-list DEMO-PRFX permit 192.168.0.0/23 + +The above command creates prefix-list called 'DEMO-FRFX' that allows only 192.168.0.0/23. + +Another great feature of prefix-list is that we can specify a range of subnet mask(s). Take a look at the following example: + + ip prefix-list DEMO-PRFX permit 192.168.0.0/23 le 24 + +The above command creates prefix-list called 'DEMO-PRFX' that permits prefixes between 192.168.0.0/23 and /24, which are 192.168.0.0/23, 192.168.0.0/24 and 192.168.1.0/24. The 'le' operator means less than or equal to. You can also use 'ge' operator for greater than or equal to. + +A single prefix-list statement can have multiple permit/deny actions. Each statement is assigned a sequence number which can be determined automatically or specified manually. + +Multiple prefix-list statements are parsed one by one in the increasing order of sequence numbers. When configuring prefix-list, we should keep in mind that there is always an **implicit deny** at the end of all prefix-list statements. This means that anything that is not explicitly allowed will be denied. + +To allow everything, we can use the following prefix-list statement which allows any prefix starting from 0.0.0.0/0 up to anything with subnet mask /32. + + ip prefix-list DEMO-PRFX permit 0.0.0.0/0 le 32 + +Now that we know how to create prefix-list statements, we will create prefix-list called 'PRFX-LST' that will allow prefixes required in our scenario. + + router-b# conf t + router-b(config)# ip prefix-list PRFX-LST permit 10.10.10.0/23 le 24 + +### Creating Route-Map ### + +Besides prefix-list and ACLs, there is yet another mechanism called route-map, which can control prefixes in a BGP router. In fact, route-map can fine-tune possible actions more flexibly on the prefixes matched with an ACL or prefix-list. + +Similar to prefix-list, a route-map statement specifies permit or deny action, followed by a sequence number. Each route-map statement can have multiple permit/deny actions with it. For example: + + route-map DEMO-RMAP permit 10 + +The above statement creates route-map called 'DEMO-RMAP', and adds permit action with sequence 10. Now we will use match command under sequence 10. + + router-a(config-route-map)# match (press ? in the keyboard) + +---------- + + as-path Match BGP AS path list + community Match BGP community list + extcommunity Match BGP/VPN extended community list + interface match first hop interface of route + ip IP information + ipv6 IPv6 information + metric Match metric of route + origin BGP origin code + peer Match peer address + probability Match portion of routes defined by percentage value + tag Match tag of route + +As we can see, route-map can match many attributes. We will match a prefix in this tutorial. + + route-map DEMO-RMAP permit 10 + match ip address prefix-list DEMO-PRFX + +The match command will match the IP addresses permitted by the prefix-list 'DEMO-PRFX' created earlier (i.e., prefixes 192.168.0.0/23, 192.168.0.0/24 and 192.168.1.0/24). + +Next, we can modify the attributes by using the set command. The following example shows possible use cases of set. + + route-map DEMO-RMAP permit 10 + match ip address prefix-list DEMO-PRFX + set (press ? in keyboard) + +---------- + + aggregator BGP aggregator attribute + as-path Transform BGP AS-path attribute + atomic-aggregate BGP atomic aggregate attribute + comm-list set BGP community list (for deletion) + community BGP community attribute + extcommunity BGP extended community attribute + forwarding-address Forwarding Address + ip IP information + ipv6 IPv6 information + local-preference BGP local preference path attribute + metric Metric value for destination routing protocol + metric-type Type of metric + origin BGP origin code + originator-id BGP originator ID attribute + src src address for route + tag Tag value for routing protocol + vpnv4 VPNv4 information + weight BGP weight for routing table + +As we can see, the set command can be used to change many attributes. For a demonstration purpose, we will set BGP local preference. + + route-map DEMO-RMAP permit 10 + match ip address prefix-list DEMO-PRFX + set local-preference 500 + +Just like prefix-list, there is an implicit deny at the end of all route-map statements. So we will add another permit statement in sequence number 20 to permit everything. + + route-map DEMO-RMAP permit 10 + match ip address prefix-list DEMO-PRFX + set local-preference 500 + ! + route-map DEMO-RMAP permit 20 + +The sequence number 20 does not have a specific match command, so it will, by default, match everything. Since the decision is permit, everything will be permitted by this route-map statement. + +If you recall, our requirement is to only allow/deny some prefixes. So in our scenario, the set command is not necessary. We will just use one permit statement as follows. + + router-b# conf t + router-b(config)# route-map RMAP permit 10 + router-b(config-route-map)# match ip address prefix-list PRFX-LST + +This route-map statement should do the trick. + +### Applying Route-Map ### + +Keep in mind that ACLs, prefix-list and route-map are not effective unless they are applied to an interface or a BGP neighbor. Just like ACLs or prefix-list, a single route-map statement can be used with any number of interfaces or neighbors. However, any one interface or a neighbor can support only one route-map statement for inbound, and one for outbound traffic. + +We will apply the created route-map to the BGP configuration of router-B for neighbor 192.168.1.1 with incoming prefix advertisement. + + router-b# conf terminal + router-b(config)# router bgp 200 + router-b(config-router)# neighbor 192.168.1.1 route-map RMAP in + +Now, we check the routes advertised and received by using the following commands. + +For advertised routes: + + show ip bgp neighbor-IP advertised-routes + +For received routes: + + show ip bgp neighbor-IP routes + +![](https://farm8.staticflickr.com/7424/16221405429_4d86119548_c.jpg) + +You can see that while router-A is advertising four prefixes towards router-B, router-B is accepting only three prefixes. If we check the range, we can see that only the prefixes that are allowed by route-map are visible on router-B. All other prefixes are discarded. + +**Tip**: If there is no change in the received prefixes, try resetting the BGP session using the command: "clear ip bgp neighbor-IP". In our case: + + clear ip bgp 192.168.1.1 + +As we can see, the requirement has been met. We can create similar prefix-list and route-map statements in routers A and B to further control inbound and outbound prefixes. + +I am summarizing the configuration in one place so you can see it all at a glance. + + router bgp 200 + network 10.20.0.0/16 + neighbor 192.168.1.1 remote-as 100 + neighbor 192.168.1.1 route-map RMAP in + ! + ip prefix-list PRFX-LST seq 5 permit 10.10.10.0/23 le 24 + ! + route-map RMAP permit 10 + match ip address prefix-list PRFX-LST + +### Summary ### + +In this tutorial, we showed how we can filter BGP routes in Quagga by defining prefix-list and route-map. We also demonstrated how we can combine prefix-list with route-map to fine-control incoming prefixes. You can create your own prefix-list and route-map in a similar way to match your network requirements. These tools are one of the most effective ways to protect the production network from route poisoning and advertisement of bogon routes. + +Hope this helps. + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/filter-bgp-routes-quagga-bgp-router.html + +作者：[Sarmed Rahman][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/sarmed +[1]:http://xmodulo.com/centos-bgp-router-quagga.html \ No newline at end of file From b8a7935aa130d379c95e6cc93ba84cc471dc1773 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 2 Feb 2015 16:54:55 +0800 Subject: [PATCH 139/207] =?UTF-8?q?20150205-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...all Websvn for Subversion in CentOS 7.0.md | 123 ++++++++++++++++++ ...ache Tomcat to IPv4 in Centos or Redhat.md | 79 +++++++++++ ...Python Tool To Test Your Internet Speed.md | 76 +++++++++++ 3 files changed, 278 insertions(+) create mode 100644 sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md create mode 100644 sources/tech/20150202 How to Bind Apache Tomcat to IPv4 in Centos or Redhat.md create mode 100644 sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md diff --git a/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md b/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md new file mode 100644 index 0000000000..0a9dfdb442 --- /dev/null +++ b/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md @@ -0,0 +1,123 @@ +How To Install Websvn for Subversion in CentOS 7.0 +================================================================================ +Hi all, today we'll be installing latest WebSVN in our CentOS 7 for subversion repositories. + +WebSVN offers a view onto your subversion repositories that’s been designed to reflect the Subversion methodology. We can view the log of any file or directory and see a list of all the files changed, added or deleted in any given revision. We can also view the differences between two versions of a file so as to see exactly what was changed in a particular revision. + +### Features ### + +WebSVN offers the following features: + +- Easy to use interface +- Customisable templating system +- Colourisation of file listings +- Blame view +- Log message searching +- RSS feed support +- [and more...][1] + +Since it's written using PHP, WebSVN is also very portable and easy to install. + +Now, we'll install WebSVN for our Subversion (Apache SVN). Make sure that you have installed Apache SVN in your server. If you don't have it installed, you can install from this tutorial. + +After you installed Apache SVN(Subversion), you'll need to follow the easy steps below. + +### 1. Download WebSVN ### + +You can download WebSVN from their official site http://www.websvn.info/download/ . We'll first get inside directory /var/www/html/ and then download the package inside it. + + $ sudo -s + +**Please execute the above command in a shell or terminal as wee'll need to switch to root privilege so that we'll have full access to the system's restricted areas.** + + # cd /var/www/html + # wget http://websvn.tigris.org/files/documents/1380/49057/websvn-2.3.3.zip + +![downloading websvn package](http://blog.linoxide.com/wp-content/uploads/2015/01/downloading-websvn.png) + +Here, I am download the latest version 2.3.3 of websvn. You can get the link from the site. You can simply replace the above link with the link of the package you wanna install. + +### 2. Extract the downloaded zip ### + + # unzip websvn-2.3.3.zip + + # mv websvn-2.3.3 websvn + +![extracting websvn](http://blog.linoxide.com/wp-content/uploads/2015/01/extracting-websvn.png) + +### 3. Install php ### + + # yum install php + +![yum install php](http://blog.linoxide.com/wp-content/uploads/2015/01/yum-install-php.png) + +### 4. Edit WebSVN config ### + +Now, we'll need to copy distconfig.php which is situated inside /var/www/html/websvn/include directory to config.php and then edit the configuration file. + + # cd /var/www/html/websvn/include + + # cp distconfig.php config.php + + # nano config.php + +Now, we'll need to make changes to the file as shown below. After it is done, please save the file and exit. + + // Configure these lines if your commands aren't on your path. + // + $config->setSVNCommandPath('/usr/bin'); // e.g. c:\\program files\\subversion\\bin + $config->setDiffPath('/usr/bin'); + + // For syntax colouring, if option enabled... + $config->setEnscriptPath('/usr/bin'); + $config->setSedPath('/bin'); + + // For delivered tarballs, if option enabled... + $config->setTarPath('/bin'); + + // For delivered GZIP'd files and tarballs, if option enabled... + $config->setGZipPath('/bin'); + + // + $config->parentPath('/svn/'); + + $extEnscript[".pl"] = "perl"; + $extEnscript[".py"] = "python"; + $extEnscript[".sql"] = "sql"; + $extEnscript[".java"] = "java"; + $extEnscript[".html"] = "html"; + $extEnscript[".xml"] = "html"; + $extEnscript[".thtml"] = "html"; + $extEnscript[".tpl"] = "html"; + $extEnscript[".sh"] = "bash"; + +![websvn config file](http://blog.linoxide.com/wp-content/uploads/2015/01/config-file-websvn.png) + +### 5. Starting WebSVN ### + +Now, we are almost done. We now need to restart our Apache server. You can do that by the command below. + + # systemctl restart httpd.service + +And then, we'll open WebSVN inside our favorite browser with the address as http://Ip-address/websvn or if you are on local computer, you can goto http://localhost/websvn . + +![websvn successfully installed](http://blog.linoxide.com/wp-content/uploads/2015/01/websvn-success.png) + +**Note**: If you encountered error like "Unable to find "enscript" tool at location "/usr/bin/enscript"" then, you'll need to install enscript using the command "yum install enscript" which will fix the problem. + +### Conclusion ### + +Hurray, we have completed installing WebSVN in our CentOS 7 server. This tutorial works great on RHEL 7 too. WebSVN offers a view onto your subversion repositories that’s been designed to reflect the subversion methodology. You can view the log of any file or directory and see a list of all the files changed, added or deleted in any given revision. So, if you have any questions, comments, feedback please do write on the comment box below and let us know what stuffs needs to be added or improved. Thank You! Enjoy WebSVN :-) + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-how-to/install-websvn-subversion-centos-7/ + +作者：[Arun Pyasi][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/arunp/ +[1]:http://www.websvn.info/features/ \ No newline at end of file diff --git a/sources/tech/20150202 How to Bind Apache Tomcat to IPv4 in Centos or Redhat.md b/sources/tech/20150202 How to Bind Apache Tomcat to IPv4 in Centos or Redhat.md new file mode 100644 index 0000000000..92ac657b5a --- /dev/null +++ b/sources/tech/20150202 How to Bind Apache Tomcat to IPv4 in Centos or Redhat.md @@ -0,0 +1,79 @@ +How to Bind Apache Tomcat to IPv4 in Centos / Redhat +================================================================================ +Hi all, today we'll learn how to bind tomcat to ipv4 in CentOS 7 Linux Distribution. + +**Apache Tomcat** is an open source web server and servlet container developed by the [Apache Software Foundation][1]. It implements the Java Servlet, JavaServer Pages (JSP), Java Unified Expression Language and Java WebSocket specifications from Sun Microsystems and provides a web server environment for Java code to run in. + +Binding Tomcat to IPv4 is necessary if we have our server not working due to the default binding of our tomcat server to IPv6. As we know IPv6 is the modern way of assigning IP address to a device and is not in complete practice these days but may come into practice in soon future. So, currently we don't need to switch our tomcat server to IPv6 due to no use and we should bind it to IPv4. + +Before thinking to bind to IPv4, we should make sure that we've got tomcat installed in our CentOS 7. Here's is a quick tutorial on [how to install tomcat 8 in CentOS 7.0 Server][2]. + +### 1. Switching to user tomcat ### + +First of all, we'll gonna switch user to **tomcat** user. We can do that by running **su - tomcat** in a shell or terminal. + + # su - tomcat + +![Switch user to tomcat](http://blog.linoxide.com/wp-content/uploads/2015/01/switch-user-tomcat.png) + +### 2. Finding Catalina.sh ### + +Now, we'll First Go to bin directory inside the directory of Apache Tomcat installation which is usually under **/usr/share/apache-tomcat-8.0.x/bin/** where x is sub version of the Apache Tomcat Release. In my case, its **/usr/share/apache-tomcat-8.0.18/bin/** as I have version 8.0.18 installed in my CentOS 7 Server. + + $ cd /usr/share/apache-tomcat-8.0.18/bin + +**Note: Please replace 8.0.18 to the version of Apache Tomcat installed in your system. ** + +Inside the bin folder, there is a script file named catalina.sh . Thats the script file which we'll gonna edit and add a line of configuration which will bind tomcat to IPv4 . You can see that file by running **ls** into a terminal or shell. + + $ ls + +![finding catalina.sh](http://blog.linoxide.com/wp-content/uploads/2015/01/finding-catalina.sh_.png) + +### 3. Configuring Catalina.sh ### + +Now, we'll add **JAVA_OPTS= "$JAVA_OPTS -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses"** to that scripting file catalina.sh at the end of the file as shown in the figure below. We can edit the file using our favorite text editing software like nano, vim, etc. Here, we'll gonna use nano. + + $ nano catalina.sh + +![Catalina script](http://blog.linoxide.com/wp-content/uploads/2015/01/catalina-script.png) + +Then, add to the file as shown below: + +**JAVA_OPTS= "$JAVA_OPTS -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses"** + +![configured catalina](http://blog.linoxide.com/wp-content/uploads/2015/01/configured-catalina.png) + +Now, as we've added the configuration to the file, we'll now save and exit nano. + +### 4. Restarting ### + +Now, we'll restart our tomcat server to get our configuration working. We'll need to first execute shutdown.sh and then startup.sh . + + $ ./shutdown.sh + +Now, well run execute startup.sh as: + + $ ./startup.sh + +![restarting apache tomcat server](http://blog.linoxide.com/wp-content/uploads/2015/01/restarting-tomcat-server.png) + +This will restart our tomcat server and the configuration will be loaded which will ultimately bind the server to IPv4. + +### Conclusion ### + +Hurray, finally we'have got our tomcat server bind to IPv4 running in our CentOS 7 Linux Distribution. Binding to IPv4 is easy and is necessary if your Tomcat server is bind to IPv6 which will infact will make your tomcat server not working as IPv6 is not used these days and may come into practice in coming future. If you have any questions, comments, feedback please do write on the comment box below and let us know what stuffs needs to be added or improved. Thank You! Enjoy :-) + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-how-to/bind-apache-tomcat-ipv4-centos/ + +作者：[Arun Pyasi][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/arunp/ +[1]:http://www.apache.org/ +[2]:http://linoxide.com/linux-how-to/install-tomcat-8-centos-7/ \ No newline at end of file diff --git a/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md b/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md new file mode 100644 index 0000000000..a12f0b68b3 --- /dev/null +++ b/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md @@ -0,0 +1,76 @@ +tespeed - Python Tool To Test Your Internet Speed +================================================================================ +Many computer nerds know how to test their internet speed by using the **speedtest.net** but the thing is that it does not give you full control of the operationg going on during the measurement of your speed. Linux users love to type commands on their terminal emualator and do stuff, at least me. + +The tespeed tool is a python tool with many features that helps to test network speed from the terminal. According to the documentation it makes use of nearest speedtest.net server but the users can also manually specify one. + +In the beginning the author wrote the tespeed tool in the php programming language and proved to the ISP he was working for at that time that the internet they served was far from what they advertised. But things were not working all the time as they supposed to be so the author ported his php scripts to python and his tool counts 180 stars on github. + +It means **alot**. + +### How to use tespeed on linux ### + +Before running a python application on your machine you have to make sure that the system you are working meets the dependencies required by the tool. The python tool tespeed dependes on the two following python packages: + +- lxml +- SocksiPy + +You can easily install lxml with the help of the pip python package management system and to do that run the following command. + + pip install lxml + +Now we have to perform a simple trick to make use of the SocksiPy which you can download by using the the following command like shown below. + + wget http://sourceforge.net/projects/socksipy/files/socksipy/SocksiPy%201.00/SocksiPy.zip/ + +Once the installation is finished unzip **SocksiPy.zip** and run the following command to clone tespeed repo on your local machine. + + git clone https://github.com/Janhouse/tespeed.git + +Then place the SocksiPy folder inside the tespeed project you cloned. Now we have to create an empety file inside the SocksiPy folder under the name of **__init__.py** like shown in the following screenshot. + +![simple trick to make tespeed work](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed1.png) + +Now that we have fixed the dependencies for out projet we can easily run it by using the following command. + + python tespeed.py + +Then some magic is going to happen. The application is going to test your download and upload speed and display them in your console using some really nice colors. + +![testing download and upload speed with tespeed python application](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed2.png) + +There are many commands available in tespeed such as the option **-ls** to list the servers, option **-p** to specify and use a proxy server, the option **-s** to suppress debugging (STDERR) output and many others that we will explore in this tutorial. + +For example if you want to display results in mebibits you need to use the command **python tespeed.py** followed by the option **-mib** + + python tespeed.py -mib + +You can easily see how the unit used for measurement of the internet speed changed after using the tespeed app with the option -mib. + +![testing internet speed with tespeed python application](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed3.png) + +A very nice useful option I like to use while working with tespeed is the option -w which can be used to print CSV formated output to STDOUT. + + python tespeed.py -w + +Use the following command to list the servers. + + python tespeed -ls + +After running the above command you will get a list of servers used to test your upload and download speed. My list is really long so I am not going to share it in this tutorial. + +### Conclusion ### + +tespeed is a really easy to use high performance python script that helps computer users to test their upload and download speed by typing commands on their terminal. It supports many options and also you can specify the list of servers you would like to use. Keep playing with tespeed and please share your experience with us in the comment section. + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/tools/tespeed-python-tool-test-internet-speed/ + +作者：[Oltjano Terpollari][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/oltjano/ \ No newline at end of file From a124d126b1fa7d7e072a1eb74274dd7fd2852187 Mon Sep 17 00:00:00 2001 From: zheng Date: Mon, 2 Feb 2015 20:51:01 +0800 Subject: [PATCH 140/207] translating --- ...0150202 tespeed - Python Tool To Test Your Internet Speed.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md b/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md index a12f0b68b3..2a48ca6deb 100644 --- a/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md +++ b/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md @@ -1,3 +1,5 @@ +Translating-----geekpi + tespeed - Python Tool To Test Your Internet Speed ================================================================================ Many computer nerds know how to test their internet speed by using the **speedtest.net** but the thing is that it does not give you full control of the operationg going on during the measurement of your speed. Linux users love to type commands on their terminal emualator and do stuff, at least me. From 4b2bc7c5233881edc2ffcbd97d0474ad39988d2c Mon Sep 17 00:00:00 2001 From: su-kaiyao <1250471161@qq.com> Date: Mon, 2 Feb 2015 22:47:29 +0800 Subject: [PATCH 141/207] translated --- ...dern Open Source Code Editors For Linux.md | 88 ------------------- ...dern Open Source Code Editors For Linux.md | 87 ++++++++++++++++++ 2 files changed, 87 insertions(+), 88 deletions(-) delete mode 100644 sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md create mode 100644 translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md diff --git a/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md b/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md deleted file mode 100644 index 43ff7e9877..0000000000 --- a/sources/share/20150125 4 Best Modern Open Source Code Editors For Linux.md +++ /dev/null @@ -1,88 +0,0 @@ -su-kaiyao translating - -4 Best Modern Open Source Code Editors For Linux -================================================================================ -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Best_Open_Source_Editors.jpeg) - -Looking for **best programming editors in Linux**? If you ask the old school Linux users, their answer would be Vi, Vim, Emacs, Nano etc. But I am not talking about them. I am going to talk about new age, cutting edge, great looking, sleek and yet powerful, feature rich **best open source code editors for Linux** that would enhance your programming experience. - -### Best modern Open Source editors for Linux ### - -I use Ubuntu as my main desktop and hence I have provided installation instructions for Ubuntu based distributions. But this doesn’t make this list as **best text editors for Ubuntu** because the list is apt for any Linux distribution. Just to add, the list is not in any particular priority order. - -#### Brackets #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/brackets_UI.jpeg) - -[Brackets][1] is an open source code editor from [Adobe][2]. Brackets focuses exclusively on the needs of web designers with built in support for HTML, CSS and Java Script. It’s light weight and yet powerful. It provides you with inline editing and live preview. There are plenty of plugins available to further enhance your experience with Brackets. - -To [install Brackets in Ubuntu][3] and Ubuntu based distributions such as Linux Mint, you can use this unofficial PPA: - - sudo add-apt-repository ppa:webupd8team/brackets - sudo apt-get update - sudo apt-get install brackets - -For other Linux distributions, you can get the source code as well as binaries for Linux, OS X and Windows on its website. - -- [Download Brackets Source Code and Binaries][5] - -#### Atom #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/08/Atom_Editor.jpeg) - -[Atom][5] is another modern and sleek looking open source editor for programmers. Atom is developed by Github and promoted as a “hackable text editor for the 21st century”. The looks of Atom resembles a lot like Sublime Text editor, a hugely popular but closed source text editors among programmers. - -Atom has recently released .deb and .rpm packages so that one can easily install Atom in Debian and Fedora based Linux distributions. Of course, its source code is available as well. - -- [Download Atom .deb][6] -- [Download Atom .rpm][7] -- [Get Atom source code][8] - -#### Lime Text #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/08/LimeTextEditor.jpeg) - -So you like Sublime Text editor but you are not comfortable with the fact that it is not open source. No worries. We have an [open source clone of Sublime Text][9], called [Lime Text][10]. It is built on Go, HTML and QT. The reason behind cloning of Sublime Text is that there are numerous bugs in Sublime Text 2 and Sublime Text 3 is in beta since forever. There are no transparency in its development, on whether the bugs are being fixed or not. - -So open source lovers, rejoice and get the source code of Lime Text from the link below: - -- [Get Lime Text Source Code][11] - -#### Light Table #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Light_Table.jpeg) - -Flaunted as “the next generation code editor”, [Light Table][12] is another modern looking, feature rich open source editor which is more of an IDE than a mere text editor. There are numerous extensions available to enhance its capabilities. Inline evaluation is what you would love in it. You have to use it to believe how useful Light Table actually is. - -- [Get Light Table Source Code][13] - -### What’s your pick? ### - -No, we are not limited to just four code editors in Linux. The list was about modern editors for programmers. Of course you have plenty of other options such as [Notepad++ alternative Notepadqq][14] or [SciTE][15] and many more. So, among these four, which one is your favorite code editor for Linux? - --------------------------------------------------------------------------------- - -via: http://itsfoss.com/best-modern-open-source-code-editors-for-linux/ - -作者：[Abhishek][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://itsfoss.com/author/Abhishek/ -[1]:http://brackets.io/ -[2]:http://www.adobe.com/ -[3]:http://itsfoss.com/install-brackets-ubuntu/ -[4]:https://github.com/adobe/brackets/releases -[5]:https://atom.io/ -[6]:https://atom.io/download/deb -[7]:https://atom.io/download/rpm -[8]:https://github.com/atom/atom/blob/master/docs/build-instructions/linux.md -[9]:http://itsfoss.com/lime-text-open-source-alternative/ -[10]:http://limetext.org/ -[11]:https://github.com/limetext/lime -[12]:http://lighttable.com/ -[13]:https://github.com/LightTable/LightTable -[14]:http://itsfoss.com/notepadqq-notepad-for-linux/ -[15]:http://itsfoss.com/scite-the-notepad-for-linux/ diff --git a/translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md b/translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md new file mode 100644 index 0000000000..d64d84881f --- /dev/null +++ b/translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md @@ -0,0 +1,87 @@ +4个最流行的Linux平台开源代码编辑器 +=== + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Best_Open_Source_Editors.jpeg) + +寻找**Linux平台最棒的代码编辑器**?如果你询问那些很早就玩Linux的人，他们会回答是Vi, Vim, Emacs, Nano等。但是，我今天不讨论那些。我将谈论一些新时代, 最权威的, 漂亮的, 时髦但十分强大, 功能丰富的**最好的Linux平台开源代码编辑器**，它们将会提升你的编程经验。 + +### Linux平台最时髦的开源代码编辑器 ### + +我使用Ubunt作为我的主桌面，所以我提供的安装说明是基于Ubuntu发布的操作系统。但是这并不意味着本文列表就可以作为**Ubuntu最好的文本编辑器**，因为本列表是适用于任何Linux发布操作系统的。而且，列表的介绍顺序并没有特定的优先级别。 + +#### Brackets #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/brackets_UI.jpeg) + +[Brackets][1]是出自[Adobe][2]的一个开源代码编辑器。它专门关注web设计者的需求，内置支持HTML, CSS和Java Script。它轻量级，但却十分强大，提供在线编辑和实时预览。而且，为了你能更好地体验Brackets，你可以使用许多可用的插件。 + +为了[在Ubuntu][3]，以及其余基于Ubuntu发布的版本，诸如Linux Minit上安装Brackets，你可以使用这个非官方的PPA源： + + sudo add-apt-repository ppa:webupd8team/brackets + sudo apt-get update + sudo apt-get install brackets + +其他的Linux发行版本，你可以通过下载源代码或相应Linux, OS X和Windows的二进制文件，进行安装。 + +- [下载Brackets源码和二进制文件][5] + +#### Atom #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/08/Atom_Editor.jpeg) + +[Atom][5]是为程序员准备的另一个时髦开源代码编辑器。Atom由Github开发，被誉为“21世纪可破解的文本编辑器”。Atom的界面和Sublime Text编辑器十分相似。Sublime Text是一个十分流行但闭源的文本编辑器。 + +Atom最近已经发布了 .deb 和 .rpm包，所以在Debian和基于Fedora的Linux版本上安装很简单。当然，你也可以获取它的源代码。 + +- [下载Atom .deb][6] +- [下载Atom .rpm][7] +- [获取Atom源代码][8] + +#### Lime Text ### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/08/LimeTextEditor.jpeg) + +如果你喜欢Sublime Text，但是你对它的闭源十分反感。别担心，我们有一个[Sublime Text的开源克隆][9]，叫做[Lime Text][10]。它基于Go, HTML和QT构造。说它是Sublime Text的克隆，背后原因是Sublime Text2仍有许多bug，而且Sublime Text3到目前为止仍处于测试版本。Sublime Text的开发过程中的bug是否修复，外界并不知情。 + +所以，开源爱好者们，你们可以很开心地通过下面的连接获得Lime Text的源码： + +- [获取Lime Text源码][11] + +#### Light Table #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Light_Table.jpeg) + +被誉为“下一个时代的代码编辑器”，[Light Table][12]是另一个时髦，功能丰富的开源编辑器，它更像是一个IDE，而非仅仅是一个文本编辑器。并且，有许多可以提高其性能的扩展方法。内联评价将是你会爱上它的原因。你一定要去使用看看，这样你才会体会它的实用之处。 + +- [获取Light Table的源码][13] + +### 你的选择是什么? ### + +在Linux平台，我们不能只局限于这四种代码编辑器。这份列表仅介绍了一些时髦的，可供程序员使用的编辑器。当然，你也有许多其他的选择，比如[Notepad++的替代品Notepadqq][14]或者[SciTE][15]，等等还有其余一些。所以，这四个中，你最喜欢哪个呢? + +--- + +via: http://itsfoss.com/best-modern-open-source-code-editors-for-linux/ + +作者：[Abhishek][a] +译者：[su-kaiyao](https://github.com/su-kaiyao) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:http://brackets.io/ +[2]:http://www.adobe.com/ +[3]:http://itsfoss.com/install-brackets-ubuntu/ +[4]:https://github.com/adobe/brackets/releases +[5]:https://atom.io/ +[6]:https://atom.io/download/deb +[7]:https://atom.io/download/rpm +[8]:https://github.com/atom/atom/blob/master/docs/build-instructions/linux.md +[9]:http://itsfoss.com/lime-text-open-source-alternative/ +[10]:http://limetext.org/ +[11]:https://github.com/limetext/lime +[12]:http://lighttable.com/ +[13]:https://github.com/LightTable/LightTable +[14]:http://itsfoss.com/notepadqq-notepad-for-linux/ +[15]:http://itsfoss.com/scite-the-notepad-for-linux/ From d8838e11815aba6c3cbb21ed04ca6fb3bb0d9616 Mon Sep 17 00:00:00 2001 From: zheng Date: Mon, 2 Feb 2015 22:04:34 +0800 Subject: [PATCH 142/207] translated --- ...Python Tool To Test Your Internet Speed.md | 78 ------------------- ...Python Tool To Test Your Internet Speed.md | 76 ++++++++++++++++++ 2 files changed, 76 insertions(+), 78 deletions(-) delete mode 100644 sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md create mode 100644 translated/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md diff --git a/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md b/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md deleted file mode 100644 index 2a48ca6deb..0000000000 --- a/sources/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md +++ /dev/null @@ -1,78 +0,0 @@ -Translating-----geekpi - -tespeed - Python Tool To Test Your Internet Speed -================================================================================ -Many computer nerds know how to test their internet speed by using the **speedtest.net** but the thing is that it does not give you full control of the operationg going on during the measurement of your speed. Linux users love to type commands on their terminal emualator and do stuff, at least me. - -The tespeed tool is a python tool with many features that helps to test network speed from the terminal. According to the documentation it makes use of nearest speedtest.net server but the users can also manually specify one. - -In the beginning the author wrote the tespeed tool in the php programming language and proved to the ISP he was working for at that time that the internet they served was far from what they advertised. But things were not working all the time as they supposed to be so the author ported his php scripts to python and his tool counts 180 stars on github. - -It means **alot**. - -### How to use tespeed on linux ### - -Before running a python application on your machine you have to make sure that the system you are working meets the dependencies required by the tool. The python tool tespeed dependes on the two following python packages: - -- lxml -- SocksiPy - -You can easily install lxml with the help of the pip python package management system and to do that run the following command. - - pip install lxml - -Now we have to perform a simple trick to make use of the SocksiPy which you can download by using the the following command like shown below. - - wget http://sourceforge.net/projects/socksipy/files/socksipy/SocksiPy%201.00/SocksiPy.zip/ - -Once the installation is finished unzip **SocksiPy.zip** and run the following command to clone tespeed repo on your local machine. - - git clone https://github.com/Janhouse/tespeed.git - -Then place the SocksiPy folder inside the tespeed project you cloned. Now we have to create an empety file inside the SocksiPy folder under the name of **__init__.py** like shown in the following screenshot. - -![simple trick to make tespeed work](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed1.png) - -Now that we have fixed the dependencies for out projet we can easily run it by using the following command. - - python tespeed.py - -Then some magic is going to happen. The application is going to test your download and upload speed and display them in your console using some really nice colors. - -![testing download and upload speed with tespeed python application](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed2.png) - -There are many commands available in tespeed such as the option **-ls** to list the servers, option **-p** to specify and use a proxy server, the option **-s** to suppress debugging (STDERR) output and many others that we will explore in this tutorial. - -For example if you want to display results in mebibits you need to use the command **python tespeed.py** followed by the option **-mib** - - python tespeed.py -mib - -You can easily see how the unit used for measurement of the internet speed changed after using the tespeed app with the option -mib. - -![testing internet speed with tespeed python application](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed3.png) - -A very nice useful option I like to use while working with tespeed is the option -w which can be used to print CSV formated output to STDOUT. - - python tespeed.py -w - -Use the following command to list the servers. - - python tespeed -ls - -After running the above command you will get a list of servers used to test your upload and download speed. My list is really long so I am not going to share it in this tutorial. - -### Conclusion ### - -tespeed is a really easy to use high performance python script that helps computer users to test their upload and download speed by typing commands on their terminal. It supports many options and also you can specify the list of servers you would like to use. Keep playing with tespeed and please share your experience with us in the comment section. - --------------------------------------------------------------------------------- - -via: http://linoxide.com/tools/tespeed-python-tool-test-internet-speed/ - -作者：[Oltjano Terpollari][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linoxide.com/author/oltjano/ \ No newline at end of file diff --git a/translated/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md b/translated/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md new file mode 100644 index 0000000000..99bfab9842 --- /dev/null +++ b/translated/tech/20150202 tespeed - Python Tool To Test Your Internet Speed.md @@ -0,0 +1,76 @@ +tespeed - 测试网速的Python工具 +================================================================================ +许多电脑呆子知道可以用**speedtest.net**测试网速，但是这个不能在测试中给你足够的控制。Linux用户喜欢在终端中输入命令来完成任务，至少对我是这样的。 + +tespeed是一款有很多特性的python工具，可以在终端在测试网速。根据文档，它利用了speedtest.net的服务器，但是用户可以手动指定。 + +最初作者用php语言写了tespeed工具，并且证明了ISP提供的网络远低于它广告中所说的那样。但是事情并不是一直如它们想的那样，因此作者移植他的php脚本到python中并且他的工具在github中已经有180个star了。 + +这意味着**alot**。 + +### 如何在linux中测试tespeed ### + +在你电脑上运行这个python程序前先确保系统已经满足了这个工具的依赖。tespeed依赖下面两个包： + +- lxml +- SocksiPy + +你可以用pip包管理系统来安装lxml，只要用下面的命令就行。 + + pip install lxml + +现在我们需要输入下面的命令来下载安装SocksiPy。 + + wget http://sourceforge.net/projects/socksipy/files/socksipy/SocksiPy%201.00/SocksiPy.zip/ + +下载完成后 解压**SocksiPy.zip**病运行下面的命令来克隆tespeed仓库到你本地机器中。 + + git clone https://github.com/Janhouse/tespeed.git + +接着把SocksiPy文件夹放到你克隆下来的tespeed项目中。现在我们要像截图那样在SocksPy中的**__init__.py**下面创建一个空文件。 + +![simple trick to make tespeed work](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed1.png) + +现在我们已经解决了项目的依赖问题，我们可以用下面的命令运行了。 + + python tespeed.py + +接下来就会发生一些神奇的事了。程序会测试你的下载和上传速度并且在你的终端中用漂亮的颜色显示出来。 + +![testing download and upload speed with tespeed python application](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed2.png) + +在tespeed中有很多选项，如**-ls**来现实服务器，**-p**来指定代理服务器， **-s**来阻止调试(STDERR)输出, 还有很多我们会在本教程中探索。 + +如果你想要结果现实成MB，你可以在**python tespeed.py** 后面接上选项 **-mib**。 + + python tespeed.py -mib + +在你使用了-mib选项后你可以看到计量网速的单位改变了。 + +![testing internet speed with tespeed python application](http://blog.linoxide.com/wp-content/uploads/2015/01/tespeed3.png) + +我非常喜欢用的一个选项是-w，它可以把标准输出转化成CSV格式。 + + python tespeed.py -w + +使用下面的命令来列出服务器。 + + python tespeed -ls + +运行上面的命令后，你会看到可以用于测试上传和下载速度的服务器列表。我的列表非常长，所以我不会在教程中共享了。 + +### 总结 ### + +=tespeed的确是一款帮助用户在终端中测试上传和下载速度的高性能python脚本。它支持很多的选项并且你可以指定列表中你想使用的服务器。继续使用tespeed并在留言区写下你们的体验吧。 + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/tools/tespeed-python-tool-test-internet-speed/ + +作者：[Oltjano Terpollari][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/oltjano/ \ No newline at end of file From dadfa460067915d0863207f5100ed9eba41a3813 Mon Sep 17 00:00:00 2001 From: geekpi Date: Tue, 3 Feb 2015 10:52:43 +0800 Subject: [PATCH 143/207] translating --- ...0202 How To Install Websvn for Subversion in CentOS 7.0.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md b/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md index 0a9dfdb442..5d782a80e4 100644 --- a/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md +++ b/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md @@ -1,3 +1,5 @@ +Translating----geekpi + How To Install Websvn for Subversion in CentOS 7.0 ================================================================================ Hi all, today we'll be installing latest WebSVN in our CentOS 7 for subversion repositories. @@ -120,4 +122,4 @@ via: http://linoxide.com/linux-how-to/install-websvn-subversion-centos-7/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://linoxide.com/author/arunp/ -[1]:http://www.websvn.info/features/ \ No newline at end of file +[1]:http://www.websvn.info/features/ From 6fffa54187f40ffcc2a2d89a9c3aaf8ff1529200 Mon Sep 17 00:00:00 2001 From: geekpi Date: Tue, 3 Feb 2015 11:39:53 +0800 Subject: [PATCH 144/207] translated --- ...all Websvn for Subversion in CentOS 7.0.md | 125 ------------------ ...all Websvn for Subversion in CentOS 7.0.md | 124 +++++++++++++++++ 2 files changed, 124 insertions(+), 125 deletions(-) delete mode 100644 sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md create mode 100644 translated/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md diff --git a/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md b/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md deleted file mode 100644 index 5d782a80e4..0000000000 --- a/sources/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md +++ /dev/null @@ -1,125 +0,0 @@ -Translating----geekpi - -How To Install Websvn for Subversion in CentOS 7.0 -================================================================================ -Hi all, today we'll be installing latest WebSVN in our CentOS 7 for subversion repositories. - -WebSVN offers a view onto your subversion repositories that’s been designed to reflect the Subversion methodology. We can view the log of any file or directory and see a list of all the files changed, added or deleted in any given revision. We can also view the differences between two versions of a file so as to see exactly what was changed in a particular revision. - -### Features ### - -WebSVN offers the following features: - -- Easy to use interface -- Customisable templating system -- Colourisation of file listings -- Blame view -- Log message searching -- RSS feed support -- [and more...][1] - -Since it's written using PHP, WebSVN is also very portable and easy to install. - -Now, we'll install WebSVN for our Subversion (Apache SVN). Make sure that you have installed Apache SVN in your server. If you don't have it installed, you can install from this tutorial. - -After you installed Apache SVN(Subversion), you'll need to follow the easy steps below. - -### 1. Download WebSVN ### - -You can download WebSVN from their official site http://www.websvn.info/download/ . We'll first get inside directory /var/www/html/ and then download the package inside it. - - $ sudo -s - -**Please execute the above command in a shell or terminal as wee'll need to switch to root privilege so that we'll have full access to the system's restricted areas.** - - # cd /var/www/html - # wget http://websvn.tigris.org/files/documents/1380/49057/websvn-2.3.3.zip - -![downloading websvn package](http://blog.linoxide.com/wp-content/uploads/2015/01/downloading-websvn.png) - -Here, I am download the latest version 2.3.3 of websvn. You can get the link from the site. You can simply replace the above link with the link of the package you wanna install. - -### 2. Extract the downloaded zip ### - - # unzip websvn-2.3.3.zip - - # mv websvn-2.3.3 websvn - -![extracting websvn](http://blog.linoxide.com/wp-content/uploads/2015/01/extracting-websvn.png) - -### 3. Install php ### - - # yum install php - -![yum install php](http://blog.linoxide.com/wp-content/uploads/2015/01/yum-install-php.png) - -### 4. Edit WebSVN config ### - -Now, we'll need to copy distconfig.php which is situated inside /var/www/html/websvn/include directory to config.php and then edit the configuration file. - - # cd /var/www/html/websvn/include - - # cp distconfig.php config.php - - # nano config.php - -Now, we'll need to make changes to the file as shown below. After it is done, please save the file and exit. - - // Configure these lines if your commands aren't on your path. - // - $config->setSVNCommandPath('/usr/bin'); // e.g. c:\\program files\\subversion\\bin - $config->setDiffPath('/usr/bin'); - - // For syntax colouring, if option enabled... - $config->setEnscriptPath('/usr/bin'); - $config->setSedPath('/bin'); - - // For delivered tarballs, if option enabled... - $config->setTarPath('/bin'); - - // For delivered GZIP'd files and tarballs, if option enabled... - $config->setGZipPath('/bin'); - - // - $config->parentPath('/svn/'); - - $extEnscript[".pl"] = "perl"; - $extEnscript[".py"] = "python"; - $extEnscript[".sql"] = "sql"; - $extEnscript[".java"] = "java"; - $extEnscript[".html"] = "html"; - $extEnscript[".xml"] = "html"; - $extEnscript[".thtml"] = "html"; - $extEnscript[".tpl"] = "html"; - $extEnscript[".sh"] = "bash"; - -![websvn config file](http://blog.linoxide.com/wp-content/uploads/2015/01/config-file-websvn.png) - -### 5. Starting WebSVN ### - -Now, we are almost done. We now need to restart our Apache server. You can do that by the command below. - - # systemctl restart httpd.service - -And then, we'll open WebSVN inside our favorite browser with the address as http://Ip-address/websvn or if you are on local computer, you can goto http://localhost/websvn . - -![websvn successfully installed](http://blog.linoxide.com/wp-content/uploads/2015/01/websvn-success.png) - -**Note**: If you encountered error like "Unable to find "enscript" tool at location "/usr/bin/enscript"" then, you'll need to install enscript using the command "yum install enscript" which will fix the problem. - -### Conclusion ### - -Hurray, we have completed installing WebSVN in our CentOS 7 server. This tutorial works great on RHEL 7 too. WebSVN offers a view onto your subversion repositories that’s been designed to reflect the subversion methodology. You can view the log of any file or directory and see a list of all the files changed, added or deleted in any given revision. So, if you have any questions, comments, feedback please do write on the comment box below and let us know what stuffs needs to be added or improved. Thank You! Enjoy WebSVN :-) - --------------------------------------------------------------------------------- - -via: http://linoxide.com/linux-how-to/install-websvn-subversion-centos-7/ - -作者：[Arun Pyasi][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linoxide.com/author/arunp/ -[1]:http://www.websvn.info/features/ diff --git a/translated/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md b/translated/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md new file mode 100644 index 0000000000..35af70fc51 --- /dev/null +++ b/translated/tech/20150202 How To Install Websvn for Subversion in CentOS 7.0.md @@ -0,0 +1,124 @@ +如何在CentOS 7.0上为Subverison安装Websvn +================================================================================ +大家好，今天我们会在CentOS 7.0 上为subversion安装WebSVN。 + +WebSVN提供了Svbverion中的各种方法来查看你的仓库。我们可以看到任何给定版本的任何文件或者目录的日志并且看到所有文件改动、添加、删除的列表。我们同样可以看到两个版本间的不同来知道特定版本改动了什么。 + + +### 特性 ### + +WebSVN提供了下面这些特性: + +- 易于使用的用户界面 +- 可定制的模板系统 +- 色彩化的文件列表 +- blame 视图 +- 日志信息查询 +- RSS支持 +- [更多][1] + +由于使用PHP写成，WebSVN同样易于移植和安装。 + +现在我们将为Subverison(Apache SVN)安装WebSVN。请确保你的服务器上已经安装了Apache SVN。如果你还没有安装，你可以在本教程中安装。 + +After you installed Apache SVN(Subversion), you'll need to follow the easy steps below.安装完Apache SVN（Subversion）后，你需要以下几步。 + +### 1. 下载 WebSVN ### + +你可以从官方网站http://www.websvn.info/download/中下载WebSVN。我们首先进入/var/www/html/并在这里下载安装包。 + + $ sudo -s + +**请在shell或者终端中执行上面的命令，因为我们需要切换到root权限来对系统限制区域有访问权。** + + # cd /var/www/html + # wget http://websvn.tigris.org/files/documents/1380/49057/websvn-2.3.3.zip + +![downloading websvn package](http://blog.linoxide.com/wp-content/uploads/2015/01/downloading-websvn.png) + +这里，我下载的是最新的2.3.3版本的websvn。你可以从这个网站得到链接。你可以用你要安装的包的链接来替换上面的链接。 + +### 2. 解压下载的zip ### + + # unzip websvn-2.3.3.zip + + # mv websvn-2.3.3 websvn + +![extracting websvn](http://blog.linoxide.com/wp-content/uploads/2015/01/extracting-websvn.png) + +### 3. 安装php ### + + # yum install php + +![yum install php](http://blog.linoxide.com/wp-content/uploads/2015/01/yum-install-php.png) + +### 4. 编辑WebSVN配置 ### + +现在，我们需要拷贝位于/var/www/html/websvn/include的distconfig.php为config.php,并且接着编辑配置文件。 + + # cd /var/www/html/websvn/include + + # cp distconfig.php config.php + + # nano config.php + +现在我们需要按如下改变文件。这完成之后，请保存病退出。 + + // Configure these lines if your commands aren't on your path. + // + $config->setSVNCommandPath('/usr/bin'); // e.g. c:\\program files\\subversion\\bin + $config->setDiffPath('/usr/bin'); + + // For syntax colouring, if option enabled... + $config->setEnscriptPath('/usr/bin'); + $config->setSedPath('/bin'); + + // For delivered tarballs, if option enabled... + $config->setTarPath('/bin'); + + // For delivered GZIP'd files and tarballs, if option enabled... + $config->setGZipPath('/bin'); + + // + $config->parentPath('/svn/'); + + $extEnscript[".pl"] = "perl"; + $extEnscript[".py"] = "python"; + $extEnscript[".sql"] = "sql"; + $extEnscript[".java"] = "java"; + $extEnscript[".html"] = "html"; + $extEnscript[".xml"] = "html"; + $extEnscript[".thtml"] = "html"; + $extEnscript[".tpl"] = "html"; + $extEnscript[".sh"] = "bash"; + +![websvn config file](http://blog.linoxide.com/wp-content/uploads/2015/01/config-file-websvn.png) + +### 5. 启动 WebSVN ### + +现在，我们将近完成了。现在需要重启Apache服务。你可以用下面的命令。 + + # systemctl restart httpd.service + +接着我们在浏览器中打开WebSVN，输入http://Ip-address/websvn，或者你在本地的话，你可以输入http://localhost/websvn。 + +![websvn successfully installed](http://blog.linoxide.com/wp-content/uploads/2015/01/websvn-success.png) + +**注意**: 如果你遇到一个像"Unable to find "enscript" tool at location "/usr/bin/enscript"这样的问题，那么你需要使用“yum install enscript”安装enscript来修复这个问题。 + +### 总结 ### + +好了，我们已经在CentOS 7上哇安城WebSVN的安装了。这个教程同样适用于RHEL 7。WebSVN提供了Svbverion中的各种方法来查看你的仓库。你可以看到任何给定版本的任何文件或者目录的日志并且看到所有文件改动、添加、删除的列表。如果你有任何问题、评论、反馈请在下面的评论栏中留下，来让我们知道该添加什么和改进。谢谢！享受WebSVN吧。:-) + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-how-to/install-websvn-subversion-centos-7/ + +作者：[Arun Pyasi][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/arunp/ +[1]:http://www.websvn.info/features/ From 95b1822fc70f7b4958ce7db70c7eaf0f50a8081f Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Tue, 3 Feb 2015 15:49:14 +0800 Subject: [PATCH 145/207] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Modern Open Source Code Editors For Linux.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md b/translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md index d64d84881f..6072c2b759 100644 --- a/translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md +++ b/translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md @@ -3,11 +3,11 @@ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Best_Open_Source_Editors.jpeg) -寻找**Linux平台最棒的代码编辑器**?如果你询问那些很早就玩Linux的人，他们会回答是Vi, Vim, Emacs, Nano等。但是，我今天不讨论那些。我将谈论一些新时代, 最权威的, 漂亮的, 时髦但十分强大, 功能丰富的**最好的Linux平台开源代码编辑器**，它们将会提升你的编程经验。 +寻找**Linux平台最棒的代码编辑器**?如果你询问那些很早就玩Linux的人，他们会回答是Vi, Vim, Emacs, Nano等。但是，我今天不讨论那些。我将谈论一些新时代尖端、漂亮、时髦而且十分强大, 功能丰富的**最好的Linux平台开源代码编辑器**，它们将会提升你的编程经验。 ### Linux平台最时髦的开源代码编辑器 ### -我使用Ubunt作为我的主桌面，所以我提供的安装说明是基于Ubuntu发布的操作系统。但是这并不意味着本文列表就可以作为**Ubuntu最好的文本编辑器**，因为本列表是适用于任何Linux发布操作系统的。而且，列表的介绍顺序并没有特定的优先级别。 +我使用Ubuntu作为我的主桌面，所以我提供的安装说明是基于Ubuntu的发行版。但是这并不意味着本文列表就是**Ubuntu最好的文本编辑器**，因为本列表是适用于任何Linux发行版。而且，列表的介绍顺序并没有特定的优先级别。 #### Brackets #### @@ -15,7 +15,7 @@ [Brackets][1]是出自[Adobe][2]的一个开源代码编辑器。它专门关注web设计者的需求，内置支持HTML, CSS和Java Script。它轻量级，但却十分强大，提供在线编辑和实时预览。而且，为了你能更好地体验Brackets，你可以使用许多可用的插件。 -为了[在Ubuntu][3]，以及其余基于Ubuntu发布的版本，诸如Linux Minit上安装Brackets，你可以使用这个非官方的PPA源： +为了[在Ubuntu][3]，以及其它基于Ubuntu的发行版，诸如Linux Minit上安装Brackets，你可以使用这个非官方的PPA源： sudo add-apt-repository ppa:webupd8team/brackets sudo apt-get update @@ -29,7 +29,7 @@ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/08/Atom_Editor.jpeg) -[Atom][5]是为程序员准备的另一个时髦开源代码编辑器。Atom由Github开发，被誉为“21世纪可破解的文本编辑器”。Atom的界面和Sublime Text编辑器十分相似。Sublime Text是一个十分流行但闭源的文本编辑器。 +[Atom][5]是为程序员准备的另一个时尚开源代码编辑器。Atom由Github开发，被誉为“21世纪可破解的文本编辑器”。Atom的界面和Sublime Text编辑器十分相似。Sublime Text是一个十分流行但闭源的文本编辑器。 Atom最近已经发布了 .deb 和 .rpm包，所以在Debian和基于Fedora的Linux版本上安装很简单。当然，你也可以获取它的源代码。 @@ -41,7 +41,7 @@ Atom最近已经发布了 .deb 和 .rpm包，所以在Debian和基于Fedora的Li ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/08/LimeTextEditor.jpeg) -如果你喜欢Sublime Text，但是你对它的闭源十分反感。别担心，我们有一个[Sublime Text的开源克隆][9]，叫做[Lime Text][10]。它基于Go, HTML和QT构造。说它是Sublime Text的克隆，背后原因是Sublime Text2仍有许多bug，而且Sublime Text3到目前为止仍处于测试版本。Sublime Text的开发过程中的bug是否修复，外界并不知情。 +如果你喜欢Sublime Text，但是你对它的闭源十分反感。别担心，我们有一个[Sublime Text的开源克隆][9]，叫做[Lime Text][10]。它基于Go, HTML和QT构造。说它是Sublime Text的克隆，背后原因是Sublime Text2仍有许多bug，而且Sublime Text3到目前为止仍处于测试版本。Sublime Text在开发过程中的bug是否修复，外界并不知情。 所以，开源爱好者们，你们可以很开心地通过下面的连接获得Lime Text的源码： @@ -51,13 +51,13 @@ Atom最近已经发布了 .deb 和 .rpm包，所以在Debian和基于Fedora的Li ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Light_Table.jpeg) -被誉为“下一个时代的代码编辑器”，[Light Table][12]是另一个时髦，功能丰富的开源编辑器，它更像是一个IDE，而非仅仅是一个文本编辑器。并且，有许多可以提高其性能的扩展方法。内联评价将是你会爱上它的原因。你一定要去使用看看，这样你才会体会它的实用之处。 +被誉为“下一代的代码编辑器”，[Light Table][12]是另一个时髦，功能丰富的开源编辑器，它更像是一个IDE，而非仅仅是一个文本编辑器。并且，有许多可以提高其性能的扩展方法。内联评价将是你会爱上它的原因。你一定要试用一下看，这样你才会体会它的实用之处。 - [获取Light Table的源码][13] ### 你的选择是什么? ### -在Linux平台，我们不能只局限于这四种代码编辑器。这份列表仅介绍了一些时髦的，可供程序员使用的编辑器。当然，你也有许多其他的选择，比如[Notepad++的替代品Notepadqq][14]或者[SciTE][15]，等等还有其余一些。所以，这四个中，你最喜欢哪个呢? +在Linux平台，我们不能只局限于这四种代码编辑器。这份列表仅介绍了一些时髦的，可供程序员使用的编辑器。当然，你也有许多其他的选择，比如[Notepad++的替代品Notepadqq][14]或者[SciTE][15]等等。那么，文中这四个编辑器，你最喜欢哪个呢? --- @@ -65,7 +65,7 @@ via: http://itsfoss.com/best-modern-open-source-code-editors-for-linux/ 作者：[Abhishek][a] 译者：[su-kaiyao](https://github.com/su-kaiyao) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 7b818dcaf786900b70e137007593267c507c4822 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Tue, 3 Feb 2015 16:23:46 +0800 Subject: [PATCH 146/207] =?UTF-8?q?20150203-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...s and Code Editors for JavaScript Users.md | 82 +++++++++++++++++++ ... Install KDE Plasma 5.2 In Ubuntu 14.10.md | 60 ++++++++++++++ ...t be opened correctly' on Google Chrome.md | 50 +++++++++++ 3 files changed, 192 insertions(+) create mode 100644 sources/talk/20150203 9 Best IDEs and Code Editors for JavaScript Users.md create mode 100644 sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md create mode 100644 sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md diff --git a/sources/talk/20150203 9 Best IDEs and Code Editors for JavaScript Users.md b/sources/talk/20150203 9 Best IDEs and Code Editors for JavaScript Users.md new file mode 100644 index 0000000000..83f5f11293 --- /dev/null +++ b/sources/talk/20150203 9 Best IDEs and Code Editors for JavaScript Users.md @@ -0,0 +1,82 @@ +9 Best IDEs and Code Editors for JavaScript Users +================================================================================ +Web designing and developing is one of the trending sectors in the recent times, where more and more peoples started to search for their career opportunities. But, Getting the right opportunity as a web developer or graphic designer is not just a piece of cake for everyone, It certainly requires a strong mind presence as well as right skills to find the find the right job. There are a lot of websites available today which can help you to get the right job description according to your knowledge. But still if you want to achieve something in this sector you must have some excellent skills like working with different platforms, IDEs and various other tools too. + +Talking about the different platforms and IDEs used for various languages for different purposes, gone is the time when we learn just one IDE and get the optimum solutions for our web design projects easily. Today we are living in the modern lifestyle where competition is getting more and more tough on every single day. Same is the case with the IDEs, IDE is basically a powerful client application for creating and deploying applications. Today we are going to share some best javascript IDE for web designers and developers. + +Please visit this list of best code editors for javascript user and share your thought with us. + +### 1) [Spket][1] ### + +**Spket IDE** is powerful toolkit for JavaScript and XML development. The powerful editor for JavaScript, XUL/XBL and Yahoo! Widget development. The JavaScript editor provides features like code completion, syntax highlighting and content outline that helps developers productively create efficient JavaScript code. + +![](http://i0.wp.com/devzum.com/wp-content/uploads/2015/01/spket-e1422674329554.png) + +### 2) [Ixedit][2] ### + +IxEdit is a JavaScript-based interaction design tool for the web. With IxEdit, designers can practice DOM-scripting without coding to change, add, move, or transform elements dynamically on your web pages. + +![](http://i0.wp.com/devzum.com/wp-content/uploads/2015/01/ixedit.png) + +### 3) [Komodo Edit][3] ### + +Komode is free and powerful code editor for Javascript and other programming languages. + +![](http://i2.wp.com/devzum.com/wp-content/uploads/2015/01/komodo-edit-e1422674596277.png) + +### 4) [EpicEditor][4] ### + +EpicEditor is an embeddable JavaScript Markdown editor with split fullscreen editing, live previewing, automatic draft saving, offline support, and more. For developers, it offers a robust API, can be easily themed, and allows you to swap out the bundled Markdown parser with anything you throw at it. + +![](http://i1.wp.com/devzum.com/wp-content/uploads/2015/01/epiceditor-e1422674732281.png) + +### 5) [codepress][5] ### + +CodePress is web-based source code editor with syntax highlighting written in JavaScript that colors text in real time while it’s being typed in the browser. + +![](http://i1.wp.com/devzum.com/wp-content/uploads/2015/01/codepres-e1422674893706.png) + +### 6) [ACe][6] ### + +Ace is an embeddable code editor written in JavaScript. It matches the features and performance of native editors such as Sublime, Vim and TextMate. It can be easily embedded in any web page and JavaScript application. + +![](http://i0.wp.com/devzum.com/wp-content/uploads/2015/01/ace-e1422675089912.png) + +### 7) [scripted][7] ### + +Scripted is a fast and lightweight code editor with an initial focus on JavaScript editing. Scripted is a browser based editor and the editor itself is served from a locally running Node.js server instance. + +![](http://i1.wp.com/devzum.com/wp-content/uploads/2015/01/scripted-e1422675188408.png) + +### 8) [Netbeans][8] ### + +This is another more impressive and useful code editors for javascript and other programming languages. + +![](http://i1.wp.com/devzum.com/wp-content/uploads/2015/01/code_editing1-e1422675506226.png) + +### 9) [Webstorm][9] ### + +This is the smartest ID for javascript. WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex client-side development and server-side development with Node.js. + +![](http://i0.wp.com/devzum.com/wp-content/uploads/2015/01/webstorm.png) + +-------------------------------------------------------------------------------- + +via: http://devzum.com/2015/01/31/9-best-ides-and-code-editors-for-javascript-users/ + +作者：[vikas][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://devzum.com/author/vikas/ +[1]:http://spket.com/ +[2]:http://www.ixedit.com/ +[3]:http://komodoide.com/komodo-edit/ +[4]:http://oscargodson.github.io/EpicEditor/ +[5]:http://codepress.sourceforge.net/ +[6]:http://ace.c9.io/#nav=about +[7]:https://github.com/scripted-editor/scripted +[8]:https://netbeans.org/ +[9]:http://www.jetbrains.com/webstorm/ \ No newline at end of file diff --git a/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md b/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md new file mode 100644 index 0000000000..cd1a5eb525 --- /dev/null +++ b/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md @@ -0,0 +1,60 @@ +How To Install KDE Plasma 5.2 In Ubuntu 14.10 +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Plasma_Ubuntu_1410.jpg) + +[KDE][1] Plasma 5.2 has been [released][2] and in this post we shall see how to install KDE Plasma 5.2 in Ubuntu 14.10. + +Ubuntu’s default desktop environment Unity is beautiful and packs quite some feature. But if you ask any experienced Linux user about desktop customization, his answer will be KDE. KDE is boss when it comes to customization and its popularity can be guessed that Ubuntu has an official KDE flavor, known as [Kubuntu][3]. + +A good thing about Ubuntu (or any other Linux OS for that matter) is that it doesn’t bind you with one particular desktop environment. You can always install additional desktop environments and choose to switch between them while keeping several desktop environments at the same time. Earlier, we have seen the installation of following desktop environments: + +- [How to install Mate desktop in Ubuntu 14.04][4] +- [How to install Cinnamon in Ubuntu 14.04][5] +- [How to install Budgie desktop in Ubuntu 14.04][6] +- [How to install GNOME Shell in Ubuntu 14.04][7] + +And today we shall see how to install KDE Plasma in Ubuntu 14.10. + +### Install KDE Plasma 5.2 in Ubuntu 14.04 ### + +Before you go on installing Plasma on Ubuntu 14.10, you should know that it will download around one GB of data. So consider your network speed and data package (if any) before opting for KDE installation. The PPA we are going to use for installing Plasma is the official PPA provided by the KDE community. Use the commands below in terminal: + + sudo apt-add-repository ppa:kubuntu-ppa/next-backports + sudo apt-get update + sudo apt-get dist-upgrade + sudo apt-get install kubuntu-plasma5-desktop plasma-workspace-wallpapers + +During the installation, it will as you to choose the default display manager. I chose the default LightDM. Once installed, restart the system. At the login, click on the Ubuntu symbol beside the login field. In here, select Plasma. + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Select_Plasma_KDE_Ubuntu.jpeg) + +You’ll be logged in to KDE Plasma now. Here is a quick screenshot of how KDE Plasma 5.2 looks like in Ubuntu 14.10: + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/KDE_Plasma_Desktop.jpeg) + +### Remove KDE Plasma from Ubuntu ### + +If you want to revert the changes, use the following commands to get rid of KDE Plasma from Ubuntu 14.10. + + sudo apt-get install ppa-purge + sudo apt-get remove kubuntu-plasma5-desktop + sudo ppa-purge ppa:kubuntu-ppa/next + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/install-kde-plasma-ubuntu-1410/ + +作者：[Abhishek][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:https://www.kde.org/ +[2]:https://dot.kde.org/2015/01/27/plasma-52-beautiful-and-featureful +[3]:http://www.kubuntu.org/ +[4]:http://itsfoss.com/install-mate-desktop-ubuntu-14-04/ +[5]:http://itsfoss.com/install-cinnamon-24-ubuntu-1404/ +[6]:http://itsfoss.com/install-budgie-desktop-ubuntu-1404/ +[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ \ No newline at end of file diff --git a/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md b/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md new file mode 100644 index 0000000000..0608359029 --- /dev/null +++ b/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md @@ -0,0 +1,50 @@ +Linux FAQs with Answers--How to fix “Your profile could not be opened correctly” on Google Chrome +================================================================================ +> **Question**: When I open Google Chrome web browser on my Linux box, I have several pop-up messages saying "Your profile could not be opened correctly." This error happens every time I open Google Chrome. How can I solve this error? + +When you see an error message saying "Your profile could not be opened correctly" on your Google Chrome web browser," that is because somehow your profile data on Google Chrome got corrupted. This can happen while you upgrade your Google Chrome browser manually on Linux. + +![](https://farm8.staticflickr.com/7428/16238502737_27bdda6685_o.png) + +Depending on exactly which file got corrupted, you can try one of these methods. + +### Method One ### + +Close all your Chrome browser windows/tabs. + +Go to ~/.config/google-chrome/Default, and remove/rename "Web Data" file as below. + + $ cd ~/.config/google-chrome/Default + $ rm "Web Data" + +Re-open Google Chrome browser. + +### Method Two ### + +Close all your Chrome browser windows/tabs. + +Go to ~/.config/google-chrome/"Profile 1", and rename "History" file as below. + + $ cd ~/.config/google-chrome/"Profile 1" + $ mv History History.bak + +Re-open Google Chrome browser. + +### Method Three ### + +If the problem still persists, you can remove the Default profile folder (~/.config/google-chrome/Default) altogether. Note that by doing so, you will lose all previously opened Google tabs, imported bookmarks, browsing history, sign-in data, etc. + +Before removing it, first close all your Chrome browser windows/tabs. + + $ rm -rf ~/.config/google-chrome/Default + +After restarting Google Chrome, the folder ~/.config/google-chrome/Default will automatically be re-generated. + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/your-profile-could-not-be-opened-correctly-google-chrome.html + +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 \ No newline at end of file From 4c4d31b2dca217f3a2be05a1f55c35a98979d1b4 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Tue, 3 Feb 2015 16:29:50 +0800 Subject: [PATCH 147/207] =?UTF-8?q?20150203-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sed Monitoring System In CentOS or RHEL.md | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md diff --git a/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md b/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md new file mode 100644 index 0000000000..51983921f6 --- /dev/null +++ b/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md @@ -0,0 +1,111 @@ +How To Install Linux-dash Web Based Monitoring System In CentOS/RHEL +================================================================================ +**Linux-dash** is a web-based lightweight monitoring dashboard for Linux machines. This application will display real-time, various system properties, such as CPU load, RAM usage, disk usage, Internet speed, network connections, RX/TX bandwidth, logged-in users, running processes etc. It will not store long term statistics, Thus it doesn’t have a backend database. + +In this article i will show you how to install and setup Linux dash, Here my web server is **Nginx**. + +### Installation ### + +First of all we should enable, [EPEL repository][1]. + +**Next, we need to install nginx with the following command.** + + sudo yum install nginx + +**Install php-fpm component** + + sudo yum install git php-common php-fpm + +Now, we have to configure nginx for Linux-dash. So create /etc/nginx/conf.d/linuxdash.conf as follows. + + sudo vim /etc/nginx/conf.d/linuxdash.conf + +---------- + + server { + server_name $domain_name; + listen 8080; + root /var/www; + index index.html index.php; + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + location ~* \.(?:xml|ogg|mp3|mp4|ogv|svg|svgz|eot|otf|woff|ttf|css|js|jpg|jpeg|gif|png|ico)$ { + try_files $uri =404; + expires max; + access_log off; + add_header Pragma public; + add_header Cache-Control "public, must-revalidate, proxy-revalidate"; + } + + location /linux-dash { + index index.html index.php; + } + + # PHP-FPM via sockets + location ~ \.php(/|$) { + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php-fpm.sock; + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + try_files $uri $uri/ /index.php?$args; + include fastcgi_params; + } + } + +**Next job is to configure php-fpm. Open /etc/php-fpm.d/www.conf in your Favorite editor.** + + sudo vim /etc/php-fpm.d/www.conf + +**Make sure to set “listen”, “user” and “group” fields as below. You can leave the rest of the configuration unchanged.** + + . . . + listen = /var/run/php-fpm.sock + user = nginx + group = nginx + . . . + +**Now, We are going to Download and install linux-dash under /var/www** + + git clone https://github.com/afaqurk/linux-dash.git + sudo cp -r linux-dash/ /var/www/ + sudo chown -R nginx:nginx /var/www + +**Next, restart Nginx web server as well as** php-fpm + + sudo service nginx restart + sudo service php-fpm restart + +**Set nginx and php-fpm to auto-start upon boot** + + sudo chkconfig nginx on + sudo chkconfig php-fpm on + +In this example, we have configured linux-dash to use TCP port 8080. So make sure that the firewall is not blocking TCP port 8080. + +### Monitor a Linux server with linux-dash ### + +You can access Linux-dash by pointing you browser to **http://:8080/linux-dash/** + +The web dashboard consists of several widgets, each of which displays particular system properties. You can customize the look of the web dashboard by rearranging and/or closing some of the widgets. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Lin-dash.png) + +Good day! + +See you guys with next article. + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/install-linux-dash-web-based-monitoring-system-centosrhel/ + +作者：[Jijo][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/jijo/ +[1]:http://www.unixmen.com/install-epel-repository-centos-rhel-7/ \ No newline at end of file From efab980f484535a0772de8fbd11c94b7a492f78f Mon Sep 17 00:00:00 2001 From: Vic___ Date: Tue, 3 Feb 2015 17:44:41 +0800 Subject: [PATCH 148/207] translated --- ...26 4 lvcreate Command Examples on Linux.md | 89 +++++++------------ 1 file changed, 30 insertions(+), 59 deletions(-) diff --git a/sources/tech/20150126 4 lvcreate Command Examples on Linux.md b/sources/tech/20150126 4 lvcreate Command Examples on Linux.md index bce08cc203..145f2c52ee 100644 --- a/sources/tech/20150126 4 lvcreate Command Examples on Linux.md +++ b/sources/tech/20150126 4 lvcreate Command Examples on Linux.md @@ -1,76 +1,74 @@ - Vic020 - -4 lvcreate Command Examples on Linux +在linux中4个lvcreate命令例子 ================================================================================ -Logical volume management (LVM) is a widely-used technique and extremely flexible disk management scheme. It basically contain three basic command : +逻辑卷管理（LVM）是广泛使用的技术，并拥有极其灵活磁盘管理方案。主要包含3个基础命令： -a. Creates the physical volumes using **pvcreate** -b. Create the volume group and add partition into volume group using **vgcreate** -c. Create a new logical volume using **lvcreate** +a. 创建物理卷使用**pvcreate** +b. 创建卷组并给卷组增加分区**vgcreate** +c. 创建新的逻辑卷使用**lvcreate** ![](http://www.ehowstuff.com/wp-content/uploads/2015/01/lvm-diagram1.jpg) -The following examples focus on the command to create a logical volume in an existing volume group, **lvcreate**. **lvcreate** is the command do allocating logical extents from the free physical extent pool of that volume group. Normally logical volumes use up any space available on the underlying physical volumes on a next-free basis. Modifying the logical volume will frees and reallocates space in the physical volumes. The following **lvcreate** command has been tested on linux CentOS 5, CentOS 6, CentOS 7, RHEL 5, RHEl 6 and RHEL 7 version. +随后的例子着重在已经存在的卷组上使用**lvcreate**创建逻辑卷。**lvcreate**命令可以在来自自由物理扩展池的卷组分配逻辑扩展。通常，逻辑卷可以随意使用底层逻辑卷上的任意空间。修改逻辑卷将释放或重新分配在物理卷空间。这些例子已经在CentOS 5, CentOS 6, CentOS 7, RHEL 5, RHEl 6 和 RHEL 7 版本中测试通过。 -### 4 lvcreate Command Examples on Linux : ### +### 4个lvcreate命令例子 ### -1. The following command creates a logical volume 15 gigabytes in size in the volume group vg_newlvm : +1. 在名为vg_newlvm卷组中创建15G大小的逻辑卷： [root@centos7 ~]# lvcreate -L 15G vg_newlvm -2. The following command creates a 2500 MB linear logical volume named centos7_newvol in the volume group -vg_newlvm, creating the block device /dev/vg_newlvm/centos7_newvol : +2. 在名为vg_newlvm中创建大小为2500MB的逻辑卷并命名centos7_newvol，创建块设备/dev/vg_newlvm/centos7_newvol： [root@centos7 ~]# lvcreate -L 2500 -n centos7_newvol vg_newlvm -3. You can use the -l argument of the **lvcreate** command to specify the size of the logical volume in extents. You can also use this argument to specify the percentage of the volume group to use for the logical volume. The following command creates a logical volume called centos7_newvol that uses 50% of the total space in volume group vg_newlvm : +3.可以使用**lvcreate**命令的参数-l，能指定一些特别的逻辑卷扩展大小。也可以使用这个参数以卷组的大小百分比来扩展逻辑卷。这下列的命令创建了centos7_newvol卷组的50%大小的逻辑卷vg_newlvm: [root@centos7 ~]# lvcreate -l 50%VG -n centos7_newvol vg_newlvm -4. The following command creates a logical volume called centos7_newvol that uses all of the unallocated space in the volume group vg_newlvm : +4. 使用卷组剩下的所有空间创建逻辑卷 [root@centos7 ~]# lvcreate --name centos7_newvol -l 100%FREE vg_newlvm -To see more **lvcreate** command options, issue the following command : +更多帮助，使用**lvcreate**命令--help选项来查看： [root@centos7 ~]# lvcreate --help ---------- +以下空号中是帮助字面翻译 - lvcreate: Create a logical volume + lvcreate: Create a logical volume（创建逻辑卷） lvcreate - [-A|--autobackup {y|n}] + [-A|--autobackup {y|n}]（自动备份） [-a|--activate [a|e|l]{y|n}] - [--addtag Tag] - [--alloc AllocationPolicy] - [--cachemode CacheMode] + [--addtag Tag]（增加标签） + [--alloc AllocationPolicy]（分配策略） + [--cachemode CacheMode]（Cache模式） [-C|--contiguous {y|n}] [-d|--debug] [-h|-?|--help] - [--ignoremonitoring] - [--monitor {y|n}] + [--ignoremonitoring]（忽略监听） + [--monitor {y|n}]（监听） [-i|--stripes Stripes [-I|--stripesize StripeSize]] [-k|--setactivationskip {y|n}] [-K|--ignoreactivationskip] - {-l|--extents LogicalExtentsNumber[%{VG|PVS|FREE}] | - -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]} + {-l|--extents LogicalExtentsNumber[%{VG|PVS|FREE}] |（逻辑扩展数） + -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]}（逻辑卷大小） [-M|--persistent {y|n}] [--major major] [--minor minor] - [-m|--mirrors Mirrors [--nosync] [{--mirrorlog {disk|core|mirrored}|--corelog}]] - [-n|--name LogicalVolumeName] + [-m|--mirrors Mirrors [--nosync] [{--mirrorlog {disk|core|mirrored}|--corelog}]]（镜像） + [-n|--name LogicalVolumeName]（逻辑卷名字） [--noudevsync] [-p|--permission {r|rw}] [--[raid]minrecoveryrate Rate] [--[raid]maxrecoveryrate Rate] - [-r|--readahead ReadAheadSectors|auto|none] - [-R|--regionsize MirrorLogRegionSize] - [-T|--thin [-c|--chunksize ChunkSize] + [-r|--readahead ReadAheadSectors|auto|none]（读取头扇区） + [-R|--regionsize MirrorLogRegionSize]（镜像逻辑区域尺寸） + [-T|--thin [-c|--chunksize ChunkSize]（块大小） [--discards {ignore|nopassdown|passdown}] [--poolmetadatasize MetadataSize[bBsSkKmMgG]]] [--poolmetadataspare {y|n}] - [--thinpool ThinPoolLogicalVolume{Name|Path}] + [--thinpool ThinPoolLogicalVolume{Name|Path}]精简池逻辑卷 [-t|--test] - [--type VolumeType] + [--type VolumeType]（卷类型） [-v|--verbose] [-W|--wipesignatures {y|n}] [-Z|--zero {y|n}] @@ -81,34 +79,7 @@ To see more **lvcreate** command options, issue the following command : { {-s|--snapshot} OriginalLogicalVolume[Path] | [-s|--snapshot] VolumeGroupName[Path] -V|--virtualsize VirtualSize} {-T|--thin} VolumeGroupName[Path][/PoolLogicalVolume] - -V|--virtualsize VirtualSize} - [-c|--chunksize] - [-A|--autobackup {y|n}] - [--addtag Tag] - [--alloc AllocationPolicy] - [-C|--contiguous {y|n}] - [-d|--debug] - [--discards {ignore|nopassdown|passdown}] - [-h|-?|--help] - [--ignoremonitoring] - [--monitor {y|n}] - [-i|--stripes Stripes [-I|--stripesize StripeSize]] - [-k|--setactivationskip {y|n}] - [-K|--ignoreactivationskip] - {-l|--extents LogicalExtentsNumber[%{VG|FREE|ORIGIN}] | - -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]} - [--poolmetadatasize MetadataVolumeSize[bBsSkKmMgG]] - [-M|--persistent {y|n}] [--major major] [--minor minor] - [-n|--name LogicalVolumeName] - [--noudevsync] - [-p|--permission {r|rw}] - [-r|--readahead ReadAheadSectors|auto|none] - [-t|--test] - [--thinpool ThinPoolLogicalVolume[Path]] - [-v|--verbose] - [--version] - [PhysicalVolumePath...] - + -V|--virtualsize VirtualSize}（ -------------------------------------------------------------------------------- via: http://www.ehowstuff.com/4-lvcreate-command-examples-on-linux/ From 82e8b17ba96bac350e7268dedf76bcd7a2d06dd6 Mon Sep 17 00:00:00 2001 From: Vic___ Date: Tue, 3 Feb 2015 17:45:42 +0800 Subject: [PATCH 149/207] Moved --- .../tech/20150126 4 lvcreate Command Examples on Linux.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {sources => translated}/tech/20150126 4 lvcreate Command Examples on Linux.md (100%) diff --git a/sources/tech/20150126 4 lvcreate Command Examples on Linux.md b/translated/tech/20150126 4 lvcreate Command Examples on Linux.md similarity index 100% rename from sources/tech/20150126 4 lvcreate Command Examples on Linux.md rename to translated/tech/20150126 4 lvcreate Command Examples on Linux.md From 3f7126d6278087366248336ab83ec47494693aa5 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Tue, 3 Feb 2015 17:51:12 +0800 Subject: [PATCH 150/207] Translating by ZTinoZ --- ...Linux FAQs with Answers--How to check CPU info on Linux.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md index a1cf20c2ce..c8e49ff8c8 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md @@ -24,7 +24,7 @@ cpufreq-info命令(**cpufrequtils**包的一部分)从内核/硬件中收集并 ### 3. cpuid ### -The cpuid command-line utility is a dedicated CPU information tool that displays verbose information about CPU hardware by using [CPUID functions][2]. Reported information includes processor type/family, CPU extensions, cache/TLB configuration, power management features, etc. +cpuid命令的功能就相当于一个专用的CPU信息工具，它能通过使用[CPUID功能][2]来显示详细的关于CPU硬件的信息。信息报告包括处理器类型/家族、CPU扩展指令集、缓存/TLB（译者注：传输后备缓冲器）配置、电源管理功能等等。 $ cpuid @@ -32,7 +32,7 @@ The cpuid command-line utility is a dedicated CPU information tool that displays ### 4. dmidecode ### -The dmidecode command collects detailed information about system hardware directly from DMI data of the BIOS. Reported CPU information includes CPU vendor, version, CPU flags, maximum/current clock speed, (enabled) core count, L1/L2/L3 cache configuration, and so on. +dmidecode命令直接从BIOS的DMI（译者注：桌面管理接口）数据收集关于系统硬件的具体信息。CPU信息报告包括CPU供应商、版本、CPU flags, maximum/current clock speed, (enabled) core count, L1/L2/L3 cache configuration, and so on. $ sudo dmidecode From 2424c72949939a22ad405ba66921df3f7cfc7a0f Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Tue, 3 Feb 2015 18:11:47 +0800 Subject: [PATCH 151/207] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ferent Directory on a Linux or Unix-like Systems.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md b/translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md index 34923b5ec3..ee9af03058 100644 --- a/translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md +++ b/translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md @@ -2,7 +2,7 @@ ================================================================================ 我想要解压一个tar文件到一个指定的目录叫/tmp/data。我该如何在Linux或者类Unix的系统中使用tar命令解压一个tar文件到不同的目录中？ -你不必使用cd名切换到其他的目录并解压。可以使用下面的语法解压一个文件： +你不必使用cd命令切换到其他的目录并解压。可以使用下面的语法解压一个文件： ### 语法 ### @@ -16,9 +16,9 @@ GNU/tar 语法： tar xf file.tar --directory /path/to/directory -### 示例：解压文件到另一个文件夹中 ### +### 示例：解压文件到另一个目录中 ### -在本例中。我解压$HOME/etc.backup.tar到文件夹/tmp/data中。首先，你需要手动创建这个目录，输入： +在本例中。我解压$HOME/etc.backup.tar到/tmp/data目录中。首先，需要手动创建这个目录，输入： mkdir /tmp/data @@ -56,8 +56,8 @@ via: http://www.cyberciti.biz/faq/howto-extract-tar-file-to-specific-directory-o 作者：[nixCraft][a] 译者：[geekpi](https://github.com/geekpi) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[a]:http://www.cyberciti.biz/tips/about-us \ No newline at end of file +[a]:http://www.cyberciti.biz/tips/about-us From 5015d4fefe1fe085a2725a259fd97da499a89525 Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 3 Feb 2015 22:14:23 +0800 Subject: [PATCH 152/207] PUB:20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems @geekpi --- ... Different Directory on a Linux or Unix-like Systems.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename {translated/tech => published}/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md (88%) diff --git a/translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md b/published/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md similarity index 88% rename from translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md rename to published/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md index ee9af03058..55866282e8 100644 --- a/translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md +++ b/published/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md @@ -1,6 +1,7 @@ -如何在Linux/类Unix系统中解压tar文件到不同的目录中 +如何解压 tar 文件到不同的目录中 ================================================================================ -我想要解压一个tar文件到一个指定的目录叫/tmp/data。我该如何在Linux或者类Unix的系统中使用tar命令解压一个tar文件到不同的目录中？ + +我想要解压一个tar文件到一个叫/tmp/data的指定目录。我该如何在Linux或者类Unix的系统中使用tar命令解压一个tar文件到不同的目录中？ 你不必使用cd命令切换到其他的目录并解压。可以使用下面的语法解压一个文件： @@ -34,7 +35,7 @@ GNU/tar 语法： ![Gif 01: tar Command Extract Archive To Different Directory Command](http://s0.cyberciti.org/uploads/faq/2015/01/tar-extract-archive-to-dir.gif) -Gif 01: tar命令解压文件到不同的目录 +*Gif 01: tar命令解压文件到不同的目录* 你也可以指定解压的文件： From a8d938713e7c7866125f94926cecd5d6d5adf0bc Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 3 Feb 2015 22:48:30 +0800 Subject: [PATCH 153/207] PUB:20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04 @Vic020 --- ...gration From 2.2 to 2.4 on Ubuntu 14.04.md | 58 +++++++++++++++++++ ...gration From 2.2 to 2.4 on Ubuntu 14.04.md | 56 ------------------ 2 files changed, 58 insertions(+), 56 deletions(-) create mode 100644 published/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md delete mode 100644 translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md diff --git a/published/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md b/published/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md new file mode 100644 index 0000000000..c18c9ed4f7 --- /dev/null +++ b/published/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md @@ -0,0 +1,58 @@ +在 Ubuntu 14.04 中Apache从2.2迁移到2.4的问题 +================================================================================ +如果你将**Ubuntu**从12.04升级跨越到了14.04的，那么这其中包括了一个重大的升级--**Apache**从2.2版本升级到2.4版本。**Apache**的这次升级带来了许多性能提升，**但是如果继续使用2.2的配置文件会导致很多错误**。 + +### 访问控制的改变 ### + +从**Apache 2.4**起所启用授权机制比起2.2的只是针对单一数据存储的单一检查更加灵活。过去很难确定哪个 order 授权怎样被使用的，但是授权容器指令的引入解决了这些问题，现在，配置可以控制什么时候授权方法被调用，什么条件决定何时授权访问。 + +这就是为什么大多数的升级失败是由于配置错误的原因。2.2的访问控制是基于IP地址、主机名和其他角色，通过使用指令Order，来设置Allow, Deny或 Satisfy；但是2.4，这些一切都通过新的授权方式进行检查。 + +为了弄清楚这些，可以来看一些虚拟主机的例子，这些可以在/etc/apache2/sites-enabled/default 或者 /etc/apache2/sites-enabled/*你的网站名称* 中找到: + +旧的2.2虚拟主机配置： + + Order allow,deny + Allow from all + +新的2.4虚拟主机配置： + + Require all granted + +![apache 2.4 config](http://blog.linoxide.com/wp-content/uploads/2014/12/apache-2.4-config.jpg) + +（LCTT 译注：Order、Allow和deny 这些将在之后的版本废弃，请尽量避免使用，Require 指令已可以提供比其更强大和灵活的功能。） + +### .htaccess 问题 ### + +升级后如果一些设置不工作，或者你得到重定向错误，请检查是否这些设置是放在.htaccess文件中。如果Apache 2.4没有使用 .htaccess 文件中的设置，那是因为在2.4中AllowOverride指令的默认是 none，因此忽略了.htaccess文件。你只需要做的就是修改或者添加AllowOverride All命令到你的网站配置文件中。 + +上面截图中，可以看见AllowOverride All指令。 + +### 丢失配置文件或者模块 ### + +根据我的经验，这次升级带来的另一个问题就是在2.4中，一些旧模块和配置文件不再需要或者不被支持了。你将会收到一条“Apache不能包含相应的文件”的明确警告，你需要做的是在配置文件中移除这些导致问题的配置行。之后你可以搜索和安装相似的模块来替代。 + +### 其他需要了解的小改变 ### + +这里还有一些其他的改变需要考虑，虽然这些通常只会发生警告，而不是错误。 + +- MaxClients重命名为MaxRequestWorkers，使之有更准确的描述。而异步MPM，如event，客户端最大连接数不等于工作线程数。旧的配置名依然支持。 +- DefaultType命令无效，使用它已经没有任何效果了。如果使用除了 none 之外的其它配置值，你会得到一个警告。需要使用其他配置设定来替代它。 +- EnableSendfile默认关闭 +- FileETag 现在默认为"MTime Size"（没有INode） +- KeepAlive 只接受“On”或“Off”值。之前的任何不是“Off”或者“0”的值都被认为是“On” +- 单一的 Mutex 已经替代了 Directives AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex 和 WatchdogMutexPath 等指令。你需要做的是估计一下这些被替代的指令在2.2中的使用情况，来决定是否删除或者使用Mutex来替代。 + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-how-to/apache-migration-2-2-to-2-4-ubuntu-14-04/ + +作者：[Adrian Dinu][a] +译者：[Vic020/VicYu](http://vicyu.net) +校对：[Caroline](https://github.com/carolinewuyan) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/adriand/ +[1]:http://httpd.apache.org/docs/2.4/ diff --git a/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md b/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md deleted file mode 100644 index 49c465d17d..0000000000 --- a/translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md +++ /dev/null @@ -1,56 +0,0 @@ -小贴士：在 Ubuntu 14.04 中Apache从2.2迁移到2.4的问题 -================================================================================ -如果你进行了一次**Ubuntu**从12.04到14.04的升级，那么它还包括了一个重大的升级--**Apache**从2.2版本升级到2.4版本。**Apache**的这次升级带来了许多性能提升，但是如果继续使用2.2的配置文件会导致很多错误。 - -### 访问控制的改变 ### - -从**Apache 2.4**起，授权（authorization）开始启用，比起2.2的一个检查一个数据存储，授权更加灵活。过去很难确定授权如何并且以什么样的顺序被应用，但是授权容器指令的介绍解决了这些问题，现在，配置可以控制什么时候授权方法被调用，什么条件决定何时授权访问。 - -这就是为什么大多数的升级失败是由于错误配置，2.2的访问控制基于IP地址，主机名和其他字符通过使用指令Order，来设置Allow, Deny或 Satisfy，但是2.4，这些一切被新模板授权（authorization）来替代检查。 - -为了弄清楚这些，可以来看一些虚拟主机的例子，这些可以在/etc/apache2/sites-enabled/default 或者 /etc/apache2/sites-enabled/你的网页名称 中找到: - -旧的2.2虚拟主机配置： - - Order allow,deny - Allow from all - -新的2.4虚拟主机配置： - - Require all granted - -![apache 2.4 config](http://blog.linoxide.com/wp-content/uploads/2014/12/apache-2.4-config.jpg) - -### .htaccess 问题 ### - -升级后如果一些设置不执行或者得到重定向错误，检查是否这些设置是在.htaccess文件中。如果是，2.4已经不再使用.htaccess文件，在2.4中默认使用AllowOverride指令来设置，因此忽略了.htaccess文件。你需要做的全部就是改变或者添加AllowOverride All命令到你的网站配置文件中。 - -上面截图中，可以看见AllowOverride All指令。 - -### 丢失配置文件或者模块 ### - -根据我的经验，这次升级带来的另一个问题就是在2.4中旧模块和配置文件不再需要或者不被支持了。你将会收到一条“Apache不能包含这个相应文件”的明确警告，你需要做的是在配置文件中移除这些导致问题的命令行。之后你可以搜索和安装相似的模块来替代。 - -### 其他需要了解的小改变 ### - -这里还有一些其他改变的需要考虑，虽然这些通常只会发生警告，而不是错误。 - -- MaxClients重命名为MaxRequestWorkers，使之有更准确的描述。而异步MPM，如event，客户端最大连接数不量比于工作线程数。旧的名字依然支持。 -- DefaultType命令无效，使用它已经没有任何效果了。需要使用其他配置设定来替代它 -- EnableSendfile默认关闭 -- FileETag 默认"MTime Size"（没有INode） -- KeepAlive 只接受“On”或“Off”值。之前的任何不是“Off”或者“0”的值都被认为是“On” -- Mutex 已经替代了 Directives AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex 和 WatchdogMutexPath 。你需要做的是估计一下这些被移动的指令在2.2中的使用情况，来决定是否删除或者使用Mutex来替代。 - --------------------------------------------------------------------------------- - -via: http://linoxide.com/linux-how-to/apache-migration-2-2-to-2-4-ubuntu-14-04/ - -作者：[Adrian Dinu][a] -译者：[Vic020/VicYu](http://vicyu.net) -校对：[Caroline](https://github.com/carolinewuyan) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linoxide.com/author/adriand/ -[1]:http://httpd.apache.org/docs/2.4/ From 47d5a22435c6f31e41882a205dbc305a7f60c28a Mon Sep 17 00:00:00 2001 From: shipsw Date: Wed, 4 Feb 2015 08:59:28 +0800 Subject: [PATCH 154/207] Delete 20150104 Auditd--Tool for Security Auditing on Linux Server.md --- ...l for Security Auditing on Linux Server.md | 206 ------------------ 1 file changed, 206 deletions(-) delete mode 100644 sources/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md diff --git a/sources/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md b/sources/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md deleted file mode 100644 index e5b148a4df..0000000000 --- a/sources/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md +++ /dev/null @@ -1,206 +0,0 @@ -Translating by shipsw - - -Auditd - Tool for Security Auditing on Linux Server -================================================================================ -First of all , we wish all our readers **Happy & Prosperous New YEAR 2015** from our Linoxide team. So lets start this new year explaining about Auditd tool. - -Security is one of the main factor that we need to consider. We must maintain it because we don't want someone steal our data. Security includes many things. Audit, is one of it. - -On Linux system, we know that we have a tool named **auditd**. This tool is by default exist in most of Linux operating system. What is auditd tool and how to use it? We will cover it below. - -### What is auditd? ### - -Auditd or audit daemon, is a userspace component to the Linux Auditing System. It’s responsible for writing audit records to the disk. - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/what_is_auditd.png) - -### Installing auditd ### - -On Ubuntu based system , we can use [wajig][1] tool or **apt-get tool** to install auditd. - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/install_auditd.png) - -Just follow the instruction to get it done. Once it finish it will install some tools related to auditd tool. Here are the tools : - -- **auditctl ;** is a tool to control the behaviour of the daemon on the fly, adding rules, etc -- **/etc/audit/audit.rules ;** is the file that contains audit rules -- **aureport ;** is tool to generate and view the audit report -- **ausearch ;** is a tool to search various events -- **auditspd ;** is a tool which can be used to relay event notifications to other applications instead of writing them to disk in the audit log -- **autrace ;** is a command that can be used to trace a process -- **/etc/audit/auditd.conf ;** is the configuration file of auditd tool -- When the first time we install **auditd**, there will be no rules available yet. - -We can check it using this command : - - $ sudo auditctl -l - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/auditctl_no_rules.png) - -To add rules on auditd, let’s continue to the section below. - -### How to use it ### - -#### Audit files and directories access #### - -One of the basic need for us to use an audit tool are, how can we know if someone change a file(s) or directories? Using auditd tool, we can do with those commands (please remember, we will need root privileges to configure auditd tool): - -**Audit files** - - $ sudo auditctl -w /etc/passwd -p rwxa - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/auditctl_w_etc_passwd.png) - -**With :** - -- **-w path ;** this parameter will insert a watch for the file system object at path. On the example above, auditd will wacth /etc/passwd file -- **-p ; **this parameter describes the permission access type that a file system watch will trigger on -- **rwxa ;** are the attributes which bind to -p parameter above. r is read, w is write, x is execute and a is attribute - -#### Audit directories #### - -To audit directories, we will use a similar command. Let’s take a look at the command below : - - $ sudo auditctl -w /production/ - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/auditctl_w_production.png) - -The above command will watch any access to the **/production folder**. - -Now, if we run **auditctl -l** command again, we will see that new rules are added. - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/auditctl_rules.png) - -Now let’s see the audit log says. - -### Viewing the audit log ### - -After rules are added, now we can see how auditd in action. To view audit log, we can use **ausearch** tool. - -We already add rule to watch /etc/passwd file. Now we will try to use **ausearch** tool to view the audit log. - - $ sudo ausearch -f /etc/passwd - -- **-f** parameter told ausearch to investigate /etc/passwd file -- The result is shown below : -> **time**->Mon Dec 22 09:39:16 2014 -> type=PATH msg=audit(1419215956.471:194): item=0 **name="/etc/passwd"** inode=142512 dev=08:01 mode=0100644 ouid=0 ogid=0 rdev=00:00 nametype=NORMAL -> type=CWD msg=audit(1419215956.471:194): **cwd="/home/pungki"** -> type=SYSCALL msg=audit(1419215956.471:194): arch=40000003 **syscall=5** success=yes exit=3 a0=b779694b a1=80000 a2=1b6 a3=b8776aa8 items=1 ppid=2090 pid=2231 **auid=4294967295 uid=1000 gid=1000** euid=0 suid=0 fsuid=0 egid=1000 sgid=1000 fsgid=1000 tty=pts0 ses=4294967295 **comm="sudo" exe="/usr/bin/sudo"** key=(null) - - Now let’s we understand the result. - -- **time ;** is when the audit is done -- **name ;** is the object name to be audited -- **cwd ;** is the current directory -- **syscall ;** is related syscall -- **auid ;** is the audit user ID -- **uid and gid ;** are User ID and Group ID of the user who access the file -- **comm ;** is the command that the user is used to access the file -- **exe ;** is the location of the command of comm parameter above -- The above audit log is the original file. - - Next, we are going to add a new user, to see how the auditd record the activity to /etc/passwd file. - -> **time->**Mon Dec 22 11:25:23 2014 -> type=PATH msg=audit(1419222323.628:510): item=1 **name="/etc/passwd.lock"** inode=143992 dev=08:01 mode=0100600 ouid=0 ogid=0 rdev=00:00 nametype=DELETE -> type=PATH msg=audit(1419222323.628:510): item=0 **name="/etc/"** inode=131073 dev=08:01 mode=040755 ouid=0 ogid=0 rdev=00:00 nametype=PARENT -> type=CWD msg=audit(1419222323.628:510): **cwd="/root"** -> type=SYSCALL msg=audit(1419222323.628:510): arch=40000003 **syscall=10** success=yes exit=0 a0=bfc0ceec a1=0 a2=bfc0ceec a3=897764c items=2 ppid=2978 pid=2994 **auid=4294967295 uid=0 gid=0** euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=pts0 ses=4294967295 **comm="chfn" exe="/usr/bin/chfn"** key=(null) - -As we can see above, that on that particular time, **/etc/passwd was accessed** by user root (uid = 0 and gid = 0) **from** directory /root (cwd = /root). The /etc/passwd file was accessed using **chfn** command which located in **/usr/bin/chfn** - -If we type **man chfn** on the console, we will see more detail about what is chfn. - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/chfn.png) - -Now we take a look at another example. - -We already told auditd to watch directory /production/ . That is a new directory. So when we try to use ausearch tool at the first time, it found nothing. - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/ausearch_production_empty.png) - -Next, root account try to list the /production directory using ls command. The second time we use ausearch tool, it will show us some information. - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/ausearch_production_ls.png) - -> **time->**Mon Dec 22 14:18:28 2014 -> type=PATH msg=audit(1419232708.344:527): item=0 **name="/production/"** inode=797104 dev=08:01 mode=040755 ouid=0 ogid=0 rdev=00:00 nametype=NORMAL -> type=CWD msg=audit(1419232708.344:527): cwd="/root" -> type=SYSCALL msg=audit(1419232708.344:527): arch=40000003 syscall=295 success=yes exit=3 a0=ffffff9c a1=95761e8 a2=98800 a3=0 items=1 ppid=3033 pid=3444 **auid=4294967295 uid=0 gid=0** euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=pts0 ses=4294967295 **comm="ls" exe="/bin/ls"** key=(null) - -Similar with the previous one, we can determine that **/production folder was looked** by root account (uid=0 gid=0) **using ls command** (comm = ls) and the ls command is **located in /bin/ls folder**. - -### Viewing the audit reports ### - -Once we put the audit rules, it will run automatically. And after a period of time, we want to see how auditd can help us to track them. - -Auditd comes with another tool called **aureport**. As we can guess from its name, **aureport** is a tool that produces summary reports of the audit system log. - -We already told auditd to track /etc/passwd before. And a moment after the auditd parameter is developed, the audit.log file is created. - -To generate the report of audit, we can use aureport tool. Without any parameters, aureport will generate a summary report of audit activity. - - $ sudo aureport - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/aureport_2.png) - -As we can see, there are some information available which cover most important area. - -On the picture above we see there are **3 times failed authentication**. Using aureport, we can drill down to that information. - -We can use this command to look deeper on failed authentication : - - $ sudo aureport -au - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/aureport_authentication.png) - -As we can see on the picture above, there are two users which at the particular time are failed to authenticated - -If we want to see all events related to account modification, we can use -m parameter. - - $ sudo aureport -m - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/aureport_m.png) - -### Auditd configuration file ### - -Previously we already added : - -- $ sudo auditctl -w /etc/passwd -p rwxa -- $ sudo auditctl -w /production/ -- Now, if we sure the rules are OK, we can add it into - -**/etc/audit/audit.rules** to make them permanently.Here’s how to put them into the /etc/audit/audit.rules fileSample of audit rule file - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/audit_rules_file.png) - -**Then don’t forget to restart auditd daemon.** - - # /etc/init.d/auditd restart - -OR - - # service auditd restart - -![](http://blog.linoxide.com/wp-content/uploads/2014/12/audit_restart.png) - -### Conclusion ### - -Auditd is one of the audit tool that available on Linux system. You can explore more detail about auditd and its related tools by reading its manual page. For example, just type **man auditd** to see more detail about auditd. Or type **man ausearch** to see more detail about ausearch tool. - -**Please be careful before creating rules**. It will increase your log file size significantly if too much information to record. - --------------------------------------------------------------------------------- - -via: http://linoxide.com/how-tos/auditd-tool-security-auditing/ - -作者：[Pungki Arianto][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linoxide.com/author/pungki/ -[1]:http://linoxide.com/tools/wajig-package-management-debian/ From 51c43587463ce62ed1f66227022b4a757fe111f6 Mon Sep 17 00:00:00 2001 From: shipsw Date: Wed, 4 Feb 2015 09:15:26 +0800 Subject: [PATCH 155/207] Create 20150104 Auditd--Tool for Security Auditing on Linux Server.md --- ...l for Security Auditing on Linux Server.md | 200 ++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 translated/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md diff --git a/translated/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md b/translated/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md new file mode 100644 index 0000000000..1071e1521b --- /dev/null +++ b/translated/tech/20150104 Auditd--Tool for Security Auditing on Linux Server.md @@ -0,0 +1,200 @@ +Auditd - Linux 服务器安全审计工具 +================================================================================ +首先，Linoxide组祝读者 **2015新年快乐万事如意！** 。下面开始这个新年版审计工具的介绍。 + +安全防护是首先要考虑的问题。为了避免别人盗取我们的数据，我们需要维护它。安全防护包括很多东西，审计是其中一个。 + +我们知道Linux系统上有一个叫 **auditd** 的审计工具。这个工具在大多数Linux操作系统中是默认安装的。审计工具是什么？如何使用？下面我们开始介绍。 + +### 什么是审计？ ### + +审计(或审计监控)是Linux审计系统中用户部分的一个组件，负责将审计记录写入磁盘。 + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/what_is_auditd.png) + +### 安装 auditd ### + +Ubuntu系统中，我们可以使用 [wajig][1] 工具或者 **apt-get 工具** 安装auditd。 + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/install_auditd.png) + +按照下面的说明安装auditd，安装完毕后将自动安装以下auditd和相关的工具： + +- **auditctl ;** 运行过程中控制守护进程的工具，比如如添加规则等等。 +- **/etc/audit/audit.rules ;** 记录审计规则的文件。 +- **aureport ;** 查看和生成审计报告的工具。 +- **ausearch ;** 查找审计事件的工具 +- **auditspd ;** 转发事件通知给其他应用程序，不写审计日志文件。 +- **autrace ;** 跟踪处理过程的命令。 +- **/etc/audit/auditd.conf ;** auditd工具的配置文件。 +- 首次安装 **auditd** 后, 审计规则是空的。 + +可以使用以下命令查看 + + $ sudo auditctl -l + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/auditctl_no_rules.png) + +以下我们介绍如何给auditd添加审计规则。 + +### 如何使用auditd ### + +#### Audit 文件和目录访问审计 #### + +我们使用审计工具的一个目的是监控文件和目录的更改。对于auditd工具，我们可使用命令来配置(注意，以下命令需要root权限)。 + +**文件审计** + + $ sudo auditctl -w /etc/passwd -p rwxa + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/auditctl_w_etc_passwd.png) + +**选项 :** + +- **-w path ;** 监控指定的路径，上面的命令指定监控路径 /etc/passwd +- **-p ; ** 指定触发审计的文件和目录的访问权限 +- **rwxa ;** 指定的触发条件，r 读取权限，w 写入权限，x 执行权限 + +#### 目录审计 #### + +使用类似的命令来对目录进行审计，如下： + + $ sudo auditctl -w /production/ + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/auditctl_w_production.png) + +以上命令将监控对 **/production 目录** 的所有访问。 + +现在，运行 **auditctl -l** 命令即可查看所有已配置的规则。 + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/auditctl_rules.png) + +下面开始介绍审计日志。 + +### 查看审计日志 ### + +添加规则后，我们可以查看 auditd 的日志。使用 **ausearch** 工具可以查看auditd日志。 + +我们已经添加规则监控 /etc/passwd 文件。现在可以使用 **ausearch** 工具的以下命令来查看审计日志了。 + + $ sudo ausearch -f /etc/passwd + +- **-f** 设定ausearch审计/etc/passwd文件 +- 下面是输出 ： +> **time**->Mon Dec 22 09:39:16 2014 +> type=PATH msg=audit(1419215956.471:194): item=0 **name="/etc/passwd"** inode=142512 dev=08:01 mode=0100644 ouid=0 ogid=0 rdev=00:00 nametype=NORMAL +> type=CWD msg=audit(1419215956.471:194): **cwd="/home/pungki"** +> type=SYSCALL msg=audit(1419215956.471:194): arch=40000003 **syscall=5** success=yes exit=3 a0=b779694b a1=80000 a2=1b6 a3=b8776aa8 items=1 ppid=2090 pid=2231 **auid=4294967295 uid=1000 gid=1000** euid=0 suid=0 fsuid=0 egid=1000 sgid=1000 fsgid=1000 tty=pts0 ses=4294967295 **comm="sudo" exe="/usr/bin/sudo"** key=(null) + + 下面开始解读输出结果。 + +- **time ;** 审计时间。 +- **name ;** 审计对象 +- **cwd ;** 当前路径 +- **syscall ;** 相关的系统调用 +- **auid ;** 审计用户ID +- **uid and gid ;** 访问文件的用户ID和用户组ID +- **comm ;** 用户访问文件的命令 +- **exe ;** 上面命令的可执行文件路径 +- 以上审计日志显示文件未被改动。 + + 以下我们将要添加一个用户，看看auditd如何记录文件 /etc/passwd的改动的。 + +> **time->**Mon Dec 22 11:25:23 2014 +> type=PATH msg=audit(1419222323.628:510): item=1 **name="/etc/passwd.lock"** inode=143992 dev=08:01 mode=0100600 ouid=0 ogid=0 rdev=00:00 nametype=DELETE +> type=PATH msg=audit(1419222323.628:510): item=0 **name="/etc/"** inode=131073 dev=08:01 mode=040755 ouid=0 ogid=0 rdev=00:00 nametype=PARENT +> type=CWD msg=audit(1419222323.628:510): **cwd="/root"** +> type=SYSCALL msg=audit(1419222323.628:510): arch=40000003 **syscall=10** success=yes exit=0 a0=bfc0ceec a1=0 a2=bfc0ceec a3=897764c items=2 ppid=2978 pid=2994 **auid=4294967295 uid=0 gid=0** euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=pts0 ses=4294967295 **comm="chfn" exe="/usr/bin/chfn"** key=(null) + +我们可以看到，在指定的时间，**/etc/passwd ** 被root用户(uid =0, gid=0)在/root目录下修改。/etc/passwd 文件是使用**/usr/bin/chfn** 访问的。 + +键入 **man chfn** 可以查看有关chfn更多的信息。 + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/chfn.png) + +下面我们看另外一个例子。 + +我们已经配置auditd去监控目录 /production/ 了。这是个新目录。所以我们用ausearch去查看日志的时候会发现什么都没有。 + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/ausearch_production_empty.png) + +下一步，使用root账户的ls命令列出 /production/ 下的文件信息。再次使用ausearch后，将会显示一些信息。 + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/ausearch_production_ls.png) + +> **time->**Mon Dec 22 14:18:28 2014 +> type=PATH msg=audit(1419232708.344:527): item=0 **name="/production/"** inode=797104 dev=08:01 mode=040755 ouid=0 ogid=0 rdev=00:00 nametype=NORMAL +> type=CWD msg=audit(1419232708.344:527): cwd="/root" +> type=SYSCALL msg=audit(1419232708.344:527): arch=40000003 syscall=295 success=yes exit=3 a0=ffffff9c a1=95761e8 a2=98800 a3=0 items=1 ppid=3033 pid=3444 **auid=4294967295 uid=0 gid=0** euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=pts0 ses=4294967295 **comm="ls" exe="/bin/ls"** key=(null) + +和上一个一样，可以得出root账户使用ls命令访问了/production/目录，ls命令的文件目录是 /bin/ls + +### 查看审计报告 ### + +一旦定义审计规则后，它会自动运行。过一段时间后，我们可以看看auditd是如何帮我们跟踪审计的。 + +Auditd提供了另一个工具叫 **aureport** 。从名字上可以猜到， **aureport** 是使用系统日志生成简要报告的工具。 + +我们已经配置auditd去跟踪/etc/passwd文件。auditd参数设置后一段时间后，audit.log 文件就创建出来了。 + +生成审计报告，我们可以使用aureport工具。不带参数运行的话，可以生成审计活动的概述。 + + $ sudo aureport + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/aureport_2.png) + +如上，报告包含了大多数重要区域的信息。 + +上图可以看出有 **3 次授权失败**。 使用aureport，我们可以深入查看这些信息。 + +使用以下命令查看授权失败的详细信息： + + $ sudo aureport -au + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/aureport_authentication.png) + +从上图可以看出，由两个用户在特定的时间授权失败。 + +如果我们想看所有相关账户修改的事件，可以使用-m参数。 + + $ sudo aureport -m + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/aureport_m.png) + +### Auditd 配置文件 ### + +我们已经添加如下规则： + +- $ sudo auditctl -w /production/ +- 现在，如果确信这些规则正常，我们可以将其添加到**/etc/audit/audit.rules**中使得规则永久有效。以下介绍如何将他们添加到/etc/audit/audit.rules中去。 + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/audit_rules_file.png) + +**最后，别忘了重启auditd守护程序** + + # /etc/init.d/auditd restart + +或 + + # service auditd restart + +![](http://blog.linoxide.com/wp-content/uploads/2014/12/audit_restart.png) + +### 总结 ### + +Auditd是Linux上的一个审计工具。你可以阅读auidtd文档获取更多使用auditd和工具的细节。例如，输入 **man auditd** 去看auditd的详细说明，或者键入 **man ausearch** 去看有关 ausearch 工具的详细说明。 + +**请谨慎创建规则**。太多规则会使得日志文件急剧增大！ + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/how-tos/auditd-tool-security-auditing/ + +作者：[Pungki Arianto][a] +译者：[shipsw](https://github.com/shipsw) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/pungki/ +[1]:http://linoxide.com/tools/wajig-package-management-debian/ From fadaf3a224a960fc4b704883d5021a49eddaf503 Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 4 Feb 2015 11:16:36 +0800 Subject: [PATCH 156/207] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=9A=84=E8=AF=91=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ps for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/published/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md b/published/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md index c18c9ed4f7..0ed031e342 100644 --- a/published/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md +++ b/published/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md @@ -1,10 +1,10 @@ 在 Ubuntu 14.04 中Apache从2.2迁移到2.4的问题 ================================================================================ -如果你将**Ubuntu**从12.04升级跨越到了14.04的，那么这其中包括了一个重大的升级--**Apache**从2.2版本升级到2.4版本。**Apache**的这次升级带来了许多性能提升，**但是如果继续使用2.2的配置文件会导致很多错误**。 +如果你将**Ubuntu**从12.04升级跨越到了14.04，那么这其中包括了一个重大的升级--**Apache**从2.2版本升级到2.4版本。**Apache**的这次升级带来了许多性能提升，**但是如果继续使用2.2的配置文件会导致很多错误**。 ### 访问控制的改变 ### -从**Apache 2.4**起所启用授权机制比起2.2的只是针对单一数据存储的单一检查更加灵活。过去很难确定哪个 order 授权怎样被使用的，但是授权容器指令的引入解决了这些问题，现在，配置可以控制什么时候授权方法被调用，什么条件决定何时授权访问。 +从**Apache 2.4**起，所启用的授权机制比起2.2的只是针对单一数据存储的单一检查更加灵活。过去很难确定哪个 order 授权怎样被使用的，但是授权容器指令的引入解决了这些问题，现在，配置可以控制什么时候授权方法被调用，什么条件决定何时授权访问。 这就是为什么大多数的升级失败是由于配置错误的原因。2.2的访问控制是基于IP地址、主机名和其他角色，通过使用指令Order，来设置Allow, Deny或 Satisfy；但是2.4，这些一切都通过新的授权方式进行检查。 From 8524e0740ef94f642413bac77f79d0548f60e2ef Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 4 Feb 2015 12:33:57 +0800 Subject: [PATCH 157/207] PUB:20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon @zpl1025 --- ....04 to Integrate Linux Kernel 3.19 Branch Soon.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename {translated/news => published}/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md (63%) diff --git a/translated/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md b/published/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md similarity index 63% rename from translated/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md rename to published/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md index 5ff335214f..7fff32e713 100644 --- a/translated/news/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md +++ b/published/20150126 Ubuntu 15.04 to Integrate Linux Kernel 3.19 Branch Soon.md @@ -1,22 +1,22 @@ Ubuntu 15.04即将整合Linux内核3.19分支 ---- -*Ubuntu已经开始跟踪一个新的内核分支* +*Ubuntu已经开始整合一个新的内核分支* ![Ubuntu 15.04 shortcuts](http://i1-news.softpedia-static.com/images/news2/Ubuntu-15-04-to-Integrate-Linux-Kernel-3-19-Branch-Soon-471121-2.jpg) -#Linux内核是一个发行版中最重要的组成部分，Ubuntu用户很想知道哪个版本将用于15.04分支的稳定版中，预计几个月后就会发布。 +Linux内核是一个发行版中最重要的组成部分，Ubuntu用户很想知道哪个版本将用于预计几个月后就会发布的15.04分支的稳定版中。 Ubuntu和Linux内核开发周期并不同步，所以很难预测最终哪个版本将应用在Ubuntu 15.04中。目前，Ubuntu 15.04（长尾黑颚猴）使用的是Linux内核3.18，但是开发者们已经准备应用3.19分支了。 -“我们的Vivid内核仍然基于v3.18.2的稳定内核上游，但是我们很快将基础变更到v3.18.3。我们也将把我们的非稳定版分支的基础变更到v3.19-rc5，然后上传到我们的团队PPA。”Canonical的Joseph Salisbury[说](1)。 +“我们的Vivid的内核仍然基于v3.18.2的上游稳定内核，但是我们很快将重新基于v3.18.3内核开发。我们也将把我们的非稳定版分支的基础变更到v3.19-rc5，然后上传到我们的团队PPA。”Canonical的Joseph Salisbury[说](1)。 -Linux内核3.19仍然处于开发阶段，预计还要几个星期才会出稳定版本，但是有充足的时间将它加入到Ubuntu中并测试。不可能等到3.20分支了，举个例子，即使它能在4月23日前发布。 +Linux内核3.19仍然处于开发阶段，预计还要几个星期才会出稳定版本，但是有充足的时间将它加入到Ubuntu中并测试。但是不可能等到3.20分支了，举个例子，即使它能在4月23日前发布。 你现在就可以从Softpedia[下载Ubuntu 15.04](2)，试用一下。这是一个每日构建版本，会包含发行版中目前已经做出的所有改善。 -------------------------------------------------------------------------------- -via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-Website-471179.shtml +via:http://linux.softpedia.com/blog/Ubuntu-15-04-to-Integrate-Linux-Kernel-3-19-Branch-Soon-471121.shtml 本文发布时间:25 Jan 2015, 20:39 GMT @@ -24,7 +24,7 @@ via:http://news.softpedia.com/news/Data-of-20-Million-Users-Stolen-from-Dating-W 译者：[zpl1025](https://github.com/zpl1025) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From fdea0c3a90a0a999fffa1933981bf06887719a05 Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Wed, 4 Feb 2015 12:40:06 +0800 Subject: [PATCH 158/207] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ns From The Terminal In Background Mode.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/translated/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md b/translated/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md index b0f4731e18..9c6f853a30 100644 --- a/translated/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md +++ b/translated/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md @@ -5,7 +5,7 @@ 这是一个篇幅不长但是十分有用的教程，可以帮助你在终端启动一个Linux应用程序，并且使终端窗口不会丢失焦点。 -我们有很多方法可以在Linux系统中打开一个终端窗口，这取决与你的选择以及你的桌面环境。 +我们有很多可以在Linux系统中打开一个终端窗口的方法，这取决于你的选择以及你的桌面环境。 如果是使用Ubuntu的话，你可以利用CTRL+ALT+T组合键打开终端。当然你也可以使用超级键（Windows键）[打开Dash][1]，搜索“TERM”，然后点击“Term”图标来打开终端窗口。 @@ -19,13 +19,13 @@ firefox -search "linux.cn" -你可能会注意到，当你启动Firefox的时候，如果程序打开以后，焦点重新会到终端窗口的话，你就可以继续在终端进行工作。 +你可能会注意到，如果你启动Firefox，程序打开以后，回到了终端窗口控制，这就意味着你可以继续在终端进行工作。 -通常情况下，如果你在终端启动了应用程序，焦点会切换到新启动的应用程序，只有程序被关闭以后焦点才会重新切换到终端。这是因为你在前台启动了这个程序。 +通常情况下，如果你在终端启动了应用程序，控制会切换到新启动的应用程序，只有程序被关闭以后才会重新切换到终端控制。这是因为你在前台启动了这个程序。 -如果要实现焦点仍然保持在终端窗口的目的，那么你需要将应用程序启动为后台进程。 +如果要在Linux终端打开应用程序并且返回终端控制，那么你需要将应用程序启动为后台进程。 -向下面所列的命令一样，我们可以通过增加一个（&）符号，将应用程序在后台启动。 +和下面所列的命令一样，我们可以通过增加一个（&）符号，将应用程序在后台启动。 libreoffice & @@ -61,15 +61,15 @@ sudo find / -name firefox | more -如果你知道你要查找的文件在你的当前目录及其子目录中，那么你可以使用点来代替斜杠： +如果你知道你要查找的文件在你的当前目录结构中，那么你可以使用点来代替斜杠： sudo find . -name firefox | more -你可能需要sudo来提升权限，也可能根本就不需要，如果这个文件在你的跟目录里面，那么就不需要使用sudo。 +你可能需要sudo来提升权限，也可能根本就不需要，如果这个文件在你的主目录里面，那么就不需要使用sudo。 -有些应用程序则必须要提升权限才能运行，否则你就会得到一大堆拒绝访问错误，除非你使用一个具有权限的用户，或者使用sudo提升权限。 +有些应用程序则必须要提升权限才能运行，否则你就会得到一大堆拒绝访问错误，除非你使用一个具有权限的用户或者使用sudo提升权限。 -这里有个小窍门。如果你运行了一个程序，但是它报了权限错误以后，输入下面命令试试： +这里有个小窍门。如果你运行了一个程序，但是它需要提升权限来操作，输入下面命令试试： sudo !! @@ -77,7 +77,7 @@ via : http://linux.about.com/od/commands/fl/How-To-Run-Linux-Programs-From-The-T 作者：[Gary Newell][a] 译者：[zhouj-sh](https://github.com/zhouj-sh) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 @@ -87,4 +87,4 @@ via : http://linux.about.com/od/commands/fl/How-To-Run-Linux-Programs-From-The-T [3]:http://linux.about.com/od/commands/l/blcmdl1_locate.htm [4]:http://linux.about.com/library/cmd/blcmdl1_less.htm [5]:http://linux.about.com/library/cmd/blcmdl1_more.htm -[6]:http://linux.about.com/od/commands/l/blcmdl8_sudo.htm \ No newline at end of file +[6]:http://linux.about.com/od/commands/l/blcmdl8_sudo.htm From b750943b93ead4cba0ec45dc165c0d56c81b524b Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 4 Feb 2015 12:42:04 +0800 Subject: [PATCH 159/207] PUB:20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service @zpl1025 --- ...Implementation Causes Denial of Service.md | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) rename {translated/news => published}/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md (59%) diff --git a/translated/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md b/published/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md similarity index 59% rename from translated/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md rename to published/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md index fa3139f2dc..2b1b9d6631 100644 --- a/translated/news/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md +++ b/published/20150127 Bug in Wi-Fi Direct Android Implementation Causes Denial of Service.md @@ -1,36 +1,36 @@ -Wi-Fi直连的Android实现中的Bug导致拒绝服务 +Android 中的 Wi-Fi 直连方式的 Bug 会导致拒绝服务 ---- + *Google标记这个问题为低严重性，并不急着修复* ![Wi-Fi Direct glitch crashes Android](http://i1-news.softpedia-static.com/images/news2/Bug-In-Wi-Fi-Direct-Android-Implementation-Causes-Denial-of-Service-471299-2.jpg) -#Android处理Wi-Fi直连连接的方式中的一个漏洞会导致在搜索连接节点的时候设备重启，这个节点可能是其他手机，摄像头，游戏设备，电脑或是打印机等任何设备。 +Android处理Wi-Fi直连连接的方式中的一个漏洞可以导致在搜索连接节点的时候所连接的设备重启，这个节点可能是其他手机，摄像头，游戏设备，电脑或是打印机等任何设备。 Wi-Fi直连技术允许无线设备之间直接建立通信，而不用加入到本地网络中。 -##安全公司致力于协调修复这个问题 +###安全公司致力于协调修复这个问题 这个漏洞允许攻击者发送一个特定的修改过的802.11侦测响应帧给设备，从而因为WiFi监控类中的一个未处理的异常导致设备重启。 -Core Security通过自己的CoreLabs团队发现了这个下次（CVE-2014-0997），早在2014年9月就汇报给了Google。这家供应商确认了这个问题，却把它列为低严重性，并不提供修复时间表。 +Core Security通过自己的CoreLabs团队发现了这个瑕疵（CVE-2014-0997），早在2014年9月就汇报给了Google。Google确认了这个问题，却把它列为低严重性，并不提供修复时间表。 -每次Core Security联系Android安全组要求提供修复时间表的时候都会收到同样的答复。最后一次答复是1月20日，意味着这么段时间中都没有补丁。在星期一的时候，这家安全公司公布了他们的发现。 +每次Core Security联系Android安全组要求提供修复时间表的时候都会收到同样的答复。最后一次答复是1月20日，意味着这么长的时间中都没有补丁。在星期一的时候，这家安全公司公布了他们的发现。 -这家安全公司建立了一个(概念证明)[1]来展示他们研究结果的有效性。 +这家安全公司建立了一个[概念攻击][1]来展示他们研究结果的有效性。 根据这个漏洞的技术细节，一些Android设备在收到一个错误的wpa_supplicant事件后可能会进入拒绝服务状态，这些事件让无线驱动和Android平台框架之间的接口有效。 -##Google并不着急结束这个问题 +###Google并不着急解决这个问题 -Android安全组对于这个问题的放松态度可能是基于这个原因，这种拒绝服务状态只发生在扫描节点这一小段时间。 +Android安全组对于这个问题的放松态度可能是基于这个原因：这种拒绝服务状态只发生在扫描节点这一小段时间。 -不仅如此，实际上结果也并不严重，因为它会导致设备重启。不存在数据泄漏的风险或是能引起这个问题的攻击，不会吸引攻击者。另一方面，不管怎样都应该提供一个补丁，以减轻任何未来的潜在风险。 +不仅如此，实际上结果也并不严重，因为它会导致设备重启。不存在数据泄漏的风险或是能引起这个问题的攻击，不会吸引攻击者。但另一方面，不管怎样都应该提供一个补丁，以减轻任何未来的潜在风险。 -Core Security声称在Android 5.0.1及以上版本中没有测试到这个问题，他们发现的受影响的设备有运行移动操作系统版本4.4.4的Nexus 5和4，运行Android 4.2.2的LG D806和Samsung SM-T310，以及4.1.2版本系统的Motorola RAZR HD。 +Core Security声称在Android 5.0.1及以上版本中没有测试到这个问题，他们发现的受影响的设备有Android系统4.4.4的Nexus 5和4，运行Android 4.2.2的LG D806和Samsung SM-T310，以及4.1.2版本系统的Motorola RAZR HD。 目前，减轻影响的方式是尽量不用Wi-Fi直连，或者升级到没有漏洞的Android版本。 - -------------------------------------------------------------------------------- via:http://news.softpedia.com/news/Bug-In-Wi-Fi-Direct-Android-Implementation-Causes-Denial-of-Service-471299.shtml @@ -38,10 +38,8 @@ via:http://news.softpedia.com/news/Bug-In-Wi-Fi-Direct-Android-Implementation-Ca 本文发布时间:27 Jan 2015, 09:11 GMT 作者：[Ionut Ilascu][a] - 译者：[zpl1025](https://github.com/zpl1025) - -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 7f7fb21b22bedb17f371117e7188dd2b557d1c5c Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Wed, 4 Feb 2015 16:28:40 +0800 Subject: [PATCH 160/207] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...as a Stylish Interface Ubuntu Installation.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/translated/share/20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md b/translated/share/20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md index ccd9a474d5..9cb0a3765d 100644 --- a/translated/share/20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md +++ b/translated/share/20141106 Flow' N Play Movie Player Has a Stylish Interface Ubuntu Installation.md @@ -1,12 +1,10 @@ -Translated by H-mudcup - -Flow 'N Play视频播放器有着独具风格的界面【Ubuntu上的安装】 +Flow 'N Play视频播放器有着独具风格的界面[在Ubuntu上安装] ================================================================================ -**Flow ‘N Play**是个用Qt编写的新视频播放器。它有着漂亮又简洁的只提供基本播放功能的界面。 +**Flow ‘N Play**是个用Qt编写的新视频播放器。它有着漂亮又简洁的界面，只提供基本播放功能。 ![](http://www.tuxarena.com/wp-content/uploads/2014/11/flow_n_play.jpg) -[Flow ‘N Play][1]是个比较新的有着漂亮的界面和简单操作的视频播放器（今年三月份第一次发行）。其中一个功能就是能通过拖动鼠标滑动视频列表。播放器带有基本功能，一个搜索功能，支持彩色主题。 +[Flow ‘N Play][1]是个比较新的视频播放器，它有着漂亮的界面和简单的操作（今年三月份第一次发行）。其中一个功能就是能通过拖动鼠标滑动视频列表。播放器带有基本功能，一个搜索功能，支持彩色主题。 打开一个新的视频——你还可以在同一个对话框下自定义一个封面： @@ -18,7 +16,7 @@ Flow 'N Play视频播放器有着独具风格的界面【Ubuntu上的安装】 Flow ‘N Play仍然处在早起开发中，因此相对于更高级的播放器它有一些瑕疵。可以设置的选项少，不支持加载字幕或视频和声音的过滤器。目前，在打开一个新的视频时偶尔会出错或是表现异常。 -我相信在它变得能替代其他播放器之前，会先添加几个功能。但从长远来看，Flow ‘N Play很有前途。 +我相信在它变成一款相当不错的播放器来替代其他播放器之前，还需要再添加几个功能。但从长远来看，Flow ‘N Play很有前途。 ### 在Ubuntu 14.04上安装Flow ‘N Play 0.922 ### @@ -28,11 +26,11 @@ Flow ‘N Play仍然处在早起开发中，因此相对于更高级的播放器 sudo apt-get install libqt5multimediaquick-p5 qtdeclarative5-controls-plugin qtdeclarative5 qtmultimedia-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-quicklayouts-plugin -Then download the DEB package and either double click it or change the working directory to the one where you saved it and type the following in a terminal (for 64-bit, replace the DEB file for 32-bit)然后下载DEB安装包，可以双击或在终端里把正操作的目录换到你保存安装包的目录下并输入以下命令（这个是64位的命令，对于32位的系统请将DEB文件换成32位的）: +然后下载DEB安装包，可以双击或在终端里把正操作的目录换到你保存安装包的目录下并输入以下命令（这个是64位的命令，对于32位的系统请将DEB文件换成32位的）: sudo dpkg -i flow-n-play_v0.926_qt-5.3.2_x64.deb -然后在终端里输入**flow-n-play**来运行它。注意：为防止产生依赖项错误，当你试图安装DEB问件事你可以运行**sudo apt-get -f install**，这样可以自动获取丢失的依赖项并安装Flow ‘N Play。 +然后在终端里输入**flow-n-play**来运行它。注意：为防止产生依赖项错误，当你试图安装DEB文件时，你可以运行**sudo apt-get -f install**，这样可以自动获取丢失的依赖项并安装Flow ‘N Play。 若用RUN脚本安装，先安装上边提到的依赖项，然后运行这个脚本: @@ -49,7 +47,7 @@ via: http://www.tuxarena.com/2014/11/flow-n-play-movie-player-has-a-stylish-inte 作者：Craciun Dan 译者：[H-mudcup](https://github.com/H-mudcup) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 44546493c726db07adff32d6cb4735d11923a296 Mon Sep 17 00:00:00 2001 From: shipsw Date: Wed, 4 Feb 2015 16:49:43 +0800 Subject: [PATCH 161/207] 20140821 What is a good EPUB reader on Linux.md 20140821 What is a good EPUB reader on Linux.md --- sources/share/20140821 What is a good EPUB reader on Linux.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/share/20140821 What is a good EPUB reader on Linux.md b/sources/share/20140821 What is a good EPUB reader on Linux.md index 7e1958256b..71a97240e4 100644 --- a/sources/share/20140821 What is a good EPUB reader on Linux.md +++ b/sources/share/20140821 What is a good EPUB reader on Linux.md @@ -1,3 +1,4 @@ +Translating by shipsw What is a good EPUB reader on Linux ================================================================================ If the habit on reading books on electronic tablets is still on its way, reading books on a computer is even rarer. It is hard enough to focus on the classics of the 16th century literature, so who needs the Facebook chat pop up sound in the background in addition? But if for some reasons you wish to open an electronic book in your computer, chances are that you will need specific software. Indeed, most editors agreed with using the EPUB format for electronic books (for "Electronic PUBlication"). Hopefully, Linux is not deprived of good programs capable of dealing with such format. In short, here is a non-exhaustive list of good EPUB readers on Linux. @@ -63,4 +64,4 @@ via: http://xmodulo.com/2014/08/good-epub-reader-linux.html [4]:https://github.com/sakisds/pPub [5]:http://crengine.sourceforge.net/ [6]:https://github.com/rupa/epub -[7]:https://github.com/user-none/Sigil \ No newline at end of file +[7]:https://github.com/user-none/Sigil From cadf47439204344622798267aec2730726394793 Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Wed, 4 Feb 2015 17:17:33 +0800 Subject: [PATCH 162/207] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20150125 4 Best Modern Open Source Code Editors For Linux.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {translated/share => published}/20150125 4 Best Modern Open Source Code Editors For Linux.md (100%) diff --git a/translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md b/published/20150125 4 Best Modern Open Source Code Editors For Linux.md similarity index 100% rename from translated/share/20150125 4 Best Modern Open Source Code Editors For Linux.md rename to published/20150125 4 Best Modern Open Source Code Editors For Linux.md From 61574948a18c505f9e5a8c35e2d102c34dce6854 Mon Sep 17 00:00:00 2001 From: Vic___ Date: Wed, 4 Feb 2015 20:41:17 +0800 Subject: [PATCH 163/207] =?UTF-8?q?=E8=AF=B7=E5=9C=B0=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...profile could not be opened correctly' on Google Chrome.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md b/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md index 0608359029..8d5c4b02ca 100644 --- a/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md +++ b/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md @@ -1,3 +1,5 @@ +> Vic + Linux FAQs with Answers--How to fix “Your profile could not be opened correctly” on Google Chrome ================================================================================ > **Question**: When I open Google Chrome web browser on my Linux box, I have several pop-up messages saying "Your profile could not be opened correctly." This error happens every time I open Google Chrome. How can I solve this error? @@ -47,4 +49,4 @@ via: http://ask.xmodulo.com/your-profile-could-not-be-opened-correctly-google-ch 译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID) -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 \ No newline at end of file +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From b4fdde6dc3c88e70b1fb959b4246d92d08c41ab5 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 4 Feb 2015 20:50:47 +0800 Subject: [PATCH 164/207] translating --- ...inux-dash Web Based Monitoring System In CentOS or RHEL.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md b/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md index 51983921f6..95543f31dc 100644 --- a/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md +++ b/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md @@ -1,3 +1,5 @@ +Translating----geekpi + How To Install Linux-dash Web Based Monitoring System In CentOS/RHEL ================================================================================ **Linux-dash** is a web-based lightweight monitoring dashboard for Linux machines. This application will display real-time, various system properties, such as CPU load, RAM usage, disk usage, Internet speed, network connections, RX/TX bandwidth, logged-in users, running processes etc. It will not store long term statistics, Thus it doesn’t have a backend database. @@ -108,4 +110,4 @@ via: http://www.unixmen.com/install-linux-dash-web-based-monitoring-system-cento 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://www.unixmen.com/author/jijo/ -[1]:http://www.unixmen.com/install-epel-repository-centos-rhel-7/ \ No newline at end of file +[1]:http://www.unixmen.com/install-epel-repository-centos-rhel-7/ From d8d0cbe018d60540ffcec578149754592a22f816 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 4 Feb 2015 21:19:51 +0800 Subject: [PATCH 165/207] translated --- ...sed Monitoring System In CentOS or RHEL.md | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) rename {sources => translated}/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md (53%) diff --git a/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md b/translated/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md similarity index 53% rename from sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md rename to translated/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md index 95543f31dc..2c83a1b808 100644 --- a/sources/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md +++ b/translated/tech/20150203 How To Install Linux-dash Web Based Monitoring System In CentOS or RHEL.md @@ -1,24 +1,22 @@ -Translating----geekpi - -How To Install Linux-dash Web Based Monitoring System In CentOS/RHEL +如何在CentOS/RHEL中安装机遇Web监控的Linux-dash ================================================================================ -**Linux-dash** is a web-based lightweight monitoring dashboard for Linux machines. This application will display real-time, various system properties, such as CPU load, RAM usage, disk usage, Internet speed, network connections, RX/TX bandwidth, logged-in users, running processes etc. It will not store long term statistics, Thus it doesn’t have a backend database. +**Linux-dash**是一款为Linux设计的基于web的轻量级监控面板。这个程序会显示实时时间、不同的系统属性，比如CPU负载、RAM使用率、磁盘使用率、网速、网络连接、RX/TX带宽、登录用户、运行的进程等等。它不会存储长期的统计。因为它没有后端数据库。 -In this article i will show you how to install and setup Linux dash, Here my web server is **Nginx**. +本篇文章将会向你展示如何安装和设置Linux dash，这里的web服务器是**Nginx**. -### Installation ### +### 安装 ### -First of all we should enable, [EPEL repository][1]. +首先我们要启用[EPEL 仓库][1]。 -**Next, we need to install nginx with the following command.** +**接下来，我们需要用下面的命令安装nginx。** sudo yum install nginx -**Install php-fpm component** +**安装 php-fpm 组件** sudo yum install git php-common php-fpm -Now, we have to configure nginx for Linux-dash. So create /etc/nginx/conf.d/linuxdash.conf as follows. +现在我们要在nginx中配置Linux-dash。我们如下创建 /etc/nginx/conf.d/linuxdash.conf。 sudo vim /etc/nginx/conf.d/linuxdash.conf @@ -57,11 +55,11 @@ Now, we have to configure nginx for Linux-dash. So create /etc/nginx/conf.d/linu } } -**Next job is to configure php-fpm. Open /etc/php-fpm.d/www.conf in your Favorite editor.** +**下一步是配置php-fpm。用编辑器打开/etc/php-fpm.d/www.conf。** sudo vim /etc/php-fpm.d/www.conf -**Make sure to set “listen”, “user” and “group” fields as below. You can leave the rest of the configuration unchanged.** +**确保设置了“listn”，“user”和“group”字段。你可以保留下面的配置不变。** . . . listen = /var/run/php-fpm.sock @@ -69,42 +67,43 @@ Now, we have to configure nginx for Linux-dash. So create /etc/nginx/conf.d/linu group = nginx . . . -**Now, We are going to Download and install linux-dash under /var/www** +**现在，我们要在/var/www中下载并安装linux-dash。** git clone https://github.com/afaqurk/linux-dash.git sudo cp -r linux-dash/ /var/www/ sudo chown -R nginx:nginx /var/www -**Next, restart Nginx web server as well as** php-fpm +**接下来，重启 Nginx和php-fpm** sudo service nginx restart sudo service php-fpm restart -**Set nginx and php-fpm to auto-start upon boot** +**设置nginx和php-fpm开机自动启动** sudo chkconfig nginx on sudo chkconfig php-fpm on -In this example, we have configured linux-dash to use TCP port 8080. So make sure that the firewall is not blocking TCP port 8080. +在本例中，我们使用TCP端口8080配置linux-dash。因此确保防火墙没有阻止8080 TCP端口。 -### Monitor a Linux server with linux-dash ### +### 用linux-dash监控Linux服务器 ### -You can access Linux-dash by pointing you browser to **http://:8080/linux-dash/** +你现在可以在浏览器中输入**http://:8080/linux-dash/**来访问Linux-dash。 -The web dashboard consists of several widgets, each of which displays particular system properties. You can customize the look of the web dashboard by rearranging and/or closing some of the widgets. +web面板包含了不同的组件，每个都显示独特的系统属性。你可以自定义web面板的外观也可以关闭一些组件。 ![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Lin-dash.png) -Good day! +美好的一天！ -See you guys with next article. + +下篇文章中再见。 -------------------------------------------------------------------------------- via: http://www.unixmen.com/install-linux-dash-web-based-monitoring-system-centosrhel/ 作者：[Jijo][a] -译者：[译者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/) 荣誉推出 From f81e09949a951441c6539b8b051cb0ea4ba99d55 Mon Sep 17 00:00:00 2001 From: alim0x Date: Wed, 4 Feb 2015 23:46:04 +0800 Subject: [PATCH 166/207] [translating]14 - the history of Android --- .../The history of Android/14 - The history of Android.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/talk/The history of Android/14 - The history of Android.md b/sources/talk/The history of Android/14 - The history of Android.md index 2825d7eee8..3377527026 100644 --- a/sources/talk/The history of Android/14 - The history of Android.md +++ b/sources/talk/The history of Android/14 - The history of Android.md @@ -1,3 +1,5 @@ +alim0x translating + The history of Android ================================================================================ ### Voice Actions—a supercomputer in your pocket ### @@ -79,4 +81,4 @@ via: http://arstechnica.com/gadgets/2014/06/building-android-a-40000-word-histor [5]:http://arstechnica.com/gadgets/2013/12/google-robots-former-android-chief-will-lead-google-robotics-division/ [6]:http://arstechnica.com/gadgets/2013/12/lg-g-flex-review-form-over-even-basic-function/ [a]:http://arstechnica.com/author/ronamadeo -[t]:https://twitter.com/RonAmadeo \ No newline at end of file +[t]:https://twitter.com/RonAmadeo From 012b1048e24b044b86f7481bf05658b5e07dbd25 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 5 Feb 2015 10:30:55 +0800 Subject: [PATCH 167/207] =?UTF-8?q?20150205-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rth of Devuan GNU or Linux Distribution.md | 98 +++++++++++++++++++ ...Smartphones Like Weather Conky In Linux.md | 84 ++++++++++++++++ ...rs--How to install Go language on Linux.md | 96 ++++++++++++++++++ 3 files changed, 278 insertions(+) create mode 100644 sources/news/20150205 Debian Forked over systemd--Birth of Devuan GNU or Linux Distribution.md create mode 100644 sources/tech/20150205 How To Use Smartphones Like Weather Conky In Linux.md create mode 100644 sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md diff --git a/sources/news/20150205 Debian Forked over systemd--Birth of Devuan GNU or Linux Distribution.md b/sources/news/20150205 Debian Forked over systemd--Birth of Devuan GNU or Linux Distribution.md new file mode 100644 index 0000000000..89299a55d5 --- /dev/null +++ b/sources/news/20150205 Debian Forked over systemd--Birth of Devuan GNU or Linux Distribution.md @@ -0,0 +1,98 @@ +Debian Forked over systemd: Birth of Devuan GNU/Linux Distribution +================================================================================ +Debian GNU/Linux distribution is one of the oldest Linux distribution that is currently in working state. init used to be the default central management and configuration platform for Linux operating system before systemd emerged. Systemd from the date of its release has been very much controversial. + +Sooner or later it has replaced init on most of the Linux distribution. Debian remained no exception and Debian 8 codename JESSIE will be having systemd by default. The Debian adaptation of systemd in replacement of init caused polarization. This led to forking of Debian and hence Devuan GNU/Linux distribution born. + +Devuan project started with the primary goal to put back nit and remove controversial systemd. A lot of Linux Distribution are based on Debian or a derivative of Debian and one does not simply fork Debian. Debian will always attract developers. + +### What Devuan is all About? ### + +Devuan in Italian (pronounced Devone in English) suggests “Don’t panic and keep forking Debian”, for Init-Freedom lovers. Developers see Devuan as the beginning of a process which aims at base distribution and is able to protect the freedom of developers and community. + +![Devuan Linux](http://www.tecmint.com/wp-content/uploads/2015/02/Devuan-Linux.jpg) + +Debian Forked over systemd: Birth of Devuan Linux + +Devuan project priority includes – interoperability, diversity and backward compatibility. It will derive its own installer and repos from Debian and modify where ever required. If everything works smooth by the mid of 2015 users can switch to Devuan from Debian 7 and start using devuan repos. + +The process of switching will fairly remain as simple as upgrading a Debian installation. The project will be as minimal as possible and completely in accordance of UNIX philosophy – “Doing one thing and doing it well”. The targeted users of Devuan will be System Admins, Developers and users having experience of Debian. + +The project started by italian developers has raised a fund of 4.5k€ (EUR) in the year 2014. They have moved distro infrastructure from GitHub to GitLab, progress on Loginkit (systemd Logind replaced), discussing Logo and other important aspects useful in long run. + +A few of the Logos are in discussion now are shown in the picture. + +![Devuan Logo Proposals](http://www.tecmint.com/wp-content/uploads/2015/02/Devuan-Logos.jpeg) + +Devuan Logo Proposals + +Have a look at them here at: [http://without-systemd.org/wiki/index.php/Category:Logo][1] + +The unrest over systemd that gave birth to Devuan is good or bad? Lets have a look. + +### Is Devuan fork a good thing? ### + +Well! difficult to answer that forking such a huge distro is really going to be of any good. A (group of) developer(s) who initially were working with Debian got unsatisfied with systemd and forked it. + +Now the actual number of developers working on Debian/Systemd decreased which is going to affect the productivity of both the projects. Now the same number of developers are working on two different projects. + +What you think would be the fate of Devuan as well as Debian project? Won’t it hinder the progress of either distro and Linux in the long run? + +Please give your [comments][2] about Devuan project. + +注：如果可以在发布文章的时候发布一个调查，就把下面这段发成一个调查，如果不行，就直接嵌入js代码 + + + +Do you think systemd for Debian is + +Good +Bad +Don't Know +Don't Care +Other: + +VoteView ResultsPolldaddy.com + + +**Do you really feel that Debian with systemd will have a bad fate as depicted below** + +![Strip SystmeD](http://www.tecmint.com/wp-content/uploads/2015/02/Strip-SystmeD.jpg) + +Strip SystmeD + +Time to wait for Devuan 1.0 and lets see what it could contain. + +### Conclusion ### + +All the major Linux Distributions Like Fedora, RedHat, openSUSE, SUSE Enterprise, Arch, Megia have already switched to Systemd, Ubuntu and Debian are in the way to replace init with systemd. Only Gentoo and Slack till date have shown no interest in systemd but who knows someday even Gentoo and slack too started moving in the same direction. + +The reputation of Debian as a Linux Distro is something very few have reached the mark. It is blessed by some hundreds of developers and millions of users. The actual question is what percentage of users and developers were not comfortable with systemd. If the percentage is really high then what led debian to switch to systemd. Had it moved against the wishes of its users and developers. If this is the case the chance of success of devuan is pretty fair. Well how many developers put long hours of code punching for the project. + +Hope the fate of this project will not be something like those distros which once was started with high degree of passion and enthusiasm and later the developers got uninterested. + +Post Script : Linus Torvalds do not mind systemd that much. + +**If you need Devuan, then join and support it now!** + +Development : [https://git.devuan.org][3] +Donations : [https://devuan.org/donate.html][4] +Discussions : [https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng][5] +Devuan Developers : onelove@devuan.org + +-------------------------------------------------------------------------------- + +via: http://www.tecmint.com/debian-forked-over-systemd-birth-of-devuan-linux/ + +作者：[Avishek Kumar][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.tecmint.com/author/avishek/ +[1]:http://without-systemd.org/wiki/index.php/Category:Logo +[2]:http://www.tecmint.com/debian-forked-over-systemd-birth-of-devuan-linux/#comments +[3]:https://git.devuan.org/ +[4]:https://devuan.org/donate.html +[5]:https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng \ No newline at end of file diff --git a/sources/tech/20150205 How To Use Smartphones Like Weather Conky In Linux.md b/sources/tech/20150205 How To Use Smartphones Like Weather Conky In Linux.md new file mode 100644 index 0000000000..b5bbc69a3b --- /dev/null +++ b/sources/tech/20150205 How To Use Smartphones Like Weather Conky In Linux.md @@ -0,0 +1,84 @@ +How To Use Smartphones Like Weather Conky In Linux +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/02/Use_Weather_Conky_Linux.jpeg) + +Smartphones have those sleek weather widgets that blend in to the display. Thanks to Flair Weather Conky, you can get **smartphone like weather display on your Linux desktop**. We will be using a GUI tool [Conky Manager to easily manage Conky in Linux][1]. Let’s first see how to install Conky Manager in Ubuntu 14.10, 14.04, Linux Mint 17 and other Linux distributions. + +### Install Conky Manager ### + +Open a terminal and use the following commands: + + sudo add-apt-repository ppa:teejee2008/ppa + sudo apt-get update + sudo apt-get install conky-manager + +You can read this article on [how to use Conky Manager in Linux][1]. + +### Make sure curl is installed ### + +Do make sure that [curl][2] is installed. Use the following command: + + sudo apt-get install curl + +### Download Flair Weather Conky ### + +Get the Flair Weather Conky script from the link below: + +- [Download Flair Weather Conky Script][3] + +### Using Flair Weather Conky script in Conky Manager ### + +#### Step 1: #### + +Same as you install themes in Ubuntu 14.04, you should have a .conky directory in your Home folder. If you use command line, I don’t need to tell you how to find that. For beginners, go to your Home directory from File manager and press Ctrl+H to [show hidden files in Ubuntu][4]. Look for .conky folder here. If there is no such folder, make one. + +#### Step 2: #### + +In the .conky directory, extract the downloaded Flair Weather file. Do note that by default it is extracted to .conky directory itself. So go in this directory and get the Flair Weather folder out of it and paste it to actual .conky directory. + +#### Step 3: #### + +Flair Weather uses Yahoo and it doesn’t recognize your location automatically. You’ll need to manually edit it. Go to [Yahoo Weather][5] and get the location of id of your city by typing your city/pin code. You can get the location id from the URL. + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/02/Yahoo_Weather_Location_Code.jpeg) + +#### Step 4: #### + +Open Conky Manager. It should be able to read the newly installed Conky script. There are two variants, dark and light, available. You can choose whichever you prefer. You can should see the conky displayed on the desktop as soon as you select it. + +Default location in Flair Weather is set to Melbourne. You’ll have to manually edit the conky. + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/02/Using_Weather_Conky_Ubuntu.jpeg) + +#### Step 5: #### + +In the screenshot above, you can see the option to edit the selected conky. In the editor opened, look for location or WOEID. Change it with the location code you got in step 3. Now restart the Conky. + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/02/Edit_Conky.jpeg) + +In the same place, if you replace C by F, the unit of temperature will be changed to Fahrenheit from Celsius. Don’t forget to restart the Conky to see the changes made. + +#### Give it a try #### + +In this article we actually learned quite few things. We saw how we can use any Conky script easily, how to edit the scripts and how to use Conky Manager for various purposes. I hope you find it useful. + +A word of caution, Ubuntu 14.10 users might see overlapped time numerals. Please make the developer ware of any such issues. + +I have already shown you the screenshot of how the Flair Weather conky looked in my system. Time for you to try this and flaunt your desktop. + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/weather-conky-linux/ + +作者：[Abhishek][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:http://itsfoss.com/conky-gui-ubuntu-1304/ +[2]:http://www.computerhope.com/unix/curl.htm +[3]:http://speedracker.deviantart.com/art/Flair-Weather-Conky-Made-for-Conky-Manager-510130311 +[4]:http://itsfoss.com/hide-folders-and-show-hidden-files-in-ubuntu-beginner-trick/ +[5]:https://weather.yahoo.com/ \ No newline at end of file diff --git a/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md b/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md new file mode 100644 index 0000000000..410d7a79b7 --- /dev/null +++ b/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md @@ -0,0 +1,96 @@ +Linux FAQs with Answers--How to install Go language on Linux +================================================================================ +Go (also called "golang") is an open-source programming language initially developed by Google. It was born with several design principles in mind: simplicity, safety, and speed. The Go language distribution comes with various tools for debugging, testing, profiling and code-vetting. Nowadays the Go language and its tool chain are available in the base repositories of most Linux distributions, making it easy to install them with a default package manager. + +### Install Go Language on Ubuntu, Debian or Linux Mint ### + +The following **apt-get** command will install Go language and its development tools on Debian-based distributions. + + $ sudo apt-get install golang + +Check the version of Go language to verify installation. + + $ go version + +---------- + + go version go1.2.1 linux/amd64 + +Depending on your need, you may want to install additional Go tools using apt-get. + + $ sudo apt-cache search golang + +![](https://farm8.staticflickr.com/7430/15812762183_f094e3bf92_c.jpg) + +### Install Go Language on Fedora, CentOS/RHEL ### + +The following yum command will install Go language and its development tools on Red Hat based distributions. + + $ sudo yum install golang + +Check the version of Go language to verify installation. + + $ go version + +---------- + + go version go1.3.3 linux/amd64 + +Depending on your need, you can install additional Go tools using yum. + + $ yum search golang + +![](https://farm8.staticflickr.com/7373/16432817805_775010dc18_c.jpg) + +### Install Go Language from the Official Website ### + +Sometimes the version of Go language that comes with your Linux distribution may not be up-to-date. In that case, you can install the latest Go language from its official website. Here is how you can do it. + +Go to the [official source][1] of Go language, and download pre-built binaries. + +**For 64-bit Linux:** + + $ wget https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz + +**For 32-bit Linux:** + + $ wget https://storage.googleapis.com/golang/go1.4.1.linux-386.tar.gz + +**Install the binaries under /usr/local.** + + $ sudo tar -xzf go1.4.1.linux-xxx.tar.gz -C /usr/local + +Update the PATH environment variable system-wide by appending the following line in /etc/profile. + + $ sudo vi /etc/profile + +---------- + + export PATH=$PATH:/usr/local/go/bin + +If you installed Go in a custom location other than /usr/local, you also need to set GOROOT environment variable to point to the custom location. + + $ sudo vi /etc/profile + +---------- + + export GOROOT=/path/to/custom/location + +Check the version of Go language. + + $ go version + +---------- + + go version go1.4.1 linux/amd64 + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/install-go-language-linux.html + +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:https://golang.org/dl/ \ No newline at end of file From e3fb9473867d032905c70ef35064c5ef224cc229 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 5 Feb 2015 10:58:31 +0800 Subject: [PATCH 168/207] =?UTF-8?q?20150205-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...esults Surface Top Open Source Projects.md | 32 ++ ...Scripting interview Questions & Answers.md | 377 ++++++++++++++++++ ... Tool to Setup IPsec Based VPN in Linux.md | 113 ++++++ 3 files changed, 522 insertions(+) create mode 100644 sources/talk/20150205 LinuxQuestions Survey Results Surface Top Open Source Projects.md create mode 100644 sources/tech/20150205 25 Linux Shell Scripting interview Questions & Answers.md create mode 100644 sources/tech/20150205 Install Strongswan - A Tool to Setup IPsec Based VPN in Linux.md diff --git a/sources/talk/20150205 LinuxQuestions Survey Results Surface Top Open Source Projects.md b/sources/talk/20150205 LinuxQuestions Survey Results Surface Top Open Source Projects.md new file mode 100644 index 0000000000..c591faafcd --- /dev/null +++ b/sources/talk/20150205 LinuxQuestions Survey Results Surface Top Open Source Projects.md @@ -0,0 +1,32 @@ +LinuxQuestions Survey Results Surface Top Open Source Projects +================================================================================ +![](http://farm5.static.flickr.com/4099/4777335328_3cc363c419_m.jpg) + +Many people in the Linux community look forward to the always highly detailed and reliable results of the annual surveys from LinuxQuestions.org. As [Susan covered in detail in this post][1], this year's [results][2], focused on what readers at the site deem to be the best open source projects, are now available. Most of the people at LinuxQuestions are expert-level users who are on the site to answer questions from newer Linux users. + +In addition to the summary results that Susan provided in her post, below you'll find a graphical snapshot of what the experts took note of on the open source front. + +You can get a very nice graphical summary of the findings from the LinuxQuestions survey [here][3]. Here is a snapshot of the site's determination of the best Linux distributions, where Mint and Slackware fare quite well: + +![](http://i1311.photobucket.com/albums/s669/webworkerdaily/lin_zps9ogvyrty.png) + +And below is a snapshot of the site's determination of the best cloud projects. Notably, the LinuxQuestions crowd gives very high praise to ownCloud. Definiitely check into the full results of the survey at the site, see [Susan's summary][4] of winners, and check out all the good graphics [here][5]. + +![](http://i1311.photobucket.com/albums/s669/webworkerdaily/lin2_zps9nxf7yyi.png) + +-------------------------------------------------------------------------------- + +via: http://ostatic.com/blog/linuxquestions-survey-results-surface-top-open-source-projects + +作者：[Sam Dean][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://ostatic.com/member/samdean +[1]:http://ostatic.com/blog/lq-members-choice-award-winners-announced +[2]:http://www.linuxquestions.org/questions/linux-news-59/2014-linuxquestions-org-members-choice-award-winners-4175532948/ +[3]:http://www.linuxquestions.org/questions/2014mca.php +[4]:http://ostatic.com/blog/lq-members-choice-award-winners-announced +[5]:http://www.linuxquestions.org/questions/2014mca.php \ No newline at end of file diff --git a/sources/tech/20150205 25 Linux Shell Scripting interview Questions & Answers.md b/sources/tech/20150205 25 Linux Shell Scripting interview Questions & Answers.md new file mode 100644 index 0000000000..a042cba174 --- /dev/null +++ b/sources/tech/20150205 25 Linux Shell Scripting interview Questions & Answers.md @@ -0,0 +1,377 @@ +25 Linux Shell Scripting interview Questions & Answers +================================================================================ +### Q:1 What is Shell Script and why it is required ? ### + +Ans: A Shell Script is a text file that contains one or more commands. As a system administrator we often need to issue number of commands to accomplish the task, we can add these all commands together in a text file (Shell Script) to complete daily routine task. + +### Q:2 What is the default login shell and how to change default login shell for a specific user ? ### + +Ans: In Linux like Operating system “/bin/bash” is the default login shell which is assigned while user creation. We can change default shell using the “chsh” command . Example is shown below : + + # chsh -s + # chsh linuxtechi -s /bin/sh + +### Q:3 What are the different type of variables used in a shell Script ? ### + +Ans: In a shell script we can use two types of variables : + +- System defined variables +- User defined variables + +System defined variables are defined or created by Operating System(Linux) itself. These variables are generally defined in Capital Letters and can be viewed by “**set**” command. + +User defined variables are created or defined by system users and the values of variables can be viewed by using the command “`echo $`” + +### Q:4 How to redirect both standard output and standard error to the same location ? ### + +Ans: There two method to redirect std output and std error to the same location: + +Method:1 2>&1 (# ls /usr/share/doc > out.txt 2>&1 ) + +Method:2 &> (# ls /usr/share/doc &> out.txt ) + +### Q:5 What is the Syntax of “nested if statement” in shell scripting ? ### + +Ans : Basic Syntax is shown below : + + if [ Condition ] + then + command1 + command2 + ….. + else + if [ condition ] + then + command1 + command2 + …. + else + command1 + command2 + ….. + fi + fi + +### Q:6 What is the use of “$?” sign in shell script ? ### + +Ans:While writing a shell script , if you want to check whether previous command is executed successfully or not , then we can use “$?” with if statement to check the exit status of previous command. Basic example is shown below : + + root@localhost:~# ls /usr/bin/shar + /usr/bin/shar + root@localhost:~# echo $? + 0 + +If exit status is 0 , then command is executed successfully + + root@localhost:~# ls /usr/bin/share + + ls: cannot access /usr/bin/share: No such file or directory + root@localhost:~# echo $? + 2 + +If the exit status is other than 0, then we can say command is not executed successfully. + +### Q:7 How to compare numbers in Linux shell Scripting ? ### + +Ans: test command is used to compare numbers in if-then statement. Example is shown below : + + #!/bin/bash + x=10 + y=20 + + if [ $x -gt $y ] + then + echo “x is greater than y” + else + echo “y is greater than x” + fi + +### Q:8 What is the use of break command ? ### + +Ans: The break command is a simple way to escape out of a loop in progress. We can use the break command to exit out from any loop, including while and until loops. + +### Q:9 What is the use of continue command in shell scripting ? ### + +Ans The continue command is identical to break command except it causes the present iteration of the loop to exit, instead of the entire loop. Continue command is useful in some scenarios where error has occurred but we still want to execute the next commands of the loop. + +### Q:10 Tell me the Syntax of “Case statement” in Linux shell scripting ? ### + +Ans: The basic syntax is shown below : + + case word in + value1) + command1 + command2 + ….. + last_command + !! + value2) + command1 + command2 + …… + last_command + ;; + esac + +### Q:11 What is the basic syntax of while loop in shell scripting ? ### + +Ans: Like the for loop, the while loop repeats its block of commands a number of times. Unlike the for loop, however, the while loop iterates until its while condition is no longer true. The basic syntax is : + + while [ test_condition ] + do + commands… + done + +### Q:12 How to make a shell script executable ? ### + +Ans: Using the chmod command we can make a shell script executable. Example is shown below : + + # chmod a+x myscript.sh + +### Q:13 What is the use of “#!/bin/bash” ? ### + +Ans: #!/bin/bash is the first of a shell script , known as shebang , where # symbol is called hash and ‘!’ is called as bang. It shows that command to be executed via /bin/bash. + +### Q:14 What is the syntax of for loop in shell script ? ### + +Ans: Basic Syntax of for loop is given below : + + for variables in list_of_items + do + command1 + command2 + …. + last_command + done + +### Q:15 How to debug a shell script ? ### + +Ans: A shell script can be debug if we execute the script with ‘-x’ option ( sh -x myscript.sh). Another way to debug a shell script is by using ‘-nv’ option ( sh -nv myscript.sh). + +### Q:16 How compare the strings in shell script ? ### + +Ans: test command is used to compare the text strings. The test command compares text strings by comparing each character in each string. + +### Q:17 What are the Special Variables set by Bourne shell for command line arguments ? ### + +Ans: The following table lists the special variables set by the Bourne shell for command line arguments . + +注：表格部分 +
+++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Special Variables

+		 +

Holds

+
+

$0

+		 +

Name of the Script from the command line

+
+

$1

+		 +

First Command-line argument

+
+

$2

+		 +

Second Command-line argument

+
+

…..

+		 +

…….

+
+

$9

+		 +

Ninth Command line argument

+
+

$#

+		 +

Number of Command line arguments

+
+

$*

+		 +

All Command-line arguments, separated with spaces

+
+ +### Q:18 How to test files in a shell script ? ### + +Ans: test command is used to perform different test on the files. Basic test are listed below : + +注：表格部分 + +++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Test

+		 +

Usage

+
+

-d file_name

+		 +

Returns true if the file exists and is a directory

+
+

-e file_name

+		 +

Returns true if the file exists

+
+

-f file_name

+		 +

Returns true if the file exists and is a regular file

+
+

-r file_name

+		 +

Returns true if the file exists and have read permissions

+
+

-s file_name

+		 +

Returns true if the file exists and is not empty

+
+

-w file_name

+		 +

Returns true if the file exists and have write permissions

+
+

-x file_name

+		 +

Returns true if the file exists and have execute permissions

+
+ +### Q:19 How to put comments in your shell script ? ### + +Ans: Comments are the messages to yourself and for other users that describe what a script is supposed to do and how its works.To put comments in your script, start each comment line with a hash sign (#) . Example is shown below : + + #!/bin/bash + # This is a command + echo “I am logged in as $USER” + +### Q:20 How to get input from the terminal for shell script ? ### + +Ans: ‘read’ command reads in data from the terminal (using keyboard). The read command takes in whatever the user types and places the text into the variable you name. Example is shown below : + + # vi /tmp/test.sh + + #!/bin/bash + echo ‘Please enter your name’ + read name + echo “My Name is $name” + + # ./test.sh + Please enter your name + LinuxTechi + My Name is LinuxTechi + +### Q:21 How to unset or de-assign variables ? ### + +Ans: ‘unset’ command is used to de-assign or unset a variable. Syntax is shown below : + + # unset + +### Q:22 How to perform arithmetic operation ? ### + +Ans: There are two ways to perform arithmetic operations : + +1. Using `expr` command (# expr 5 + 2 ) +2. using a dollar sign and square brackets ( `$[ operation ]` ) Example : test=$[16 + 4] ; test=$[16 + 4] + +### Q:23 Basic Syntax of do-while statement ? ### + +Ans: The do-while statement is similar to the while statement but performs the statements before checking the condition statement. The following is the format for the do-while statement: + + do + { + statements + } while (condition) + +### Q:24 How to define functions in shell scripting ? ### + +Ans: A function is simply a block of of code with a name. When we give a name to a block of code, we can then call that name in our script, and that block will be executed. Example is shown below : + + $ diskusage () { df -h ; } + +### Q:25 How to use bc (bash calculator) in a shell script ? ### + +Ans: Use the below Syntax to use bc in shell script. + + variable=`echo “options; expression” | bc` + +-------------------------------------------------------------------------------- + +via: http://www.linuxtechi.com/linux-shell-scripting-interview-questions-answers/ + +作者：[Pradeep Kumar][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.linuxtechi.com/author/pradeep/ \ No newline at end of file diff --git a/sources/tech/20150205 Install Strongswan - A Tool to Setup IPsec Based VPN in Linux.md b/sources/tech/20150205 Install Strongswan - A Tool to Setup IPsec Based VPN in Linux.md new file mode 100644 index 0000000000..ca909934fa --- /dev/null +++ b/sources/tech/20150205 Install Strongswan - A Tool to Setup IPsec Based VPN in Linux.md @@ -0,0 +1,113 @@ +Install Strongswan - A Tool to Setup IPsec Based VPN in Linux +================================================================================ +IPsec is a standard which provides the security at network layer. It consist of authentication header (AH) and encapsulating security payload (ESP) components. AH provides the packet Integrity and confidentiality is provided by ESP component . IPsec ensures the following security features at network layer. + +- Confidentiality +- Integrity of packet +- Source Non. Repudiation +- Replay attack protection + +[Strongswan][1] is an open source implementation of IPsec protocol and Strongswan stands for Strong Secure WAN (StrongS/WAN). It supports the both version of automatic keying exchange in IPsec VPN (Internet keying Exchange (IKE) V1 & V2). + +Strongswan basically provides the automatic keying sharing between two nodes/gateway of the VPN and after that it uses the Linux Kernel implementation of IPsec (AH & ESP). Key shared using IKE mechanism is further used in the ESP for the encryption of data. In IKE phase, strongswan uses the encryption algorithms (AES,SHA etc) of OpenSSL and other crypto libraries. However, ESP component of IPsec uses the security algorithm which are implemented in the Linux Kernel. The main features of Strongswan are given below. + +- 509 certificates or pre-shared keys based Authentication +- Support of IKEv1 and IKEv2 key exchange protocols +- Optional built-in integrity and crypto tests for plugins and libraries +- Support of elliptic curve DH groups and ECDSA certificates +- Storage of RSA private keys and certificates on a smartcard. + +It can be used in the client / server (road warrior) and gateway to gateway scenarios. + +### How to Install ### + +Almost all Linux distro’s, supports the binary package of Strongswan. In this tutorial, we will install the strongswan from binary package and also the compilation of strongswan source code with desirable features. + +### Using binary package ### + +Strongswan can be installed using following command on Ubuntu 14.04 LTS . + + $sudo aptitude install strongswan + +![Installation of strongswan](http://blog.linoxide.com/wp-content/uploads/2014/12/strongswan-binary.png) + +The global configuration (strongswan.conf) file and ipsec configuration (ipsec.conf/ipsec.secrets) files of strongswan are under /etc/ directory. + +### Pre-requisite for strongswan source compilation & installation ### + +- GMP (Mathematical/Precision Library used by strongswan) +- OpenSSL (Crypto Algorithms from this library) +- PKCS (1,7,8,11,12)(Certificate encoding and smart card integration with Strongswan ) + +#### Procedure #### + +**1)** Go to /usr/src/ directory using following command in the terminal. + + $cd /usr/src + +**2)** Download the source code from strongswan site suing following command + + $sudo wget http://download.strongswan.org/strongswan-5.2.1.tar.gz + +(strongswan-5.2.1.tar.gz is the latest version.) + +![Downloading software](http://blog.linoxide.com/wp-content/uploads/2014/12/download_strongswan.png) + +**3)** Extract the downloaded software and go inside it using following command. + + $sudo tar –xvzf strongswan-5.2.1.tar.gz; cd strongswan-5.2.1 + +**4)** Configure the strongswan as per desired options using configure command. + + ./configure --prefix=/usr/local -–enable-pkcs11 -–enable-openssl + +![checking packages for strongswan](http://blog.linoxide.com/wp-content/uploads/2014/12/strongswan-configure.png) + +If GMP library is not installed, then configure script will generate following error. + +![GMP library error](http://blog.linoxide.com/wp-content/uploads/2014/12/gmp-error.png) + +Therefore, first of all, install the GMP library using following command and then run the configure script. + +![gmp installation](http://blog.linoxide.com/wp-content/uploads/2014/12/gmp-installation1.png) + +However, if GMP is already installed and still above error exists then create soft link of libgmp.so library at /usr/lib , /lib/, /usr/lib/x86_64-linux-gnu/ paths in Ubuntu using following command. + + $ sudo ln -s /usr/lib/x86_64-linux-gnu/libgmp.so.10.1.3 /usr/lib/x86_64-linux-gnu/libgmp.so + +![softlink of libgmp.so library](http://blog.linoxide.com/wp-content/uploads/2014/12/softlink.png) + +After the creation of libgmp.so softlink, again run the ./configure script and it may find the gmp library. However, it may generate another error of gmp header file which is shown the following figure. + +![GMP header file issu](http://blog.linoxide.com/wp-content/uploads/2014/12/gmp-header.png) + +Install the libgmp-dev package using following command for the solution of above error. + + $sudo aptitude install libgmp-dev + +![Installation of Development library of GMP](http://blog.linoxide.com/wp-content/uploads/2014/12/gmp-dev.png) + +After installation of development package of gmp library, again run the configure script and if it does not produce any error, then the following output will be displayed. + +![Output of Configure scirpt](http://blog.linoxide.com/wp-content/uploads/2014/12/successful-run.png) + +Type the following commands for the compilation and installation of strongswan. + + $ sudo make ; sudo make install + +After the installation of strongswan , the Global configuration (strongswan.conf) and ipsec policy/secret configuration files (ipsec.conf/ipsec.secretes) are placed in **/usr/local/etc** directory. + +Strongswan can be used as tunnel or transport mode depends on our security need. It provides well known site-2-site and road warrior VPNs. It can be use easily with Cisco,Juniper devices. + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/security/install-strongswan/ + +作者：[nido][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/naveeda/ +[1]:https://www.strongswan.org/ \ No newline at end of file From f1ace6f2b135827e9fe8a48ee1f578b06074e223 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 5 Feb 2015 11:42:25 +0800 Subject: [PATCH 169/207] =?UTF-8?q?20150205-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rity Bug Hits Linux, But is it That Bad.md | 34 ++ ...l or Configure VNC Server On CentOS 7.0.md | 161 +++++++ ... Security Using WPScan, Nmap, And Nikto.md | 424 ++++++++++++++++++ ...ystem And Hardware Information On Linux.md | 171 +++++++ ...ngle Network Interface Card On CentOS 7.md | 208 +++++++++ ...--A versatile deduplicating backup tool.md | 63 +++ 6 files changed, 1061 insertions(+) create mode 100644 sources/talk/20150205 GHOST--Another Security Bug Hits Linux, But is it That Bad.md create mode 100644 sources/tech/20150205 How To Install or Configure VNC Server On CentOS 7.0.md create mode 100644 sources/tech/20150205 How To Scan And Check A WordPress Website Security Using WPScan, Nmap, And Nikto.md create mode 100644 sources/tech/20150205 Inxi--Find System And Hardware Information On Linux.md create mode 100644 sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md create mode 100644 sources/tech/20150205 zBackup--A versatile deduplicating backup tool.md diff --git a/sources/talk/20150205 GHOST--Another Security Bug Hits Linux, But is it That Bad.md b/sources/talk/20150205 GHOST--Another Security Bug Hits Linux, But is it That Bad.md new file mode 100644 index 0000000000..90923c1aae --- /dev/null +++ b/sources/talk/20150205 GHOST--Another Security Bug Hits Linux, But is it That Bad.md @@ -0,0 +1,34 @@ +GHOST: Another Security Bug Hits Linux, But is it That Bad? +================================================================================ +> GHOST, a newly announced security vulnerability that affects Linux servers and other systems that use the open source glibc library, is not as dangerous to data privacy as the Shellshock or Heartbleed bugs. + +![](http://thevarguy.com/site-files/thevarguy.com/files/imagecache/medium_img/uploads/2015/01/ghost-costume.jpg) + +Heartbleed is not even a year behind us, and the open source world has been hit with another major security vulnerability in the form of [GHOST][1], which involves holes in the Linux glibc library. This time, though, the actual danger may not live up to the hype. + +The GHOST vulnerability, which was announced last week by security researchers at [Qualys][2], resides in the gethostbyname*() functions of the glibc library. glibc is one of the core building blocks of most Linux systems, and gethostbyname*(), which resolves domain names into IP addresses, is widely used in open source applications. + +Attackers can exploit the GHOST security hole to create a buffer overflow, making it possible to execute any kind of code they want and do all sorts of nasty things. + +All of the above suggests that GHOST is bad news indeed. Fortunately for the open source community, however, the actual risk appears small. As TrendMicro [points out][3], the bug that makes the exploit possible has been fixed in glibc since May 2013, meaning that any Linux servers or PCs running more recent versions of the software are safe from attack. + +In addition, gethostbyname*() has been superseded by newer glibc functions that can better handle modern networking environments. Those include ones that use the IPv6 protocol, which gethostbyname*() doesn't support. As a result, newer applications often don't use the gethostbyname*() functions, and are not at risk. + +And perhaps most importantly, there's currently no known way of executing GHOST attacks through the Web. That greatly reduces opportunities for using this vulnerability to steal the data of unsuspecting users or otherwise wreak havoc. + +All in all, then, GHOST doesn't seem like a vulnerability that will prove as serious as Heartbleed or Shellshock, two other recent security problems that affected widely used open source software. + +-------------------------------------------------------------------------------- + +via: http://thevarguy.com/open-source-application-software-companies/020415/ghost-another-security-bug-hits-linux-it-bad + +作者：[Christopher Tozzi][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://thevarguy.com/author/christopher-tozzi +[1]:https://community.qualys.com/blogs/laws-of-vulnerabilities/2015/01/27/the-ghost-vulnerability +[2]:http://qualys.com/ +[3]:http://blog.trendmicro.com/trendlabs-security-intelligence/not-so-spooky-linux-ghost-vulnerability/ \ No newline at end of file diff --git a/sources/tech/20150205 How To Install or Configure VNC Server On CentOS 7.0.md b/sources/tech/20150205 How To Install or Configure VNC Server On CentOS 7.0.md new file mode 100644 index 0000000000..3eaba972f8 --- /dev/null +++ b/sources/tech/20150205 How To Install or Configure VNC Server On CentOS 7.0.md @@ -0,0 +1,161 @@ +How To Install / Configure VNC Server On CentOS 7.0 +================================================================================ +Hi there, this tutorial is all about how to install or setup [VNC][1] Server on your very CentOS 7. This tutorial also works fine in RHEL 7. In this tutorial, we'll learn what is VNC and how to install or setup [VNC Server][1] on CentOS 7 + +As we know, most of the time as a system administrator we are managing our servers over the network. It is very rare that we will need to have a physical access to any of our managed servers. In most cases all we need is to SSH remotely to do our administration tasks. In this article we will configure a GUI alternative to a remote access to our CentOS 7 server, which is VNC. VNC allows us to open a remote GUI session to our server and thus providing us with a full graphical interface accessible from any remote location. + +VNC server is a Free and Open Source Software which is designed for allowing remote access to the Desktop Environment of the server to the VNC Client whereas VNC viewer is used on remote computer to connect to the server . + +**Some Benefits of VNC server are listed below:** + + Remote GUI administration makes work easy & convenient. + Clipboard sharing between host CentOS server & VNC-client machine. + GUI tools can be installed on the host CentOS server to make the administration more powerful + Host CentOS server can be administered through any OS having the VNC-client installed. + More reliable over ssh graphics and RDP connections. + +So, now lets start our journey towards the installation of VNC Server. We need to follow the steps below to setup and to get a working VNC. + +First of all we'll need a working Desktop Environment (X-Windows), if we don't have a working GUI Desktop Environment (X Windows) running, we'll need to install it first. + +**Note: The commands below must be running under root privilege. To switch to root please execute "sudo -s" under a shell or terminal without quotes("")** + +### 1. Installing X-Windows ### + +First of all to install [X-Windows][2] we'll need to execute the below commands in a shell or terminal. It will take few minutes to install its packages. + + # yum check-update + # yum groupinstall "X Window System" + +![installing x windows](http://blog.linoxide.com/wp-content/uploads/2015/01/installing-x-windows.png) + + #yum install gnome-classic-session gnome-terminal nautilus-open-terminal control-center liberation-mono-fonts + +![install gnome classic session](http://blog.linoxide.com/wp-content/uploads/2015/01/gnome-classic-session-install.png) + + # unlink /etc/systemd/system/default.target + # ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target + +![configuring graphics](http://blog.linoxide.com/wp-content/uploads/2015/01/configuring-graphics.png) + + # reboot + +After our machine restarts, we'll get a working CentOS 7 Desktop. + +Now, we'll install VNC Server on our machine. + +### 2. Installing VNC Server Package ### + +Now, we'll install VNC Server package in our CentOS 7 machine. To install VNC Server, we'll need to execute the following command. + + # yum install tigervnc-server -y + +![vnc server](http://blog.linoxide.com/wp-content/uploads/2015/01/install-tigervnc.png) + +### 3. Configuring VNC ### + +Then, we'll need to create a configuration file under **/etc/systemd/system/** directory. We can copy the **vncserver@:1.service** file from example file from **/lib/systemd/system/vncserver@.service** + + # cp /lib/systemd/system/vncserver@.service /etc/systemd/system/vncserver@:1.service + +![copying vnc server configuration](http://blog.linoxide.com/wp-content/uploads/2015/01/copying-configuration.png) + +Now we'll open **/etc/systemd/system/vncserver@:1.service** in our favorite text editor (here, we're gonna use **nano**). Then find the below lines of text in that file and replace with your username. Here, in my case its linoxide so I am replacing with linoxide and finally looks like below. + + ExecStart=/sbin/runuser -l -c "/usr/bin/vncserver %i" + PIDFile=/home//.vnc/%H%i.pid + +TO + + ExecStart=/sbin/runuser -l linoxide -c "/usr/bin/vncserver %i" + PIDFile=/home/linoxide/.vnc/%H%i.pid + +If you are creating for root user then + + ExecStart=/sbin/runuser -l root -c "/usr/bin/vncserver %i" + PIDFile=/root/.vnc/%H%i.pid + +![configuring user](http://blog.linoxide.com/wp-content/uploads/2015/01/configuring-user.png) + +Now, we'll need to reload our systemd. + + # systemctl daemon-reload + +Finally, we'll create VNC password for the user . To do so, first you'll need to be sure that you have sudo access to the user, here I will login to user "linoxide" then, execute the following. To login to linoxide we'll run "**su linoxide" without quotes** . + + # su linoxide + $ sudo vncpasswd + +![setting vnc password](http://blog.linoxide.com/wp-content/uploads/2015/01/vncpassword.png) + +**Make sure that you enter passwords more than 6 characters.** + +### 4. Enabling and Starting the service ### + +To enable service at startup ( Permanent ) execute the commands shown below. + + $ sudo systemctl enable vncserver@:1.service + +Then, start the service. + + $ sudo systemctl start vncserver@:1.service + +### 5. Allowing Firewalls ### + +We'll need to allow VNC services in Firewall now. + + $ sudo firewall-cmd --permanent --add-service vnc-server + $ sudo systemctl restart firewalld.service + +![allowing firewalld](http://blog.linoxide.com/wp-content/uploads/2015/01/allowing-firewalld.png) + +Now you can able to connect VNC server using IP and Port ( Eg : ip-address:1 ) + +### 6. Connecting the machine with VNC Client ### + +Finally, we are done installing VNC Server. No, we'll wanna connect the server machine and remotely access it. For that we'll need a VNC Client installed in our computer which will only enable us to remote access the server machine. + +![remote access vncserver from vncviewer](http://blog.linoxide.com/wp-content/uploads/2015/01/vncviewer.png) + +You can use VNC client like [Tightvnc viewer][3] and [Realvnc viewer][4] to connect Server. +To connect with additional users create files with different ports, please go to step 3 to configure and add a new user and port, You'll need to create **vncserver@:2.service** and replace the username in config file and continue the steps by replacing service name for different ports. **Please make sure you logged in as that particular user for creating vnc password**. + +VNC by itself runs on port 5900. Since each user will run their own VNC server, each user will have to connect via a separate port. The addition of a number in the file name tells VNC to run that service as a sub-port of 5900. So in our case, arun's VNC service will run on port 5901 (5900 + 1) and further will run on 5900 + x. Where, x denotes the port specified when creating config file **vncserver@:x.service for the further users**. + +We'll need to know the IP Address and Port of the server to connect with the client. IP addresses are the unique identity number of the machine. Here, my IP address is 96.126.120.92 and port for this user is 1. We can get the public IP address by executing the below command in a shell or terminal of the machine where VNC Server is installed. + + # curl -s checkip.dyndns.org|sed -e 's/.*Current IP Address: //' -e 's/<.*$//' + +### Conclusion ### + +Finally, we installed and configured VNC Server in the machine running CentOS 7 / RHEL 7 (Red Hat Enterprises Linux) . VNC is the most easy FOSS tool for the remote access and also a good alternative to Teamviewer Remote Access. VNC allows a user with VNC client installed to control the machine with VNC Server installed. Here are some commands listed below that are highly useful in VNC . Enjoy !! + +#### Additional Commands : #### + +- To stop VNC service . + + # systemctl stop vncserver@:1.service + +- To disable VNC service from startup. + + # systemctl disable vncserver@:1.service + +- To stop firewall. + + # systemctl stop firewalld.service + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-how-to/install-configure-vnc-server-centos-7-0/ + +作者：[Arun Pyasi][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/arunp/ +[1]:http://en.wikipedia.org/wiki/Virtual_Network_Computing +[2]:http://en.wikipedia.org/wiki/X_Window_System +[3]:http://www.tightvnc.com/ +[4]:https://www.realvnc.com/ \ No newline at end of file diff --git a/sources/tech/20150205 How To Scan And Check A WordPress Website Security Using WPScan, Nmap, And Nikto.md b/sources/tech/20150205 How To Scan And Check A WordPress Website Security Using WPScan, Nmap, And Nikto.md new file mode 100644 index 0000000000..4af1fc99cb --- /dev/null +++ b/sources/tech/20150205 How To Scan And Check A WordPress Website Security Using WPScan, Nmap, And Nikto.md @@ -0,0 +1,424 @@ +How To Scan And Check A WordPress Website Security Using WPScan, Nmap, And Nikto +================================================================================ +### Introduction ### + +Millions of websites are powered by WordPress software and there’s a reason for that. WordPress is the most developer-friendly content management system out there, so you can essentially do anything you want with it. Unfortunately, every day some scary report about a major site being hacked or a sensitive database being compromised hits the web … and freaks everyone out. + +If you haven’t installed WordPress yet, check the following article. +On Debian based systems: + +- [How to install WordPress On Ubuntu][1] + +On RPM based systems: + +- [How to install wordpress On CentOS][2] + +Following on from my previous article [How To Secure WordPress Website][3] show you **checklist** allows you to secure your WordPress site with as little effort as possible. + +In this article, will describe to you through the installation of **wpscan** and serve as a guide on how to use wpscan to locate any known vulnerable plugins and themes that may make your site vulnerable to attack. Also, how to install and use **nmap** the free Security Scanner For Network Exploration & Hacking . And at the end we will show you the steps to use **nikto**. + +### WPScan to Test for Vulnerable Plugins and Themes in WordPress ### + +**WPScan** is a black box WordPress Security Scanner written in Ruby which attempts to find known security weaknesses within WordPress installations. Its intended use it to be for security professionals or WordPress administrators to asses the security posture of their WordPress installations. The code base is Open Source and licensed under the GPLv3. + +### Download and Install WPScan ### + +Before we get started with the installation, it is important to note that wpscan will not work on Windows systems, so you will need access to a Linux or OSX installation to proceed. If you only have access to a Windows system you can download Virtualbox and install any Linux distro you like as a Virtual Machine. + +WPScan is hosted on Github, so if it is not already installed we will need to install the git packages before we can continue. + + sudo apt-get install git + +Once git is installed, we need to install the dependencies for wpscan. + + sudo apt-get install libcurl4-gnutls-dev libopenssl-ruby libxml2 libxml2-dev libxslt1-dev ruby-dev ruby1.9.3 + +Now we need to clone the wpscan package from github. + + git clone https://github.com/wpscanteam/wpscan.git + +Now we can move to the newly created wpscan directory and install the necessary ruby gems through bundler. + + cd wpscan + sudo gem install bundler && bundle install --without test development + +Now that we have wpscan installed, we will walk through using the tool to search for potentially vulnerable files on our WordPress installation. Some of the most important aspects of wpscan are its ability to enumerate not only plugins and themes, but users and timthumb installations as well. WPScan can also perform bruteforce attacks against WordPress– but that is outside of the scope of this article. + +#### Update wpscan #### + + ruby wpscan.rb --update + +#### Enumerate Plugins #### + +To enumerate plugins, all we need to do is launch wpscan with the `--enumerate p` arguments like so. + + ruby wpscan.rb --url http(s)://www.yoursiteurl.com --enumerate p + +or to only display vulnerable plugins: + + ruby wpscan.rb --url http(s)://www.yoursiteurl.com --enumerate vp + +Some example output is posted below: + + | Name: akismet + | Location: http://********.com/wp-content/plugins/akismet/ + + | Name: audio-player + | Location: http://********.com/wp-content/plugins/audio-player/ + | + | * Title: Audio Player - player.swf playerID Parameter XSS + | * Reference: http://seclists.org/bugtraq/2013/Feb/35 + | * Reference: http://secunia.com/advisories/52083 + | * Reference: http://osvdb.org/89963 + | * Fixed in: 2.0.4.6 + + | Name: bbpress - v2.3.2 + | Location: http://********.com/wp-content/plugins/bbpress/ + | Readme: http://********.com/wp-content/plugins/bbpress/readme.txt + | + | * Title: BBPress - Multiple Script Malformed Input Path Disclosure + | * Reference: http://xforce.iss.net/xforce/xfdb/78244 + | * Reference: http://packetstormsecurity.com/files/116123/ + | * Reference: http://osvdb.org/86399 + | * Reference: http://www.exploit-db.com/exploits/22396/ + | + | * Title: BBPress - forum.php page Parameter SQL Injection + | * Reference: http://xforce.iss.net/xforce/xfdb/78244 + | * Reference: http://packetstormsecurity.com/files/116123/ + | * Reference: http://osvdb.org/86400 + | * Reference: http://www.exploit-db.com/exploits/22396/ + + | Name: contact + | Location: http://********.com/wp-content/plugins/contact/ + +#### Enumerate Themes #### + +Enumeration of themes works the same as enumeration of plugins, just with the `--enumerate t` argument. + + ruby wpscan.rb --url http(s)://www.host-name.com --enumerate t + +Or to only display vulnerable themes: + + ruby wpscan.rb --url http(s)://www.host-name.com --enumerate vt + +Sample output: + + | Name: path + | Location: http://********.com/wp-content/themes/path/ + | Style URL: http://********.com/wp-content/themes/path/style.css + | Description: + + | Name: pub + | Location: http://********.com/wp-content/themes/pub/ + | Style URL: http://********.com/wp-content/themes/pub/style.css + | Description: + + | Name: rockstar + | Location: http://********.com/wp-content/themes/rockstar/ + | Style URL: http://********.com/wp-content/themes/rockstar/style.css + | Description: + | + | * Title: WooThemes WooFramework Remote Unauthenticated Shortcode Execution + | * Reference: https://gist.github.com/2523147 + + | Name: twentyten + | Location: http://********.com/wp-content/themes/twentyten/ + | Style URL: http://********.com/wp-content/themes/twentyten/style.css + | Description: + +#### Enumerate Users #### + +WPScan can also be used to enumerate users with valid logins to the WordPress installation. This is usually performed by attackers in order to get a list of users in preparation for a bruteforce attack. + + ruby wpscan.rb --url http(s)://www.host-name.com --enumerate u + +#### Enumerate Timthumb Files #### + +The last function of wpscan we’ll discuss in this article is the ability to enumerate timthumb installations. In recent years, timthumb has become a very common target of attackers due to the numerous vulnerabilities found and posted to online forums, message lists, and advisory boards. Using wpscan to find vulnerable timthumb files is done with the following command. + + ruby wpscan.rb --url http(s)://www.host-name.com --enumerate tt + +### Nmap to Scan for Open Ports on your VPS ### + +**Nmap** is an open source tool for network exploration and security auditing. It was designed to rapidly scan large networks, although it works fine against single hosts. Nmap uses raw IP packets in novel ways to determine what hosts are available on the network, what services (application name and version) those hosts are offering, what operating systems (and OS versions) they are running, what type of packet filters/firewalls are in use, and dozens of other characteristics + +### Download and install nmap on Debian and Ubuntu ### + +To install nmap for Debian and Ubuntu Linux based server systems type the following apt-get command: + + sudo apt-get install nmap + +**Sample outputs:** + + Reading package lists... Done + Building dependency tree + Reading state information... Done + The following NEW packages will be installed: + nmap + 0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded. + Need to get 1,643 kB of archives. + After this operation, 6,913 kB of additional disk space will be used. + Get:1 http://mirrors.service.networklayer.com/ubuntu/ precise/main nmap amd64 5.21-1.1ubuntu1 [1,643 kB] + Fetched 1,643 kB in 0s (16.4 MB/s) + Selecting previously unselected package nmap. + (Reading database ... 56834 files and directories currently installed.) + Unpacking nmap (from .../nmap_5.21-1.1ubuntu1_amd64.deb) ... + Processing triggers for man-db ... + Setting up nmap (5.21-1.1ubuntu1) ... + +#### Examples #### + +To find the nmap version, enter: + + nmap -V + +OR + + nmap --version + +**Sample outputs:** + + Nmap version 5.21 ( http://nmap.org ) + +### Dowonlad and install nmap on Centos ### + +To install nmap on RHEL based Linux distributions, type the following yum command: + + yum install nmap + +**Sample outputs:** + + Loaded plugins: protectbase, rhnplugin, security + 0 packages excluded due to repository protections + Setting up Install Process + Resolving Dependencies + --> Running transaction check + ---> Package nmap.x86_64 2:5.51-2.el6 will be installed + --> Finished Dependency Resolution + + Dependencies Resolved + + ================================================================================ + Package Arch Version Repository Size + ================================================================================ + Installing: + nmap x86_64 2:5.51-2.el6 rhel-x86_64-server-6 2.8 M + + Transaction Summary + ================================================================================ + Install 1 Package(s) + + Total download size: 2.8 M + Installed size: 0 + Is this ok [y/N]: y + Downloading Packages: + nmap-5.51-2.el6.x86_64.rpm | 2.8 MB 00:00 + Running rpm_check_debug + Running Transaction Test + Transaction Test Succeeded + Running Transaction + Installing : 2:nmap-5.51-2.el6.x86_64 1/1 + Verifying : 2:nmap-5.51-2.el6.x86_64 1/1 + + Installed: + nmap.x86_64 2:5.51-2.el6 + + Complete! + +#### Examples #### + +To find the nmap version, enter: + + nmap --version + +**Sample outputs:** + + Nmap version 5.51 ( http://nmap.org ) + +#### Scan Ports with Nmap #### + +You can got a lot of information about your server or host using nmap and it let you to think like someone has malicious intent. + +For this reason, only test it on servers that you own or in situations where you’ve notified the owners. + +The nmap creators actually provide a test server located at: + + scanme.nmap.org + +Some commands may take a long while to complete: + +To scan an IP address or a host name (FQDN), run: + + nmap 192.168.1.1 + +Sample outputs: + +![Fig.01: nmap in action](http://s0.cyberciti.org/uploads/faq/2012/11/redhat-nmap-command-output.png) + +Scan for the host operating system: + + sudo nmap -O 192.168.1.1 + +pecify a range with “-” or “/24″ to scan a number of hosts at once: + + sudo nmap -PN xxx.xxx.xxx.xxx-yyy + +Scan a network range for available services: + + sudo nmap -sP network_address_range + +Scan without preforming a reverse DNS lookup on the IP address specified. This should speed up your results in most cases: + + sudo nmap -n remote_host + +Scan a specific port instead of all common ports: + + sudo nmap -p port_number remote_host + +Scan a network and find out which servers and devices are up and running + +This is known as host discovery or ping scan: + + nmap -sP 192.168.1.0/24 + +Sample outputs: + + Host 192.168.1.1 is up (0.00035s latency). + MAC Address: BC:AE:C5:C3:16:93 (Unknown) + Host 192.168.1.2 is up (0.0038s latency). + MAC Address: 74:44:01:40:57:FB (Unknown) + Host 192.168.1.5 is up. + Host nas03 (192.168.1.12) is up (0.0091s latency). + MAC Address: 00:11:32:11:15:FC (Synology Incorporated) + Nmap done: 256 IP addresses (4 hosts up) scanned in 2.80 second + +Understanding port configuration and how to discover what the attack vectors are on your server is only one step to securing your information and your VPS. + +### Nikto to Scan for vulnerabilities in your website ### + +[Nikto][4] Web-scanner is a open source web-server scanner which can be used to scan the web-servers for malicious programs and files. Nikto can be used to scan the outdated versions of programs too. Nikto will provide us a quick and easy scan to find out the dangerous files and programs in server, At the end of scan result with a log file. + +### Download and install Nikto on Linux server ### + +Perl is pre-installed in linux so all you need to do is download nikto from the [project page][5], unpack it into a directory and start your testing. + + wget https://cirt.net/nikto/nikto-2.1.4.tar.gz + +You can unpack it with an archive manager tool or use tar and gzip together with this command. + + tar zxvf nikto-2.1.4.tar.gz + cd nikto-2.1.4 + perl nikto.pl + +This should be your results from a working installation: + + - ***** SSL support not available (see docs for SSL install) ***** + - Nikto v2.1.4 + --------------------------------------------------------------------------- + + ERROR: No host specified + + -config+ Use this config file + -Cgidirs+ scan these CGI dirs: 'none', 'all', or values like "/cgi/ /cgi-a/" + -dbcheck check database and other key files for syntax errors + -Display+ Turn on/off display outputs + -evasion+ ids evasion technique + -Format+ save file (-o) format + -host+ target host + -Help Extended help information + -id+ Host authentication to use, format is id:pass or id:pass:realm + -list-plugins List all available plugins + -mutate+ Guess additional file names + -mutate-options+ Provide extra information for mutations + -output+ Write output to this file + -nocache Disables the URI cache + -nossl Disables using SSL + -no404 Disables 404 checks + -port+ Port to use (default 80) + -Plugins+ List of plugins to run (default: ALL) + -root+ Prepend root value to all requests, format is /directory + -ssl Force ssl mode on port + -Single Single request mode + -timeout+ Timeout (default 2 seconds) + -Tuning+ Scan tuning + -update Update databases and plugins from CIRT.net + -vhost+ Virtual host (for Host header) + -Version Print plugin and database versions + + requires a value + + Note: This is the short help output. Use -H for full help. + +The error is merely telling us we did not fill in the necessary parameters for a test to run. The SSL support can be enabled by installing the necessary perl ssl module (sudo apt-get install libnet-ssleay-perl). + +#### Update the nikto Database #### + +Before performing any scan we need to update the nikto database packages using. + + /usr/local/bin/nikto.pl -update + +To list the available Plugins for nikto we can use the below command. + + nikto.pl -list-plugins // To list the installed plugins // + +#### Scan for vulnerabilities #### + +For a simple test for we will use test a single url. + + perl nikto.pl -h http://www.host-name.com + +**Sample outputs:** + +This will produce fairly verbose output that may be somewhat confusing at first. Take the time to read through the output to understand what each advisory means. Many of the alerts in Nikto will refer to OSVDB numbers. These are Open Source Vulnerability Database ([http://osvdb.org/][6]) designations. You can search on OSVDB for further information about any vulnerabilities identified. + + $ nikto -h http://www.host-name.com + - Nikto v2.1.4 + --------------------------------------------------------------------------- + + Target IP: 1.2.3.4 + + Target Hostname: host-name.com + + Target Port: 80 + + Start Time: 2012-08-11 14:27:31 + --------------------------------------------------------------------------- + + Server: Apache/2.2.22 (FreeBSD) mod_ssl/2.2.22 OpenSSL/1.0.1c DAV/2 + + robots.txt contains 4 entries which should be manually viewed. + + mod_ssl/2.2.22 appears to be outdated (current is at least 2.8.31) (may depend on server version) + + ETag header found on server, inode: 5918348, size: 121, mtime: 0x48fc943691040 + + mod_ssl/2.2.22 OpenSSL/1.0.1c DAV/2 - mod_ssl 2.8.7 and lower are vulnerable to a remote buffer overflow which may allow a remote shell (difficult to exploit). CVE-2002-0082, OSVDB-756. + + Allowed HTTP Methods: GET, HEAD, POST, OPTIONS, TRACE + + OSVDB-877: HTTP TRACE method is active, suggesting the host is vulnerable to XST + + /lists/admin/: PHPList pre 2.6.4 contains a number of vulnerabilities including remote administrative access, harvesting user info and more. Default login to admin interface is admin/phplist + + OSVDB-2322: /gallery/search.php?searchstring=: Gallery 1.3.4 and below is vulnerable to Cross Site Scripting (XSS). Upgrade to the latest version. http://www.securityfocus.com/bid/8288. + + OSVDB-7022: /calendar.php?year=&month=03&day=05: DCP-Portal v5.3.1 is vulnerable to Cross Site Scripting (XSS). http://www.cert.org/advisories/CA-2000-02.html. + + OSVDB-3233: /phpinfo.php: Contains PHP configuration information + + OSVDB-3092: /system/: This might be interesting... + + OSVDB-3092: /template/: This may be interesting as the directory may hold sensitive files or reveal system information. + + OSVDB-3092: /updates/: This might be interesting... + + OSVDB-3092: /README: README file found. + + 6448 items checked: 1 error(s) and 14 item(s) reported on remote host + + End Time: 2012-08-11 15:52:57 (5126 seconds) + --------------------------------------------------------------------------- + + 1 host(s) tested + $ + +**Nikto** is an extremely lightweight, and versatile tool. Because of the fact that Nikto is written in Perl it can be run on almost any host operating system. + +Hope this will will bring you a good idea to scan vulnerbalites for your wordpress website. Following on from my previous article [How To Secure WordPress Website][7] show you **checklist** allows you to secure your WordPress site with as little effort as possible. + +If you have any feedback or comments, feel free to post them in the comment section below. + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/scan-check-wordpress-website-security-using-wpscan-nmap-nikto/ + +作者：[anismaj][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/anis/ +[1]:http://www.unixmen.com/install-wordpress-ubuntu-14-10/ +[2]:http://www.unixmen.com/install-configure-wordpress-4-0-benny-centos-7/ +[3]:http://www.unixmen.com/secure-wordpress-website/ +[4]:http://www.unixmen.com/install-nikto-web-scanner-check-vulnerabilities +[5]:https://cirt.net/nikto/ +[6]:http://osvdb.org/ +[7]:http://www.unixmen.com/secure-wordpress-website/ \ No newline at end of file diff --git a/sources/tech/20150205 Inxi--Find System And Hardware Information On Linux.md b/sources/tech/20150205 Inxi--Find System And Hardware Information On Linux.md new file mode 100644 index 0000000000..efdc243fc6 --- /dev/null +++ b/sources/tech/20150205 Inxi--Find System And Hardware Information On Linux.md @@ -0,0 +1,171 @@ +Inxi: Find System And Hardware Information On Linux +================================================================================ +We already have shown different [applications][1] and ways to find the system and hardware information on Linux. In that series, today we will see how to find such details using **inxi**. It can be used for forum technical support, as a debugging tool, to quickly ascertain user system configuration and hardware. + +**Inxi** is a command line tool that can be used to find the complete system and hardware details such as; + +- Hardware, +- CPU, +- Drivers, +- Xorg, +- Desktop, +- Kernel, +- GCC version, +- Processes, +- RAM usage, +- and other useful information. + +### Installation ### + +Inxi is available in the default repositories of most modern GNU/Linux operating systems. So, we can simply install it by running the following commands. + +**On Debian based system:** + + sudo apt-get install inxi + +**On Fedora:** + + sudo yum install inxi + +**On RHEL based systems:** + +Install EPEL repository: + + sudo yum install epel-release + +Then, install inxi using command: + + sudo yum install inxi + +### Usage ### + +To find the quick view of the system information, run the following command from Terminal. + + inxi + +**Sample output:** + + CPU~Dual core Intel Core i3-2350M CPU (-HT-MCP-) clocked at Min:800.000Mhz Max:1200.000Mhz Kernel~3.13.0-45-generic x86_64 Up~6:41 Mem~1537.7/3861.3MB HDD~500.1GB(52.5% used) Procs~183 Client~Shell inxi~1.9.17 + +Ofcourse, we can retrieve a particular hardware details. For example to retrieve the **Audio/Sound hardware details**, run the following command: + + inxi -A + +**Sample output:** + + Audio: Card: Intel 6 Series/C200 Series Family High Definition Audio Controller driver: snd_hda_intel + Sound: Advanced Linux Sound Architecture ver: k3.13.0-45-generic + +Cool, isn’t it? + +Likewise, you can retrieve the details of **Graphic card** information. + + inxi -G + +**Sample output:** + + Graphics: Card: Intel 2nd Generation Core Processor Family Integrated Graphics Controller + X.Org: 1.15.1 drivers: intel (unloaded: fbdev,vesa) Resolution: 1366x768@60.0hz + GLX Renderer: Mesa DRI Intel Sandybridge Mobile GLX Version: 3.0 Mesa 10.3.0 + +What about harddisk information? That’s also possible. To view the full **harddisk** information, run the following command. + + inxi -D + +**Sample Output:** + + Drives: HDD Total Size: 500.1GB (52.5% used) 1: id: /dev/sda model: ST9601325BD size: 500.1GB + +To display the Bios and Motherboard details: + + inxi -M + +**Sample output:** + + Machine: System: Dell (portable) product: Inspiron N5050 + Mobo: Dell model: 01HXXJ version: A05 Bios: Dell version: A05 date: 08/03/2012 + +Not only hardware details, it can also displays the **list of available repositories** in our system. + + inxi -r + +**Sample output:** + + Repos: Active apt sources in file: /etc/apt/sources.list + deb http://ubuntu.excellmedia.net/archive/ trusty main restricted + deb-src http://ubuntu.excellmedia.net/archive/ trusty main restricted + deb http://ubuntu.excellmedia.net/archive/ trusty-updates main restricted + deb-src http://ubuntu.excellmedia.net/archive/ trusty-updates main restricted + deb http://ubuntu.excellmedia.net/archive/ trusty universe + . + . + Active apt sources in file: /etc/apt/sources.list.d/intellinuxgraphics.list + deb https://download.01.org/gfx/ubuntu/14.04/main trusty main #Intel Graphics drivers + Active apt sources in file: /etc/apt/sources.list.d/linrunner-tlp-trusty.list + Active apt sources in file: /etc/apt/sources.list.d/wseverin-ppa-trusty.list + deb http://ppa.launchpad.net/wseverin/ppa/ubuntu trusty main + +Inxi will also display the Weather details of your location. Surprised? Yes, It should. + + inxi -W Erode,Tamilnadu + +Here **Erode** is the District and **Tamilnadu** is a state in India. + +Sample output: + + Weather: Conditions: 79 F (26 C) - Clear Time: February 4, 6:00 PM IST + +### Viewing Complete Hardware details ### + +Tired of finding each hardware details? Well, you can list all details at once using command: + + inxi -F + +**Sample output:** + + System: Host: sk Kernel: 3.13.0-45-generic x86_64 (64 bit) Desktop: LXDE (Openbox 3.5.2) Distro: Ubuntu 14.04 trusty + Machine: System: Dell (portable) product: Inspiron N5050 + Mobo: Dell model: 01HXXJ version: A05 Bios: Dell version: A05 date: 08/03/2012 + CPU: Dual core Intel Core i3-2350M CPU (-HT-MCP-) cache: 3072 KB flags: (lm nx sse sse2 sse3 sse4_1 sse4_2 ssse3 vmx) + Clock Speeds: 1: 800.00 MHz 2: 1000.00 MHz 3: 800.00 MHz 4: 800.00 MHz + Graphics: Card: Intel 2nd Generation Core Processor Family Integrated Graphics Controller + X.Org: 1.15.1 drivers: intel (unloaded: fbdev,vesa) Resolution: 1366x768@60.0hz + GLX Renderer: Mesa DRI Intel Sandybridge Mobile GLX Version: 3.0 Mesa 10.3.0 + Audio: Card: Intel 6 Series/C200 Series Family High Definition Audio Controller driver: snd_hda_intel + Sound: Advanced Linux Sound Architecture ver: k3.13.0-45-generic + Network: Card-1: Qualcomm Atheros AR9285 Wireless Network Adapter (PCI-Express) driver: ath9k + IF: wlan0 state: up mac: + Card-2: Realtek RTL8101E/RTL8102E PCI Express Fast Ethernet controller driver: r8169 + IF: eth0 state: down mac: + Drives: HDD Total Size: 500.1GB (52.5% used) 1: id: /dev/sda model: ST9500325AS size: 500.1GB + Partition: ID: / size: 455G used: 245G (57%) fs: ext4 ID: /boot size: 236M used: 159M (72%) fs: ext2 + ID: swap-1 size: 4.19GB used: 0.00GB (0%) fs: swap + RAID: No RAID devices detected - /proc/mdstat and md_mod kernel raid module present + Sensors: System Temperatures: cpu: 64.5C mobo: N/A + Fan Speeds (in rpm): cpu: N/A + Info: Processes: 186 Uptime: 6:52 Memory: 1547.2/3861.3MB Client: Shell (bash) inxi: 1.9.17 + +As you see in the above, inxi displays the complete hardware details. + +For more details, refer the man pages. + + man inxi + +### Conclusion ### + +Are you searching for a simple tool which displays your complete system and hardware details? Then, don’t look anywhere, inxi will give you what actually want. And, it is light weight tool available in your default repositories. What else you want more? Give it a try, you won’t be disappointed. + +Cheers! + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/inxi-find-system-hardware-information-linux/ + +作者：[SK][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/sk/ +[1]:http://www.unixmen.com/screenfetch-bash-screenshot-information-tool/ \ No newline at end of file diff --git a/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md b/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md new file mode 100644 index 0000000000..73d91116cb --- /dev/null +++ b/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md @@ -0,0 +1,208 @@ +Linux Basics: Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7 +================================================================================ +Some times you might want to use more than one IP address for your network interface card. What are you going to do? Buy an extra network card and assign new IP? No, It’s not necessary(atleast in the small networks). We can now assign multiple ip addresses to single network interface card in CentOS / RHEL 7 systems. Curious to know how? Well, Follow me, It is not that difficult. + +First, let us find the IP address of the network card. In my CentOS 7 server, I use only one network card. + +Run the following command with root user privileges: + + ip addr + +Sample output: + + 1: lo: mtu 65536 qdisc noqueue state UNKNOWN + link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 + inet 127.0.0.1/8 scope host lo + valid_lft forever preferred_lft forever + inet6 ::1/128 scope host + valid_lft forever preferred_lft forever + 2: enp0s3: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + link/ether 08:00:27:80:63:19 brd ff:ff:ff:ff:ff:ff + inet 192.168.1.150/24 brd 192.168.1.255 scope global enp0s3 + valid_lft forever preferred_lft forever + +As you see in the above output, my network card name is enp0s3, and its IP address is 192.168.1.150. + +Well, as you may know, the the network card configuration files of your system is stored under **/etc/sysconfig/network-scripts/** directory. Each cards details will be stored in different names, for example **ifcfg-enp0s3**. + +Let us see the details of **ifcfg-enp0s3**. + + cat /etc/sysconfig/network-scripts/ifcfg-enp0s3 + +Sample output: + + TYPE="Ethernet" + BOOTPROTO="none" + DEFROUTE="yes" + IPV4_FAILURE_FATAL="no" + IPV6INIT="yes" + IPV6_AUTOCONF="yes" + IPV6_DEFROUTE="yes" + IPV6_FAILURE_FATAL="no" + NAME="enp0s3" + UUID="e9f9caef-cb9e-4a19-aace-767c6ee6f849" + ONBOOT="yes" + HWADDR="08:00:27:80:63:19" + IPADDR0="192.168.1.150" + PREFIX0="24" + GATEWAY0="192.168.1.1" + DNS1="192.168.1.1" + IPV6_PEERDNS="yes" + IPV6_PEERROUTES="yes" + +Okay, now we will assign multiple addresses in the same subnet. + +Edit file **/etc/sysconfig/network-scripts/ifcfg-enp0s3**: + + vi /etc/sysconfig/network-scripts/ifcfg-enp0s3 + +Add extra IP addresses one by one as shown below. + + TYPE="Ethernet" + BOOTPROTO="none" + DEFROUTE="yes" + IPV4_FAILURE_FATAL="no" + IPV6INIT="yes" + IPV6_AUTOCONF="yes" + IPV6_DEFROUTE="yes" + IPV6_FAILURE_FATAL="no" + NAME="enp0s3" + UUID="933cdc9b-b383-4ddd-b219-5a72c69c9cf0" + ONBOOT="yes" + HWADDR="08:00:27:3F:AB:68" + IPADDR0="192.168.1.150" + IPADDR1="192.168.1.151" + IPADDR2="192.168.1.152" + PREFIX0="24" + GATEWAY0="192.168.1.1" + DNS1="192.168.1.1" + IPV6_PEERDNS="yes" + IPV6_PEERROUTES="yes" + +As you see above, I have added two more IP addresses: **IPADDR1=”192.168.1.151″ & IPADDR2=”192.168.1.152″** + +Like wise, you can add as many a IP addresses you want. + +Finally, save and close the file. Restart network service to take effect the changes. + + systemctl restart network + +Now, let us check the IP addresses have been added or not. + + ip addr + +Sample output: + + : lo: mtu 65536 qdisc noqueue state UNKNOWN + link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 + inet 127.0.0.1/8 scope host lo + valid_lft forever preferred_lft forever + inet6 ::1/128 scope host + valid_lft forever preferred_lft forever + 2: enp0s3: mtu 1500 qdisc pfifo_fast state UP qlen 1000 + link/ether 08:00:27:3f:ab:68 brd ff:ff:ff:ff:ff:ff + inet 192.168.1.150/24 brd 192.168.1.255 scope global enp0s3 + valid_lft forever preferred_lft forever + inet 192.168.1.151/24 brd 192.168.1.255 scope global secondary enp0s3 + valid_lft forever preferred_lft forever + inet 192.168.1.152/24 brd 192.168.1.255 scope global secondary enp0s3 + valid_lft forever preferred_lft forever + inet6 fe80::a00:27ff:fe3f:ab68/64 scope link + valid_lft forever preferred_lft forever + +As you see above, the single network interface card has three IP addresses. + +Let us ping the newly added IP addresses: + + ping -c 4 192.168.1.151 + +Sample output: + + PING 192.168.1.151 (192.168.1.151) 56(84) bytes of data. + 64 bytes from 192.168.1.151: icmp_seq=1 ttl=64 time=0.048 ms + 64 bytes from 192.168.1.151: icmp_seq=2 ttl=64 time=0.075 ms + 64 bytes from 192.168.1.151: icmp_seq=3 ttl=64 time=0.077 ms + 64 bytes from 192.168.1.151: icmp_seq=4 ttl=64 time=0.077 ms + + --- 192.168.1.151 ping statistics --- + 4 packets transmitted, 4 received, 0% packet loss, time 2999ms + rtt min/avg/max/mdev = 0.048/0.069/0.077/0.013 ms + +---------- + + ping -c 4 192.168.1.152 + +Sample output: + + PING 192.168.1.152 (192.168.1.152) 56(84) bytes of data. + 64 bytes from 192.168.1.152: icmp_seq=1 ttl=64 time=0.034 ms + 64 bytes from 192.168.1.152: icmp_seq=2 ttl=64 time=0.075 ms + 64 bytes from 192.168.1.152: icmp_seq=3 ttl=64 time=0.073 ms + 64 bytes from 192.168.1.152: icmp_seq=4 ttl=64 time=0.075 ms + + --- 192.168.1.152 ping statistics --- + 4 packets transmitted, 4 received, 0% packet loss, time 2999ms + rtt min/avg/max/mdev = 0.034/0.064/0.075/0.018 ms + +If you want to use **different subnet**, then you can change the **PREFIX0=24** line to different subnet, such as **PREFIX1=16**. + +For example, I am going to add Class A IP address(**ex.10.0.0.1**) to my network card. + + TYPE="Ethernet" + BOOTPROTO="none" + DEFROUTE="yes" + IPV4_FAILURE_FATAL="no" + IPV6INIT="yes" + IPV6_AUTOCONF="yes" + IPV6_DEFROUTE="yes" + IPV6_FAILURE_FATAL="no" + NAME="enp0s3" + UUID="933cdc9b-b383-4ddd-b219-5a72c69c9cf0" + ONBOOT="yes" + HWADDR="08:00:27:3F:AB:68" + IPADDR0="192.168.1.150" + IPADDR1="192.168.1.151" + IPADDR2="192.168.1.152" + IPADDR3="10.0.0.1" + PREFIX0="24" + PREFIX1=16 + GATEWAY0="192.168.1.1" + DNS1="192.168.1.1" + IPV6_PEERDNS="yes" + IPV6_PEERROUTES="yes" + +Do you notice that I have added a Class A type address(10.0.0.1) and prefix=16. + +Save and close the file. Restart network service, + +Then, ping the new added IP: + + ping -c 4 10.0.0.1 + +Sample output: + + PING 10.0.0.1 (10.0.0.1) 56(84) bytes of data. + 64 bytes from 10.0.0.1: icmp_seq=1 ttl=64 time=0.097 ms + 64 bytes from 10.0.0.1: icmp_seq=2 ttl=64 time=0.073 ms + 64 bytes from 10.0.0.1: icmp_seq=3 ttl=64 time=0.074 ms + 64 bytes from 10.0.0.1: icmp_seq=4 ttl=64 time=0.075 ms + + --- 10.0.0.1 ping statistics --- + 4 packets transmitted, 4 received, 0% packet loss, time 3000ms + rtt min/avg/max/mdev = 0.073/0.079/0.097/0.014 ms + +Similarly, you can add different Gateways too. + +That’s it. + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/linux-basics-assign-multiple-ip-addresses-single-network-interface-card-centos-7/ + +作者：[SK][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/sk/ \ No newline at end of file diff --git a/sources/tech/20150205 zBackup--A versatile deduplicating backup tool.md b/sources/tech/20150205 zBackup--A versatile deduplicating backup tool.md new file mode 100644 index 0000000000..62eee8521c --- /dev/null +++ b/sources/tech/20150205 zBackup--A versatile deduplicating backup tool.md @@ -0,0 +1,63 @@ +zBackup – A versatile deduplicating backup tool +================================================================================ +zbackup is a globally-deduplicating backup tool, based on the ideas found in rsync. Feed a large .tar into it, and it will store duplicate regions of it only once, then compress and optionally encrypt the result. Feed another .tar file, and it will also re-use any data found in any previous backups. This way only new changes are stored, and as long as the files are not very different, the amount of storage required is very low. Any of the backup files stored previously can be read back in full at any time. + +### zBackup Features ### + +Parallel LZMA or LZO compression of the stored data +Built-in AES encryption of the stored data +Possibility to delete old backup data +Use of a 64-bit rolling hash, keeping the amount of soft collisions to zero +Repository consists of immutable files. No existing files are ever modified +Written in C++ only with only modest library dependencies +Safe to use in production +Possibility to exchange data between repos without recompression + +### Install zBackup in ubuntu ### + +Open the terminal and run the following command + + sudo apt-get install zbackup + +### Using zBackup ### + +zbackup init initializes a backup repository for the backup files to be stored. + + zbackup init [--non-encrypted] [--password-file ~/.my_backup_password ] /my/backup/repo + +zbackup backup backups a tar file generated by tar c to the repository initialized using zbackup init + + zbackup [--password-file ~/.my_backup_password ] [--threads number_of_threads ] backup /my/backup/repo/backups/backup-`date ‘+%Y-%m-%d'` + +zbackup restore restores the backup file to a tar file. + + zbackup [--password-file ~/.my_backup_password [--cache-size cache_size_in_mb restore /my/backup/repo/backups/backup-`date ‘+%Y-%m-%d'` > /my/precious/backup-restored.tar + +### Available Options ### + +- -non-encrypted -- Do not encrypt the backup repository. +- --password-file ~/.my_backup_password -- Use the password file specified at ~/.my_backup_password to encrypt the repository and backup file, or to decrypt the backup file. +- --threads number_of_threads -- Limit the partial LZMA compression to number_of_threads needed. Recommended for 32-bit architectures. +- --cache-size cache_size_in_mb -- Use the cache size provided by cache_size_in_mb to speed up the restoration process. + +### zBackup files ### + +~/.my_backup_password Used to encrypt the repository and backup file, or to decrypt the backup file. See zbackup for further details. + +/my/backup/repo The directory used to hold the backup repository. + +/my/precious/restored-tar The tar used for restoring the backup. + +/my/backup/repo/backups/backup-`date ‘+%Y-%m-%d'` Specifies the backup file. + +-------------------------------------------------------------------------------- + +via: http://www.ubuntugeek.com/zbackup-a-versatile-deduplicating-backup-tool.html + +作者：[ruchi][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.ubuntugeek.com/author/ubuntufix \ No newline at end of file From 4f155fc5d531e7c61da645addeda044cce2f6803 Mon Sep 17 00:00:00 2001 From: shipsw Date: Thu, 5 Feb 2015 16:25:32 +0800 Subject: [PATCH 170/207] Delete 20140821 What is a good EPUB reader on Linux.md --- ...821 What is a good EPUB reader on Linux.md | 67 ------------------- 1 file changed, 67 deletions(-) delete mode 100644 sources/share/20140821 What is a good EPUB reader on Linux.md diff --git a/sources/share/20140821 What is a good EPUB reader on Linux.md b/sources/share/20140821 What is a good EPUB reader on Linux.md deleted file mode 100644 index 71a97240e4..0000000000 --- a/sources/share/20140821 What is a good EPUB reader on Linux.md +++ /dev/null @@ -1,67 +0,0 @@ -Translating by shipsw -What is a good EPUB reader on Linux -================================================================================ -If the habit on reading books on electronic tablets is still on its way, reading books on a computer is even rarer. It is hard enough to focus on the classics of the 16th century literature, so who needs the Facebook chat pop up sound in the background in addition? But if for some reasons you wish to open an electronic book in your computer, chances are that you will need specific software. Indeed, most editors agreed with using the EPUB format for electronic books (for "Electronic PUBlication"). Hopefully, Linux is not deprived of good programs capable of dealing with such format. In short, here is a non-exhaustive list of good EPUB readers on Linux. - -### 1. Calibre ### - -![](https://farm6.staticflickr.com/5577/14975176155_0989766bb3_z.jpg) - -Let's dive in with maybe the biggest name of that list: [Calibre][1]. More than just an ebook reader, Calibre is a fully packaged e-library. It supports a plethora of formats (almost every I can think of), integrates a reader, a manager, a meta-data editor which can download covers from the Internet, an EPUB editor, a news reader, and a search engine to download additional books. To top it all, the interface is slick and has nothing to envy to other professional software. The only potential downside is that if you are looking for an EPUB reader, and are not interested in the whole library manager aspect, the program is too heavy for your needs. - -### 2. FBReader ### - -![](https://farm4.staticflickr.com/3900/14975176165_f2e4afd2fa_o.jpg) - -[FBReader][2] is also a library manager, but in a lighter way than Calibre. The interface is more sober, and is clearly cut in two: (1) the library aspect where you can add files, edit the meta-data, or download new books, and (2) the reader aspect. If you like simplicity, you might enjoy this program. I personally appreciate its straightforward tag and series system for classifying books. - -### 3. Cool Reader ### - -![](https://farm6.staticflickr.com/5594/14975176195_ac46952150.jpg) - -For all of you who are just looking for a way to visualize the content of an EPUB file, I recommend [Cool Reader][5]. In the spirit of Linux applications which do only one thing and do it well, Cool Reader is optimized to just open an EPUB file, and navigate through it via handy shortcuts. And since it is based on Qt, it also follows Qt's mentality by giving a ton of settings to mess around with. - -### 4. Okular ### - -![](https://farm6.staticflickr.com/5559/14788504729_5a2ec2c11b_z.jpg) - -Since we were talking about Qt applications, one of KDE's main document viewer, [Okular][3], also has the capacity to view EPUB files, once an EPUB library has been installed on the system. However, this is probably not a very good option if you are not a KDE user. - -### 5. pPub ### - -![](https://farm4.staticflickr.com/3835/14788504789_e7c742fa20_z.jpg) - -[pPub][4] is an old project that you can still find on Github. Its latest change seems to have been made two years ago. However, pPub is one of those programs that really deserve a second life. Written in Python and based on GTK3 and WebKit, pPub is lightweight and intuitive. The interface probably needs a little updating and is beyond sober, but the core is very good. It even supports JavaScript. So please, someone kick that up again. - -### 6. epub ### - -![](https://farm4.staticflickr.com/3871/14788844378_16fb51a1b9_z.jpg) - -If all you need is a quick and easy way to check the content of an EPUB file, without caring about any fancy GUI, maybe an EPUB reader with command line interface might just do. [epub][6] is a minimalistic EPUB reader written in Python, which allows you to read an EPUB file in a terminal environment. You can switch between chapter/TOC views, up/down a page, and nothing more. This is as simple as any EPUB reader can possibly get. - -### 7. Sigil ### - -![](https://farm4.staticflickr.com/3921/14788640417_7940627871_z.jpg) - -Finally, last of the list is not actually an EPUB reader, but more of a standalone editor. [Sigil][7] is able to extract the content of an EPUB file, and break it down for what it really is: xhtml text, images, styles, and sometimes audio. The interface is a lot more complex than the one for a basic reader, but remains clear and well thought, on par with the features it provides. I particularly appreciate the tab system. If you are familiar with editing web pages, you will be in know territory here. - -To conclude, there are a lot of open source EPUB readers out there. Some do nothing more, while others go way beyond that. As usual, I recommend using the one that makes the most sense for you to use. If you know more good EPUB readers on Linux that you like, please let us know in the comments. - --------------------------------------------------------------------------------- - -via: http://xmodulo.com/2014/08/good-epub-reader-linux.html - -作者：[Adrien Brochard][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://xmodulo.com/author/adrien -[1]:http://calibre-ebook.com/ -[2]:http://fbreader.org/ -[3]:http://okular.kde.org/ -[4]:https://github.com/sakisds/pPub -[5]:http://crengine.sourceforge.net/ -[6]:https://github.com/rupa/epub -[7]:https://github.com/user-none/Sigil From 83fe0cbbacbcc73665def0cdcd1bfe95e003b024 Mon Sep 17 00:00:00 2001 From: shipsw Date: Thu, 5 Feb 2015 16:26:55 +0800 Subject: [PATCH 171/207] 20140821 What is a good EPUB reader on Linux.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 20140821 What is a good EPUB reader on Linux.md翻译完毕 --- ...821 What is a good EPUB reader on Linux.md | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 translated/share/20140821 What is a good EPUB reader on Linux.md diff --git a/translated/share/20140821 What is a good EPUB reader on Linux.md b/translated/share/20140821 What is a good EPUB reader on Linux.md new file mode 100644 index 0000000000..2b919ee6bb --- /dev/null +++ b/translated/share/20140821 What is a good EPUB reader on Linux.md @@ -0,0 +1,67 @@ +Linux版EPUB阅读器 +================================================================================ + +如果说用平板电脑看书尚属主流的话，那么在电脑上读书就非常少见了。专注阅读16世纪的书是非常困难的了，没人希望后台蹦出Facebook聊天窗口。但是如果你非要在电脑上打开电子书的话，那么你需要一个电子书阅读软件。大多数编辑支持使用EPUB格式来存放电子书（电子出版物）。幸运的书，linux上从不缺乏此类软件。以下书一些Linux上比较好的EPUB阅读软件。 + +### 1. Calibre ### + +![](https://farm6.staticflickr.com/5577/14975176155_0989766bb3_z.jpg) + +先从列表中最有名的软件开始： [Calibre][1]。Calibre 不仅仅是个阅读器，他还是个电子图书馆。软件支持几乎所有的格式，集成了阅读器，管理器，一个可以从互联网下载书籍封面的元数据编辑器，一个EPUB编辑器，新闻阅读器和一个用来下载电子书的搜索引擎。可喜的是，界面丝毫不逊色专业的阅读软件。唯一的缺点书如果你只想要一个EPUB阅读器的话，这个软件还是太大了。 + +### 2. FBReader ### + +![](https://farm4.staticflickr.com/3900/14975176165_f2e4afd2fa_o.jpg) + +[FBReader][2] 也是一个图书馆管理软件，但是比Calibre小。界面简洁分为两个部分：左边书文件管理、元数据编辑、和下载新书等功能；右边书阅读区。如果你喜欢简洁，这个软件挺不错。我个人非常喜欢这类直观标记书籍和分类的做法。 + +### 3. Cool Reader ### + +![](https://farm6.staticflickr.com/5594/14975176195_ac46952150.jpg) + +对于那些只想想看EPUB书内容的用户，我推荐 [Cool Reader][5]。遵循Linux应用程序的规则，Cool Reader 做了优化，每次只打开一个EPUB文件，可以使用简单的快捷键进行阅读和导航。由于程序书基于Qt开发的，所以他也遵循Qt的规则，需要大量的设置项。 + +### 4. Okular ### + +![](https://farm6.staticflickr.com/5559/14788504729_5a2ec2c11b_z.jpg) + +除了Qt应用程序，如果安装了EPUB库的话，KDE的文档阅读器[Okular][3] 也能打开EPUB文件。尽管如此，如果你不是个KDE用户的话，不推荐这个软件。 + +### 5. pPub ### + +![](https://farm4.staticflickr.com/3835/14788504789_e7c742fa20_z.jpg) + +[pPub][4]是个老项目，Github上可以找到这个项目，他最后的更新已经是在两年前了。尽管如此，这个软件还是值得使用的，pPub是用Python编写的，基于GTK3和WebKit，是个简单轻量的软件。界面可能需要一些更新，不够简洁，但是内部却非常好。软件支持JavaScript。所以，谁来捡起这个项目呢？ + +### 6. epub ### + +![](https://farm4.staticflickr.com/3871/14788844378_16fb51a1b9_z.jpg) + +如果你只是想快速简单的查看EPUB文件的内容，不关心任何图形化界面功能的话，最好使用命令行模式打开EPUB。[epub][6] 是一个用Python编写的阅读器，可以在终端环境读取EPUB文件的内容。软件可以在章节、页面见切换，没有其他的功能。这是最简洁的EPUB阅读器了。 + +### 7. Sigil ### + +![](https://farm4.staticflickr.com/3921/14788640417_7940627871_z.jpg) + +最后介绍的这个实际上不是个EPUB阅读器，应该是个独立的编辑器。[Sigil][7] 可以提取EPUB文件的内容并转换成其他格式：xhtml文本，图像，格式，还有其他的内容，比如音频等。界面比基本的阅读器复杂，但是功能还是比较丰富的。我很喜欢他的标签体系，如果你对网页比较熟悉的话，这个软件书很好使用的。 + +总结，有很多的开源的EPUB阅读器，有一些只有最基本的功能， 另外一些功能却太多了。一般来说，我建议你选择一个最合适的使用。如果你有更好的EPUB阅读器，请在评论里告诉我们！ + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/2014/08/good-epub-reader-linux.html + +作者：[Adrien Brochard][a] +译者：[shipsw](https://github.com/shipsw) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/adrien +[1]:http://calibre-ebook.com/ +[2]:http://fbreader.org/ +[3]:http://okular.kde.org/ +[4]:https://github.com/sakisds/pPub +[5]:http://crengine.sourceforge.net/ +[6]:https://github.com/rupa/epub +[7]:https://github.com/user-none/Sigil From 4a173669bc422c0253dc0ce674627e57e6ae503c Mon Sep 17 00:00:00 2001 From: shipsw Date: Thu, 5 Feb 2015 16:34:17 +0800 Subject: [PATCH 172/207] 20140917 How to create a software RAID-1 array with mdadm on Linux.md 20140917 How to create a software RAID-1 array with mdadm on Linux.md translating --- ...How to create a software RAID-1 array with mdadm on Linux.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md b/sources/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md index 6e8ee86ad6..bab7cfbcb2 100644 --- a/sources/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md +++ b/sources/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md @@ -1,3 +1,5 @@ +Translating by shipsw + How to create a software RAID-1 array with mdadm on Linux ================================================================================ Redundant Array of Independent Disks (RAID) is a storage technology that combines multiple hard disks into a single logical unit to provide fault-tolerance and/or improve disk I/O performance. Depending on how data is stored in an array of disks (e.g., with striping, mirroring, parity, or any combination thereof), different RAID levels are defined (e.g., RAID-0, RAID-1, RAID-5, etc). RAID can be implemented either in software or with a hardware RAID card. On modern Linux, basic software RAID functionality is available by default. From 67f4b0fcbfa04a41b895cecbdbfb45a6779772f7 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Thu, 5 Feb 2015 17:17:05 +0800 Subject: [PATCH 173/207] Delete 20150127 How to limit network bandwidth on Linux.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完成，删除源文档。 --- ...How to limit network bandwidth on Linux.md | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 sources/tech/20150127 How to limit network bandwidth on Linux.md diff --git a/sources/tech/20150127 How to limit network bandwidth on Linux.md b/sources/tech/20150127 How to limit network bandwidth on Linux.md deleted file mode 100644 index 5507b3283d..0000000000 --- a/sources/tech/20150127 How to limit network bandwidth on Linux.md +++ /dev/null @@ -1,92 +0,0 @@ -[Translating] by FSSlc - -How to limit network bandwidth on Linux -================================================================================ -If you often run multiple networking applications on your Linux desktop, or share bandwidth among multiple computers at home, you will want to have a better control over bandwidth usage. Otherwise, when you are downloading a big file with a downloader, your interactive SSH session may become sluggish to the point where it's unusable. Or when you sync a big folder over Dropbox, your roommate may complain that video streaming at her computer gets choppy. - -In this tutorial, I am going to describe two different ways to rate limit network traffic on Linux. - -### Rate Limit an Application on Linux ### - -One way to rate limit network traffic is via a command-line tool called [trickle][1]. The trickle command allows you to shape the traffic of any particular program by "pre-loading" a rate-limited socket library at run-time. A nice thing about trickle is that it runs purely in user-space, meaning you don't need root privilege to restrict the bandwidth usage of a program. To be compatible with trickle, the program must use socket interface with no statically linked library. trickle can be handy when you want to rate limit a program which does not have a built-in bandwidth control functionality. - -To install trickle on Ubuntu, Debian and their derivatives: - - $ sudo apt-get install trickle - -To install trickle on Fedora or CentOS/RHEL (with [EPEL repository][2]): - - $ sudo yum install trickle - -Basic usage of trickle is as follows. Simply put, you prepend trickle (with rate) in front of the command you are trying to run. - - $ trickle -d -u - -This will limit the download and upload rate of to specified values (in KBytes/s). - -For example, set the maximum upload bandwidth of your scp session to 100 KB/s: - - $ trickle -u 100 scp backup.tgz alice@remote_host.com: - -If you want, you can set the maximum download speed (e.g., 300 KB/s) of your Firefox browser by creating a [custom launcher][3] with the following command. - - trickle -d 300 firefox %u - -Finally, trickle can run in a daemon mode, where it can restrict the "aggregate" bandwidth usage of all running programs launched via trickle. To launch trickle as a daemon (i.e., trickled): - - $ sudo trickled -d 1000 - -Once the trickled daemon is running in the background, you can launch other programs via trickle. If you launch one program with trickle, its maximum download rate is 1000 KB/s. If you launch another program with trickle, each of them will be rate limited to 500 KB/s, etc. - -### Rate Limit a Network Interface on Linux ### - -Another way to control your bandwidth resource is to enforce bandwidth limit on a per-interface basis. This is useful when you are sharing your upstream Internet connection with someone else. Like anything else, Linux has a tool for you. [wondershaper][4] exactly does that: rate-limit a network interface. - -wondershaper is in fact a shell script which uses [tc][5] to define traffic shaping and QoS for a specific network interface. Outgoing traffic is shaped by being placed in queues with different priorities, while incoming traffic is rate-limited by packet dropping. - -In fact, the stated goal of wondershaper is much more than just adding bandwidth cap to an interface. wondershaper tries to maintain low latency for interactive sessions such as SSH while bulk download or upload is going on. Also, it makes sure that bulk upload (e.g., Dropbox sync) does not suffocate download, and vice versa. - -To install wondershaper on Ubuntu, Debian and their derivatives: - - $ sudo apt-get install wondershaper - -To install wondershaper on Fedora or CentOS/RHEL (with [EPEL repository][6]): - - $ sudo yum install wondershaper - -Basic usage of wondershaper is as follows. - - $ sudo wondershaper - -For example, to set the maximum download/upload bandwidth for eth0 to 1000Kbit/s and 500Kbit/s, respectively: - - $ sudo wondershaper eth0 1000 500 - -You can remove the rate limit by running: - - $ sudo wondershaper clear eth0 - -If you are interested in how wondershaper works, you can read its shell script (/sbin/wondershaper). - -### Conclusion ### - -In this tutorial, I introduced two different ways to control your bandwidth usages on Linux desktop, on per-application or per-interface basis. Both tools are extremely user-friendly, offering you a quick and easy way to shape otherwise unconstrained traffic. For those of you who want to know more about rate control on Linux, refer to [the Linux bible][7]. - --------------------------------------------------------------------------------- - -via: http://xmodulo.com/limit-network-bandwidth-linux.html - -作者：[Dan Nanni][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://xmodulo.com/author/nanni -[1]:http://monkey.org/~marius/trickle -[2]:http://xmodulo.com/how-to-set-up-epel-repository-on-centos.html -[3]:http://xmodulo.com/create-desktop-shortcut-launcher-linux.html -[4]:http://lartc.org/wondershaper/ -[5]:http://lartc.org/manpages/tc.txt -[6]:http://xmodulo.com/how-to-set-up-epel-repository-on-centos.html -[7]:http://www.lartc.org/lartc.html From 98d5a2d4547d93f9c6f560d574cec0af05e3fbd4 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Thu, 5 Feb 2015 17:36:08 +0800 Subject: [PATCH 174/207] =?UTF-8?q?=E3=80=90translated=E3=80=91=2020150127?= =?UTF-8?q?=20How=20to=20limit=20network=20bandwidth=20on=20Linux.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完毕，进行上传。 --- ...How to limit network bandwidth on Linux.md | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 translated/tech/20150127 How to limit network bandwidth on Linux.md diff --git a/translated/tech/20150127 How to limit network bandwidth on Linux.md b/translated/tech/20150127 How to limit network bandwidth on Linux.md new file mode 100644 index 0000000000..cc1efc2aef --- /dev/null +++ b/translated/tech/20150127 How to limit network bandwidth on Linux.md @@ -0,0 +1,112 @@ +怎样在 Linux 中限制网络带宽 +================================================================================ +假如你经常在 Linux 桌面上运行多个网络应用，或在家中让多台电脑共享带宽；(这时，)你可能想更好地控制带宽的使用。否则，当你使用下载器下载一个大文件时，交互式 SSH 会话可能会变得缓慢以至不可用；或者当你通过 Dropbox 来同步一个大文件夹时，你的室友可能会抱怨在她的电脑上，视频流变得断断续续。 + +在本教程中，我将为你描述两种 在 Linux 中限制网络流量速率的不同方法。 + +### 在 Linux 中限制一个应用的速率 ### + +限制网络流量速率的一种方法是通过一个名为[trickle][1]的命令行工具。通过在程序运行时，预先加载一个 速率限制 socket 库 的方法，trickle 命令允许你改变任意一个特定程序的流量。 关于 trickle 命令的一个很好的特征是 它仅在用户空间中运行，这意味着，你不必需要 root 权限来达到限制一个程序的带宽使用的目的。为了与 trickle 程序兼容，这个特定程序必须使用没有静态链接库的套接字接口。当你想对一个不具有内置带宽控制功能的程序进行速率限制时，trickle 可以帮得上忙。 + +在 Ubuntu，Debian 及其衍生发行版中安装 trickle ： + +``` +$ sudo apt-get install trickle +``` + +在 Fdora 或 CentOS/RHEL (带有 [EPEL 软件仓库][2])： + +``` +$ sudo yum install trickle +``` + +trickle 的基本使用方法如下。仅需简单地把 trickle 命令(带有速率参数)放在你想运行的命令之前。 + +``` +$ trickle -d -u +``` + +这就可以将 `` 的下载和上传速率限定为特定值（单位 KBytes/s）。 + +例如，将你的 scp 会话的最大上传带宽设定为 100 KB/s： + +``` + $ trickle -u 100 scp backup.tgz alice@remote_host.com: +``` + +如若你想,你可以使用下面的命令为你的 Firefox 浏览器设定最大下载速率（e.g. , 300 KB/s），通过产生一个[自定义启动器][3]的方式。 + +``` +trickle -d 300 firefox %u +``` + +最后， trickle 也可以 以守护进程模式运行，在该模式下，它将会限制所有通过 trickle 启动且正在运行的程序的总的带宽和。 启动 trickle 使其作为一个守护进程(i.e., trickled): + +``` +$ sudo trickled -d 1000 +``` + +一旦 trickled 守护进程在后台运行，你便可以通过 trickle 命令来启动其他程序。假如你通过 trickle 启动一个程序，那么这个程序的最大下载速率将是 1000 KB/s， 假如你再通过 trickle 启动了另一个程序，则每个程序的(下载)速率极限将会被限制为 500 KB/s, 等等。 + +### 在 Linux 中限制一个网络接口的速率 ### + +另一种控制你的带宽资源的方式是在每一个接口上限制带宽。这在你与其他人分享你的网络连接的上行带宽时尤为实用。同其他一样，Linux 有一个工具来为你做这件事。[wondershaper][4]恰好执行限制网络接口速率的任务。 + +wondershaper 实际上是一个 shell 脚本，它使用 [tc][5] 来定义流量调整命令，使用 QoS 来处理特定的网络接口。通过放置被赋予不同的优先级的传出流量在一个队列中，达到限制传出流量速率的目的， 而传入流量通过丢包的方式来达到速率限制的目的。 + +事实上， wondershaper 的既定目标不仅仅是对一个接口增加其带宽上限；当批量下载或上传正在进行时，wondershaper 还试图去保持互动性会话如SSH 的低延迟。同样的，它还确保批量上传(e.g. , Dropbox 的同步)不会使得下载“窒息”，反之亦然。 + +在 Ubuntu Debian 及其衍生发行版本 中安装 wondershaper： + +``` +$ sudo apt-get install wondershaper +``` + +在 Fdora 或 CentOS/RHEL (带有 [EPEL 软件仓库][2]) 中安装 wondershaper：（注：这里 链接 2 和 6 一样，可以删除其中之一） + +`` +$ sudo yum install wondershaper +``` + +wondershaper 的基本使用如下： + +``` + $ sudo wondershaper +``` + +举个例子， 将 `eth0` 的最大下载/上传带宽分别设定为 1000Kbit/s 和 500Kbit/s: + +``` +$ sudo wondershaper eth0 1000 500 +``` + +你也可以通过运行下面的命令将速率限制进行消除： + +``` +$ sudo wondershaper clear eth0 +``` + +假如你对 wondershaper 的运行原理感兴趣，你可以阅读其 shell 脚本源文件(/sbin/wondershaper)。 + +### 总结 ### + +在本教程中，我介绍了两种不同的方法，来达到如何在 Linux 桌面环境中，控制每个应用或每个接口的带宽使用的目的。 这些工具对用户都及其友好，都为用户提供了一个快速且容易的方式来调整或限制流量。 对于那些想更多地了解如何在 Linux 中进行速率控制的读者，请参考 [the Linux bible][7]. + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/limit-network-bandwidth-linux.html + +作者：[Dan Nanni][a] +译者：[FSSlc](https://github.com/FSSlc) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/nanni +[1]:http://monkey.org/~marius/trickle +[2]:http://xmodulo.com/how-to-set-up-epel-repository-on-centos.html +[3]:http://xmodulo.com/create-desktop-shortcut-launcher-linux.html +[4]:http://lartc.org/wondershaper/ +[5]:http://lartc.org/manpages/tc.txt +[6]:http://xmodulo.com/how-to-set-up-epel-repository-on-centos.html +[7]:http://www.lartc.org/lartc.html From b6bb7300fb197cbe12af24139feda95e51a73d16 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Thu, 5 Feb 2015 17:52:16 +0800 Subject: [PATCH 175/207] Translating by ZTinoZ --- ...x FAQs with Answers--How to check CPU info on Linux.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md index c8e49ff8c8..129bcb9824 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md @@ -32,7 +32,7 @@ cpuid命令的功能就相当于一个专用的CPU信息工具，它能通过使 ### 4. dmidecode ### -dmidecode命令直接从BIOS的DMI（译者注：桌面管理接口）数据收集关于系统硬件的具体信息。CPU信息报告包括CPU供应商、版本、CPU flags, maximum/current clock speed, (enabled) core count, L1/L2/L3 cache configuration, and so on. +dmidecode命令直接从BIOS的DMI（译者注：桌面管理接口）数据收集关于系统硬件的具体信息。CPU信息报告包括CPU供应商、版本、CPU标志寄存器、最大/最近的时钟速度、(所允许的)核心总数、L1/L2/L3缓存配置等等。 $ sudo dmidecode @@ -40,7 +40,7 @@ dmidecode命令直接从BIOS的DMI（译者注：桌面管理接口）数据收 ### 5. hardinfo ### -The hardinfo is a GUI-based system information tool which can give you an easy-to-understand summary of your CPU hardware, as well as other hardware components of your system. +hardinfo是一个基于GUI的系统信息工具，它能展示给你一个易于理解的CPU硬件信息的概况，也包括你的系统其它的一些硬件组成部分。 $ hardinfo @@ -48,7 +48,7 @@ The hardinfo is a GUI-based system information tool which can give you an easy-t ### 6. i7z ### -i7z is a real-time CPU reporting tool dedicated to Intel Core i3, i5 and i7 CPUs. It can display various per-core information in real time, such as Turbo Boost states, CPU frequencies, CPU power states, temperature measurements, and so on. i7z runs in either ncurses-based console mode or QT based GUI. +i7z是一个专供英特尔酷睿i3、i5和i7 CPU的实时CPU报告工具。它能实时显示每个核心的各类信息，比如睿频加速状态、CPU频率、CPU电源状态、温度检测等等。i7z运行在基于ncurses的控制台模式或基于QT的GUI的其中之一上。 $ sudo i7z @@ -56,7 +56,7 @@ i7z is a real-time CPU reporting tool dedicated to Intel Core i3, i5 and i7 CPUs ### 8. likwid-topology ### -[likwid][3] (Like I Knew What I'm Doing) is a collection of command-line tools to measure, configure and display hardware related properties. Among them is likwid-topology which shows CPU hardware (thread/cache/NUMA) topology information. It can also identify processor families (e.g., Intel Core 2, AMD Shanghai). +[likwid][3] (Like I Knew What I'm Doing) 是一个用来测量、配置并显示硬件相关特性的命令行收集工具。其中的likwid拓扑结构能显示CPU硬件(线程/缓存/NUMA)的拓扑结构信息，还能识别处理器家族(比如：Intel Core 2, AMD Shanghai)。 ![](https://farm8.staticflickr.com/7511/15934711707_5dc0793599_b.jpg) From c2428ec2946dcab18566c590fb755856c94e2934 Mon Sep 17 00:00:00 2001 From: Frank Zhang Date: Thu, 5 Feb 2015 21:14:34 +0800 Subject: [PATCH 176/207] [translating] 20150115 Get back your privacy and control.md --- sources/tech/20150115 Get back your privacy and control.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150115 Get back your privacy and control.md b/sources/tech/20150115 Get back your privacy and control.md index 348a159fc8..915e3b073e 100644 --- a/sources/tech/20150115 Get back your privacy and control.md +++ b/sources/tech/20150115 Get back your privacy and control.md @@ -1,3 +1,4 @@ +zpl1025 Get back your privacy and control over your data in just a few hours: build your own cloud for you and your friends ================================================================================ 40'000+ searches over 8 years! That's my Google Search history. How about yours? (you can find out for yourself [here][1]) With so many data points across such a long time, Google has a very precise idea of what you've been interested in, what's been on your mind, what you are worried about, and how that all changed over the years since you first got that Google account. @@ -1110,4 +1111,4 @@ via: https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/ [35]:http://owncloud.org/ [36]:http://owncloud.org/install/ [37]:https://code.google.com/p/k9mail/ -[38]:http://doc.owncloud.org/server/7.0/user_manual/files/files.html \ No newline at end of file +[38]:http://doc.owncloud.org/server/7.0/user_manual/files/files.html From 6c6da4cbf78b958920c59f3ecdaf62eff93be19c Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Fri, 6 Feb 2015 08:45:00 +0800 Subject: [PATCH 177/207] Update 20150112 Best GNOME Shell Themes For Ubuntu 14.04.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 准备翻译这篇文章。 --- .../20150112 Best GNOME Shell Themes For Ubuntu 14.04.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md b/sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md index 8836812288..9d42415be9 100644 --- a/sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md +++ b/sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md @@ -1,3 +1,5 @@ +Translating by FSSlc + Best GNOME Shell Themes For Ubuntu 14.04 ================================================================================ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Best_Gnome_Shell_Themes.jpeg) @@ -108,4 +110,4 @@ via: http://itsfoss.com/gnome-shell-themes-ubuntu-1404/ [7]:http://mokaproject.com/ [8]:https://github.com/vivaeltopo/gnome-shell-theme-viva [9]:http://zagortenay333.deviantart.com/art/Ciliora-Prima-Shell-451947568 -[10]:http://itsfoss.com/best-icon-themes-ubuntu-1404/ \ No newline at end of file +[10]:http://itsfoss.com/best-icon-themes-ubuntu-1404/ From da714ce0d97fb8c4d56b3b3a6b3a13ee5df03296 Mon Sep 17 00:00:00 2001 From: wxy Date: Fri, 6 Feb 2015 08:46:21 +0800 Subject: [PATCH 178/207] PUB:20141210 How to configure rsyslog client for remote logging on CentOS @GOLinux --- ...log client for remote logging on CentOS.md | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) rename {translated/tech => published}/20141210 How to configure rsyslog client for remote logging on CentOS.md (72%) diff --git a/translated/tech/20141210 How to configure rsyslog client for remote logging on CentOS.md b/published/20141210 How to configure rsyslog client for remote logging on CentOS.md similarity index 72% rename from translated/tech/20141210 How to configure rsyslog client for remote logging on CentOS.md rename to published/20141210 How to configure rsyslog client for remote logging on CentOS.md index 08f4c00822..08cda11f5e 100644 --- a/translated/tech/20141210 How to configure rsyslog client for remote logging on CentOS.md +++ b/published/20141210 How to configure rsyslog client for remote logging on CentOS.md @@ -1,8 +1,8 @@ CentOS上配置rsyslog客户端用以远程记录日志 ================================================================================ -**rsyslog**是一个开源工具，被广泛用于Linux系统以通过TCP/UDP协议转发或接收日志消息。rsyslog守护进程可以被配置称两种环境，一种是配置成日志收集服务器，rsyslog进程可以从网络中收集所有其它主机上的日志数据，这些主机已经将日志配置为发送到服务器。rsyslog的另外一个角色，就是可以配置为客户端，用来过滤和发送内部日志消息到本地文件夹（如/var/log）或一台可以路由到的远程rsyslog服务器上。 +**rsyslog**是一个开源工具，被广泛用于Linux系统以通过TCP/UDP协议转发或接收日志消息。rsyslog守护进程可以被配置成两种环境，一种是配置成日志收集服务器，rsyslog进程可以从网络中收集其它主机上的日志数据，这些主机会将日志配置为发送到另外的远程服务器。rsyslog的另外一个用法，就是可以配置为客户端，用来过滤和发送内部日志消息到本地文件夹（如/var/log）或一台可以路由到的远程rsyslog服务器上。 -假定你的网络中已经有一台rsyslog服务器[已经起来并且处于运行中][1]，本指南将为你展示如何来设置CentOS系统将其内部日志消息路由到一台远程rsyslog服务器上。这将大大改善你的系统磁盘空间的使用，尤其是你还没有一个独立的用于/var目录的大分区。 +假定你的网络中已经有一台[已经配置好并启动的][1]rsyslog服务器，本指南将为你展示如何来设置CentOS系统将其内部日志消息路由到一台远程rsyslog服务器上。这将大大改善你的系统磁盘空间的使用，尤其是当你还没有一个用于/var目录的独立的大分区。 ### 步骤一： 安装Rsyslog守护进程 ### @@ -35,9 +35,9 @@ CentOS上配置rsyslog客户端用以远程记录日志 *.* @@192.168.1.25:514 -注意，你也可以将rsyslog服务器的IP地址替换成它的DNS名称（FQDN）。 +注意，你也可以将rsyslog服务器的IP地址替换成它的主机名（FQDN）。 -如果你只想要转发指定设备的日志消息，比如说内核设备，那么你可以在rsyslog配置文件中使用以下声明。 +如果你只想要转发服务器上的指定设备的日志消息，比如说内核设备，那么你可以在rsyslog配置文件中使用以下声明。 kern.* @192.168.1.25:514 @@ -51,9 +51,11 @@ CentOS上配置rsyslog客户端用以远程记录日志 # service rsyslog restart -在另外一种环境中，让我们假定你已经在机器上安装了一个名为“foobar”的应用程序，它会在/var/log下生成foobar.log日志文件。现在，你只想要将它的日志定向到rsyslog服务器，这可以通过像下面这样在rsyslog配置文件中加载imfile模块来实现。 +####非 syslog 日志的转发 -首先，加载imfile模块，这必须只做一次。 +在另外一种环境中，让我们假定你已经在机器上安装了一个名为“foobar”的应用程序，它会在/var/log下生成foobar.log日志文件。现在，你想要将它的日志定向到rsyslog服务器，这可以通过像下面这样在rsyslog配置文件中加载imfile模块来实现。 + +首先，加载imfile模块，这只需做一次。 module(load="imfile" PollingInterval="5") @@ -73,8 +75,7 @@ CentOS上配置rsyslog客户端用以远程记录日志 ### 步骤三： 让Rsyslog进程自动启动 ### -To automatically start rsyslog client after every system reboot, run the following command to enable it system-wide: -要让rsyslog客户端在每次系统重启后自动启动，请运行以下命令来在系统范围启用： +要让rsyslog客户端在每次系统重启后自动启动，请运行以下命令： **CentOS 7：** @@ -86,7 +87,7 @@ To automatically start rsyslog client after every system reboot, run the followi ### 小结 ### -在本教程中，我演示了如何将CentOS系统转变成rsyslog客户端以强制它发送日志消息到远程rsyslog服务器。这里我假定rsyslog客户端和服务器之间的连接是安全的（如，在有防火墙保护的公司网络中）。不管在任何情况下，都不要配置rsyslog客户端将日志消息通过不安全的网络转发，或者，特别是通过互联网转发，因为syslog协议是一个明文协议。要进行安全传输，可以考虑使用[TLS/SSL][2]来加密日志消息。 +在本教程中，我演示了如何将CentOS系统转变成rsyslog客户端以强制它发送日志消息到远程rsyslog服务器。这里我假定rsyslog客户端和服务器之间的连接是安全的（如，在有防火墙保护的公司网络中）。不管在任何情况下，都不要配置rsyslog客户端将日志消息通过不安全的网络转发，或者，特别是通过互联网转发，因为syslog协议是一个明文协议。要进行安全传输，可以考虑使用[TLS/SSL][2]来加密日志消息的传输。 -------------------------------------------------------------------------------- @@ -94,7 +95,7 @@ via: http://xmodulo.com/configure-rsyslog-client-centos.html 作者：[Caezsar M][a] 译者：[GOLinux](https://github.com/GOLinux) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From e9037331a33689d5a2b324e3c5cb4a147f4d0888 Mon Sep 17 00:00:00 2001 From: wxy Date: Fri, 6 Feb 2015 09:25:35 +0800 Subject: [PATCH 179/207] PUB:20150122 Linux FAQs with Answers--How to check memory usage on Linux @mr-ping --- ...ers--How to check memory usage on Linux.md | 113 ++++++++++++++++++ ...ers--How to check memory usage on Linux.md | 113 ------------------ 2 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 published/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md delete mode 100644 translated/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md diff --git a/published/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md b/published/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md new file mode 100644 index 0000000000..876ee88404 --- /dev/null +++ b/published/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md @@ -0,0 +1,113 @@ +Linux有问必答：如何检查Linux的内存使用状况 +================================================================================ + +>**问题**：我想要监测Linux系统的内存使用状况。有哪些可用的图形界面或者命令行工具来检查当前内存使用情况？ + +当涉及到Linux系统性能优化的时候，物理内存是一个最重要的因素。自然的，Linux提供了丰富的选择来监测珍贵的内存资源的使用情况。不同的工具，在监测粒度（例如：全系统范围，每个进程，每个用户），接口方式（例如：图形用户界面，命令行，ncurses）或者运行模式（交互模式，批量处理模式）上都不尽相同。 + +下面是一个可供选择的，但并不全面的图形或命令行工具列表，这些工具用来检查Linux平台中已用和可用的内存。 + +### 1. /proc/meminfo ### + +一种最简单的方法是通过“/proc/meminfo”来检查内存使用状况。这个动态更新的虚拟文件事实上是诸如free，top和ps这些与内存相关的工具的信息来源。从可用/闲置物理内存数量到等待被写入缓存的数量或者已写回磁盘的数量，只要是你想要的关于内存使用的信息，“/proc/meminfo”应有尽有。特定进程的内存信息也可以通过“/proc/\/statm”和“/proc/\/status”来获取。 + + $ cat /proc/meminfo + +![](https://farm8.staticflickr.com/7483/15989497899_bb6afede11_b.jpg) + +### 2. atop ### + +atop命令是用于终端环境的基于ncurses的交互式的系统和进程监测工具。它展示了动态更新的系统资源摘要（CPU, 内存, 网络, 输入/输出, 内核），并且用醒目的颜色把系统高负载的部分以警告信息标注出来。它同样提供了类似于top的线程（或用户）资源使用视图，因此系统管理员可以找到哪个进程或者用户导致的系统负载。内存统计报告包括了总计/闲置内存，缓存的/缓冲的内存和已提交的虚拟内存。 + + $ sudo atop + +![](https://farm8.staticflickr.com/7552/16149756146_893773b84c_b.jpg) + +### 3. free ### + +free命令是一个用来获得内存使用概况的快速简单的方法，这些信息从“/proc/meminfo”获取。它提供了一个快照，用于展示总计/闲置的物理内存和系统交换区，以及已使用/闲置的内核缓冲区。 + + $ free -h + +![](https://farm8.staticflickr.com/7531/15988117988_ba8c6b7b63_b.jpg) + +### 4. GNOME System Monitor ### + +GNOME System Monitor 是一个图形界面应用，它展示了包括CPU，内存，交换区和网络在内的系统资源使用率的较近历史信息。它同时也可以提供一个带有CPU和内存使用情况的进程视图。 + + $ gnome-system-monitor + +![](https://farm8.staticflickr.com/7539/15988118078_279f0da494_c.jpg) + +### 5. htop ### + +htop命令是一个基于ncurses的交互式的进程视图，它实时展示了每个进程的内存使用情况。它可以报告所有运行中进程的常驻内存大小（RSS）、内存中程序的总大小、库大小、共享页面大小和脏页面大小。你可以横向或者纵向滚动进程列表进行查看。 + + $ htop + +![](https://farm9.staticflickr.com/8236/8599814378_de071de408_c.jpg) + +### 6. KDE System Monitor ### + +就像GNOME桌面拥有GNOME System Monitor一样，KDE桌面也有它自己的对口应用：KDE System Monitor。这个工具的功能与GNOME版本极其相似，也就是说，它同样展示了一个关于系统资源使用情况，以及带有每个进程的CPU/内存消耗情况的实时历史记录。 + + $ ksysguard + +![](https://farm8.staticflickr.com/7479/15991397329_ec5d786ffd_c.jpg) + +### 7. memstat ### + +memstat工具对于识别正在消耗虚拟内存的可执行部分、进程和共享库非常有用。给出一个进程识别号，memstat即可识别出与之相关联的可执行部分、数据和共享库究竟使用了多少虚拟内存。 + + $ memstat -p + +![](https://farm8.staticflickr.com/7518/16175635905_1880e50055_b.jpg) + +### 8. nmon ### + +nmon工具是一个基于ncurses系统基准测试工具，它能够以交互方式监测CPU、内存、磁盘I/O、内核、文件系统以及网络资源。对于内存使用状况而言，它能够展示像总计/闲置内存、交换区、缓冲的/缓存的内存，虚拟内存页面换入换出的统计，所有这些都是实时的。 + + $ nmon + +![](https://farm9.staticflickr.com/8648/15989760117_30f62f4aba_b.jpg) + +### 9. ps ### + +ps命令能够实时展示每个进程的内存使用状况。内存使用报告里包括了 %MEM (物理内存使用百分比), VSZ (虚拟内存使用总量), 和 RSS (物理内存使用总量)。你可以使用“--sort”选项来对进程列表排序。例如，按照RSS降序排序： + + $ ps aux --sort -rss + +![](https://farm9.staticflickr.com/8602/15989881547_ca40839c19_c.jpg) + +### 10. smem ### + +[smem][1]命令允许你测定不同进程和用户的物理内存使用状况，这些信息来源于“/proc”目录。它利用“按比例分配大小（PSS）”指标来精确量化Linux进程的有效内存使用情况。内存使用分析结果能够输出为柱状图或者饼图类的图形化图表。 + + $ sudo smem --pie name -c "pss" + +![](https://farm8.staticflickr.com/7466/15614838428_eed7426cfe_c.jpg) + +### 11. top ### + +top命令提供了一个运行中进程的实时视图，以及特定进程的各种资源使用统计信息。与内存相关的信息包括 %MEM (内存使用率), VIRT (虚拟内存使用总量), SWAP (换出的虚拟内存使用量), CODE (分配给代码执行的物理内存数量), DATA (分配给非执行的数据的物理内存数量), RES (物理内存使用总量; CODE+DATA), 和 SHR (有可能与其他进程共享的内存数量)。你能够基于内存使用情况或者大小对进程列表进行排序。 + +![](https://farm8.staticflickr.com/7464/15989760047_eb8d51d9f2_c.jpg) + +### 12. vmstat ### + +vmstat命令行工具显示涵盖了CPU、内存、中断和磁盘I/O在内的各种系统活动的瞬时和平均统计数据。对于内存信息而言，命令不仅仅展示了物理内存使用情况（例如总计/已使用内存和缓冲的/缓存的内存），还同样展示了虚拟内存统计数据（例如，内存页的换入/换出，虚拟内存页的换入/换出） + + $ vmstat -s + +![](https://farm9.staticflickr.com/8582/15988236860_3f142008d2_b.jpg) + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/check-memory-usage-linux.html + +译者：[Ping](https://github.com/mr-ping) +校对：[wxy](https://github.com/wxy) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://xmodulo.com/visualize-memory-usage-linux.html \ No newline at end of file diff --git a/translated/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md b/translated/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md deleted file mode 100644 index a04fdb1f52..0000000000 --- a/translated/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md +++ /dev/null @@ -1,113 +0,0 @@ -Linux有问必答：如何检查Linux的内存使用状况 -================================================================================ - ->**问题**：我想要监测Linux系统的内存使用状况。有哪些可用的图形界面或者命令行工具来检查当前内存使用情况？ - -当涉及到Linux系统性能优化的时候，物理内存是一个最重要的因素。自然的，Linux提供了丰富的选择来监测对于珍贵的内存资源的使用。不同的工具，在监测粒度（例如：全系统范围, 每个进程, 每个用户），接口（例如：图形用户界面, 命令行, ncurses）或者运行模式（交互模式, 批量处理模式）上都不尽相同。 - -下面是一个可供选择的但并不全面的图形或命令行工具列表，这些工具用来检查并且释放Linux平台中内存。 - -### 1. /proc/meminfo ### - -一种最简单的方法是通过“/proc/meminfo”来检查内存使用状况。这个动态更新的虚拟文件事实上是许多信息资源的集中展示，这些资源来自于诸如free，top和ps这些与内存相关的工具。从可用/闲置物理内存数量到等待被写入缓存的数量或者已写回磁盘的数量，只要是你想要的关于内存使用的信息，“/proc/meminfo”应有尽有。特定进程的内存信息也可以通过“/proc//statm”和“/proc//status”来获取。 - - $ cat /proc/meminfo - -![](https://farm8.staticflickr.com/7483/15989497899_bb6afede11_b.jpg) - -### 2. atop ### - -atop命令是用于终端环境的基于ncurses的交互系统和进程监测工具。它展示了动态更新的系统资源（中央处理器, 内存, 网络, 输入/输出, 内核）摘要，并且用醒目的颜色将高系统负载的警告信息标注出来。它同样提供了类似于top的线程（或用户）资源使用视图，因此系统管理员可以指出哪个进程或者用户对系统负载负责。内存统计报告包括了总计/闲置内存，缓存的/缓冲的内存 和 提交的虚拟内存。 - - $ sudo atop - -![](https://farm8.staticflickr.com/7552/16149756146_893773b84c_b.jpg) - -### 3. free ### - -free命令是一个用来获得内存使用概况的快速简单的方法，这些信息从“/proc/meminfo”获取。它提供了一个快照用于展示总计/闲置的物理内存和系统交换区，以及已使用/闲置的内核缓冲区。 - - $ free -h - -![](https://farm8.staticflickr.com/7531/15988117988_ba8c6b7b63_b.jpg) - -### 4. GNOME System Monitor ### - -GNOME System Monitor 是一个图形界面应用，它展示了包括中央处理器，内存，交换区和网络在内的系统资源使用率的短暂历史记录。它同时也可以提供一个带有中央处理器和内存使用情况的进程视图。 - - $ gnome-system-monitor - -![](https://farm8.staticflickr.com/7539/15988118078_279f0da494_c.jpg) - -### 5. htop ### - -htop命令是一个基于ncurses的交互处理视图，它实时展示了每个进程的内存使用情况。它可以报告所有运行中进程的常驻内存大小（RSS）、内存中程序的总大小、库大小、共享文件大小、和脏页面大小。你可以横向或者纵向滚动进程列表进行查看。 - - $ htop - -![](https://farm9.staticflickr.com/8236/8599814378_de071de408_c.jpg) - -### 6. KDE System Monitor ### - -就像GNOME桌面拥有GNOME System Monitor一样，KDE桌面也有它自己的对口应用：KDE System Monitor。这个工具的功能与GNOME版本极其相似，也就是说，它同样展示了一个关于系统资源使用情况，以及带有每个进程的中央处理器/内存消耗情况的实时历史记录。 - - $ ksysguard - -![](https://farm8.staticflickr.com/7479/15991397329_ec5d786ffd_c.jpg) - -### 7. memstat ### - -memstat工具对于识别正在消耗虚拟内存的可执行文件、进程和共享库非常有用。给出一个进程识别号，memstat即可识别出与之相关联的可执行文件、数据和共享库究竟使用了多少虚拟内存。 - - $ memstat -p - -![](https://farm8.staticflickr.com/7518/16175635905_1880e50055_b.jpg) - -### 8. nmon ### - -nmon工具是一个基于ncurses系统基准测试工具，它能够以交互方式监测中央处理器、内存、磁盘输入/输出、内核、文件系统以及网络资源。对于内存使用状况而言，它能够展示像总计/闲置内存、交换区、缓冲的/缓存的内存，虚拟内存页面输入输出统计，所有这些都是实时的。 - - $ nmon - -![](https://farm9.staticflickr.com/8648/15989760117_30f62f4aba_b.jpg) - -### 9. ps ### - -ps命令能够实时展示每个进程的内存使用状况。内存使用报告里包括了 %MEM (物理内存使用百分比), VSZ (虚拟内存使用总量), and RSS (物理内存使用总量)。你可以使用“--sort”选项来对进程列表排序。例如，按照RSS降序排序： - - $ ps aux --sort -rss - -![](https://farm9.staticflickr.com/8602/15989881547_ca40839c19_c.jpg) - -### 10. smem ### - -[smem][1]命令允许你测定不同进程和用户的物理内存使用状况，这些信息来源于“/proc”目录。它利用比例设置大小（PSS）指标来精确量化Linux进程的有效内存使用情况。内存使用分析能够扩展成为柱状图或者饼图类的图形化图表。 - - $ sudo smem --pie name -c "pss" - -![](https://farm8.staticflickr.com/7466/15614838428_eed7426cfe_c.jpg) - -### 11. top ### - -top命令提供了一个运行中进程的实时视图，以及特定进程的各种资源使用统计信息。与内存相关的信息包括 %MEM (内存使用率), VIRT (虚拟内存使用总量), SWAP (交换出的虚拟内存使用量), CODE (分配给代码执行的物理内存数量), DATA (分配给无需执行的数据的物理内存数量), RES (物理内存使用总量; CODE+DATA), and SHR (有可能与其他进程共享的内存数量).你能够基于内存使用情况或者大小对进程列表进行排序。 - -![](https://farm8.staticflickr.com/7464/15989760047_eb8d51d9f2_c.jpg) - -### 12. vmstat ### - -vmstat命令行工具显示涵盖了中央处理器、内存、中断和磁盘输入/输出在内的各种系统活动的瞬时和平均统计数据。对于内存信息而言，命令不仅仅展示了物理内存使用情况（例如总计/已使用内存和缓冲的/缓存的内存），还同样展示了虚拟内存统计数据（例如，内存的页输入/输出，交换输入/输出） - - $ vmstat -s - -![](https://farm9.staticflickr.com/8582/15988236860_3f142008d2_b.jpg) - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/check-memory-usage-linux.html - -译者：[Ping](https://github.com/mr-ping) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://xmodulo.com/visualize-memory-usage-linux.html \ No newline at end of file From 2e755abf31633af0dc1da59f6bf5d8ca4c05d248 Mon Sep 17 00:00:00 2001 From: shipsw Date: Fri, 6 Feb 2015 14:36:02 +0800 Subject: [PATCH 180/207] Delete 20140917 How to create a software RAID-1 array with mdadm on Linux.md --- ...ftware RAID-1 array with mdadm on Linux.md | 225 ------------------ 1 file changed, 225 deletions(-) delete mode 100644 sources/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md diff --git a/sources/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md b/sources/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md deleted file mode 100644 index bab7cfbcb2..0000000000 --- a/sources/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md +++ /dev/null @@ -1,225 +0,0 @@ -Translating by shipsw - -How to create a software RAID-1 array with mdadm on Linux -================================================================================ -Redundant Array of Independent Disks (RAID) is a storage technology that combines multiple hard disks into a single logical unit to provide fault-tolerance and/or improve disk I/O performance. Depending on how data is stored in an array of disks (e.g., with striping, mirroring, parity, or any combination thereof), different RAID levels are defined (e.g., RAID-0, RAID-1, RAID-5, etc). RAID can be implemented either in software or with a hardware RAID card. On modern Linux, basic software RAID functionality is available by default. - -In this post, we'll discuss the software setup of a RAID-1 array (also known as a "mirroring" array), where identical data is written to the two devices that form the array. While it is possible to implement RAID-1 with partitions on a single physical hard drive (as with other RAID levels), it won't be of much use if that single hard drive fails. In fact, that's why most RAID levels normally use multiple physical drives to provide redundancy. In the event of any single drive failure, the virtual RAID block device should continue functioning without issues, and allow us to replace the faulty drive without significant production downtime and, more importantly, with no data loss. However, it does not replace the need to save periodic system backups in external storage. - -Since the actual storage capacity (size) of a RAID-1 array is the size of the smallest drive, normally (if not always) you will find two identical physical drives in RAID-1 setup. - -### Installing mdadm on Linux ### - -The tool that we are going to use to create, assemble, manage, and monitor our software RAID-1 is called mdadm (short for **m**ultiple **d**isks **adm**in). On Linux distros such as Fedora, CentOS, RHEL or Arch Linux, mdadm is available by default. On Debian-based distros, mdadm can be installed with aptitude or apt-get. - -#### Fedora, CentOS or RHEL #### - -As mdadm comes pre-installed, all you have to do is to start RAID monitoring service, and configure it to auto-start upon boot: - - # systemctl start mdmonitor - # systemctl enable mdmonitor - -For CentOS/RHEL 6, use these commands instead: - - # service mdmonitor start - # chkconfig mdmonitor on - -#### Debian, Ubuntu or Linux Mint #### - -On Debian and its derivatives, mdadm can be installed with **aptitude or apt-get**: - - # aptitude install mdadm - -On Ubuntu, you will be asked to configure postfix MTA for sending out email notifications (as part of RAID monitoring). You can skip it for now. - -On Debian, the installation will start with the following explanatory message to help us decide whether or not we are going to install the root filesystem on a RAID array. What we need to enter on the next screen will depend on this decision. Read it carefully: - -![](https://farm4.staticflickr.com/3918/15220883382_c14eb95914_z.jpg) - -Since we will not use our RAID-1 for the root filesystem, we will leave the answer blank: - -![](https://farm6.staticflickr.com/5555/15198241896_29e08b977f.jpg) - -When asked whether we want to start (reassemble) our array automatically during each boot, choose "Yes". Note that we will need to add an entry to the /etc/fstab file later in order for the array to be properly mounted during the boot process as well. - -![](https://farm4.staticflickr.com/3875/15220883342_2b1d689a0a_z.jpg) - -### Partitioning Hard Drives ### - -Now it's time to prepare the physical devices that will be used in our array. For this setup, I have plugged in two 8 GB USB drives that have been identified as /dev/sdb and /dev/sdc from dmesg output: - - # dmesg | less - ----------- - -[ 60.014863] sd 3:0:0:0: [sdb] 15826944 512-byte logical blocks: (8.10 GB/7.54 GiB) -[ 75.066466] sd 4:0:0:0: [sdc] 15826944 512-byte logical blocks: (8.10 GB/7.54 GiB) - -We will use fdisk to create a primary partition on each disk that will occupy its entire size. The following steps show how to perform this task on /dev/sdb, and assume that this drive hasn't been partitioned yet (otherwise, we can delete the existing partition(s) to start off with a clean disk): - - # fdisk /dev/sdb - -Press 'p' to print the current partition table: - -![](https://farm4.staticflickr.com/3883/15198241836_24625edcf3_z.jpg) - -(if one or more partitions are found, they can be deleted with 'd' option. Then 'w' option is used to apply the changes). - -Since no partitions are found, we will create a new primary partition ['n'] as a primary partition ['p'], assign the partition number = ['1'] to it, and then indicate its size. You can press Enter key to accept the proposed default values, or enter a value of your choosing, as shown in the image below. - -![](https://farm4.staticflickr.com/3875/15034475369_7e72fb9f2e_z.jpg) - -Now repeat the same process for /dev/sdc. - -If we have two drives of different sizes, say 750 GB and 1 TB for example, we should create a primary partition of 750 GB on each of them, and use the remaining space on the bigger drive for another purpose, independent of the RAID array. - -### Create a RAID-1 Array ### - -Once you are done with creating the primary partition on each drive, use the following command to create a RAID-1 array: - - # mdadm -Cv /dev/md0 -l1 -n2 /dev/sdb1 /dev/sdc1 - -Where: - -- **-Cv**: creates an array and produce verbose output. -- **/dev/md0**: is the name of the array. -- **-l1** (l as in "level"): indicates that this will be a RAID-1 array. -- **-n2**: indicates that we will add two partitions to the array, namely /dev/sdb1 and /dev/sdc1. - -The above command is equivalent to: - - # mdadm --create --verbose /dev/md0 --level=1 --raid-devices=2 /dev/sdb1 /dev/sdc1 - -If alternatively you want to add a spare device in order to replace a faulty disk in the future, you can add '--spare-devices=1 /dev/sdd1' to the above command. - -Answer "y" when prompted if you want to continue creating an array, then press Enter: - -![](https://farm4.staticflickr.com/3894/15034569970_709bd51718.jpg) - -You can check the progress with the following command: - - # cat /proc/mdstat - -![](https://farm6.staticflickr.com/5565/15221267975_701b819e6d_z.jpg) - -Another way to obtain more information about a RAID array (both while it's being assembled and after the process is finished) is: - - # mdadm --query /dev/md0 - # mdadm --detail /dev/md0 (or mdadm -D /dev/md0) - -![](https://farm6.staticflickr.com/5583/15034683868_6c28564e5a_z.jpg) - -Of the information provided by 'mdadm -D', perhaps the most useful is that which shows the state of the array. The active state means that there is currently I/O activity happening. Other possible states are clean (all I/O activity has been completed), degraded (one of the devices is faulty or missing), resyncing (the system is recovering from an unclean shutdown such as a power outage), or recovering (a new drive has been added to the array, and data is being copied from the other drive onto it), to name the most common states. - -### Formatting and Mounting a RAID Array ### - -The next step is formatting (with ext4 in this example) the array: - - # mkfs.ext4 /dev/md0 - -![](https://farm4.staticflickr.com/3849/15034683838_01e34e7196_z.jpg) - -Now let's mount the array, and verify that it was mounted correctly: - - # mount /dev/md0 /mnt - # mount - -![](https://farm6.staticflickr.com/5554/15034696167_c4fc907c8e_z.jpg) - -### Monitor a RAID Array ### - -The mdadm tool comes with RAID monitoring capability built in. When mdadm is set to run as a daemon (which is the case with our RAID setup), it periodically polls existing RAID arrays, and reports on any detected events via email notification or syslog logging. Optionally, it can also be configured to invoke contingency commands (e.g., retrying or removing a disk) upon detecting any critical errors. - -By default, mdadm scans all existing partitions and MD arrays, and logs any detected event to /var/log/syslog. Alternatively, you can specify devices and RAID arrays to scan in mdadm.conf located in /etc/mdadm/mdadm.conf (Debian-based) or /etc/mdadm.conf (Red Hat-based), in the following format. If mdadm.conf does not exist, create one. - - DEVICE /dev/sd[bcde]1 /dev/sd[ab]1 - - ARRAY /dev/md0 devices=/dev/sdb1,/dev/sdc1 - ARRAY /dev/md1 devices=/dev/sdd1,/dev/sde1 - ..... - - # optional email address to notify events - MAILADDR your@email.com - -After modifying mdadm configuration, restart mdadm daemon: - -On Debian, Ubuntu or Linux Mint: - - # service mdadm restart - -On Fedora, CentOS/RHEL 7: - - # systemctl restart mdmonitor - -On CentOS/RHEL 6: - - # service mdmonitor restart - -### Auto-mount a RAID Array ### - -Now we will add an entry in the /etc/fstab to mount the array in /mnt automatically during boot (you can specify any other mount point): - - # echo "/dev/md0 /mnt ext4 defaults 0 2" << /etc/fstab - -To verify that mount works okay, we now unmount the array, restart mdadm, and remount. We can see that /dev/md0 has been mounted as per the entry we just added to /etc/fstab: - - # umount /mnt - # service mdadm restart (on Debian, Ubuntu or Linux Mint) - or systemctl restart mdmonitor (on Fedora, CentOS/RHEL7) - or service mdmonitor restart (on CentOS/RHEL6) - # mount -a - -![](https://farm6.staticflickr.com/5563/15218183681_63a10da704_z.jpg) - -Now we are ready to access the RAID array via /mnt mount point. To test the array, we'll copy the /etc/passwd file (any other file will do) into /mnt: - -![](https://farm6.staticflickr.com/5593/15034475219_a3476aec0a_o.png) - -On Debian, we need to tell the mdadm daemon to automatically start the RAID array during boot by setting the AUTOSTART variable to true in the /etc/default/mdadm file: - - AUTOSTART=true - -### Simulating Drive Failures ### - -We will simulate a faulty drive and remove it with the following commands. Note that in a real life scenario, it is not necessary to mark a device as faulty first, as it will already be in that state in case of a failure. - -First, unmount the array: - - # umount /mnt - -Now, notice how the output of 'mdadm -D /dev/md0' indicates the changes after performing each command below. - - # mdadm /dev/md0 --fail /dev/sdb1 #Marks /dev/sdb1 as faulty - # mdadm --remove /dev/md0 /dev/sdb1 #Removes /dev/sdb1 from the array - -Afterwards, when you have a new drive for replacement, re-add the drive again: - - # mdadm /dev/md0 --add /dev/sdb1 - -The data is then immediately started to be rebuilt onto /dev/sdb1: - -![](https://farm4.staticflickr.com/3855/15221267875_dfc6af8804_z.jpg) - -Note that the steps detailed above apply for systems with hot-swappable disks. If you do not have such technology, you will also have to stop a current array, and shutdown your system first in order to replace the part: - - # mdadm --stop /dev/md0 - # shutdown -h now - -Then add the new drive and re-assemble the array: - - # mdadm /dev/md0 --add /dev/sdb1 - # mdadm --assemble /dev/md0 /dev/sdb1 /dev/sdc1 - -Hope this helps. - --------------------------------------------------------------------------------- - -via: http://xmodulo.com/2014/09/create-software-raid1-array-mdadm-linux.html - -作者：[Gabriel Cánepa][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://xmodulo.com/author/gabriel From d09b7e88245af9f68f989bfc259fd88b239709ec Mon Sep 17 00:00:00 2001 From: shipsw Date: Fri, 6 Feb 2015 14:40:44 +0800 Subject: [PATCH 181/207] Create 20140917 How to create a software RAID-1 array with mdadm on Linux.md --- ...ftware RAID-1 array with mdadm on Linux.md | 223 ++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 translated/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md diff --git a/translated/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md b/translated/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md new file mode 100644 index 0000000000..ddbdfc8689 --- /dev/null +++ b/translated/tech/20140917 How to create a software RAID-1 array with mdadm on Linux.md @@ -0,0 +1,223 @@ +如何使用linux程序mdadm创建软件RAID1软阵列 +================================================================================ +磁盘冗余阵列(RAID)是将多个物理磁盘结合成一个逻辑磁盘的技术，该技术可以提高磁盘容错性能，提高磁盘的读写速度。根据数据存储的排列(如 条带存储，镜像存储，奇偶或者他们的组合)，定义了几个不同级别的RAID(RAID-0，RAID-1，RAID-5 等等)。磁盘阵列可以使用软件或者硬件方式实现。现代Linux操作系统中，基本的软件RAID功能是默认安装的。 + +本文中，我们将介绍软件方式构建RAID-1阵列(镜像阵列)，RAID-1将相同的数据写到不同的设备中。虽然可以使用同一个磁盘的两个分区实现RAID-1，但是如果磁盘坏了的话数据就都丢了，所以没什么意义。实际上，这也是为什么大多数RAID级别都使用多个物理磁盘提供冗余。当单盘失效后不影响整个阵列的运行，并且可以在线更换磁盘，最重要的是数据不会丢失。尽管如此，阵列不能取代外部存储的定期备份。 + +由于RAID-1阵列的大小是最小磁盘的大小，一般来说应该使用两个大小相同的磁盘来组建RAID-1。 + +### 安装mdadm ### + +我们将使用mdadm（简称多盘管理）工具创建、组装、管理和监控软件RAID-1。在诸如Fedora、CentOS、RHEL或者Arch Linux 的发行版中，mdadm是默认安装的。在基于Debian的发行版中，可以使用aptitude 或者 apt-get 安装mdadm。 + +#### Fedora, CentOS 或 RHEL #### + +由于adadm是预装的，所以我们只需要开启RAID守护服务，并将其配置成开机启动即可： + + # systemctl start mdmonitor + # systemctl enable mdmonitor + +对于CentOS/RHEL 6系统，使用以下命令： + + # service mdmonitor start + # chkconfig mdmonitor on + +#### Debian, Ubuntu 或 Linux Mint #### + +在Debian或类Debian系统中，mdadm可以使用 **aptitude 或者 apt-get** 安装： + + # aptitude install mdadm + +Ubuntu系统中，会要求为电子邮件通知配置后缀MTA。你可以跳过去。 + +Debian系统中，安装程序会显示以下解释信息，用来帮助我们去判断是否将根目录安装到RAID阵列中。下面的所有操作都有赖于这一步，所以应该仔细阅读他。 + +![](https://farm4.staticflickr.com/3918/15220883382_c14eb95914_z.jpg) + +我们不在根目录使用RAID-1，所以留空。 + +![](https://farm6.staticflickr.com/5555/15198241896_29e08b977f.jpg) + +提示是否开机启动阵列的时候，选择是。注意，这里需要往/etc/fstab 文件中添加一个条目使得系统启动的时候正确挂载阵列。 + +![](https://farm4.staticflickr.com/3875/15220883342_2b1d689a0a_z.jpg) + +### 硬盘分区 ### + +现在开始准备建立阵列需要的硬盘。这里往插入两个8GB的usb磁盘，使用dmesg命令设备显示设备 /dev/sdb 和 /dev/sdc + + # dmesg | less + +---------- + +[ 60.014863] sd 3:0:0:0: [sdb] 15826944 512-byte logical blocks: (8.10 GB/7.54 GiB) +[ 75.066466] sd 4:0:0:0: [sdc] 15826944 512-byte logical blocks: (8.10 GB/7.54 GiB) + +我们使用fdisk为每个磁盘建立一个大小为8G的主分区。以下步骤是如何在/dev/sdb上建立分区，假设次磁盘从未被分区(如果有其他分区的话，可以删掉)： + + # fdisk /dev/sdb + +按p键输出现在的分区表： + +![](https://farm4.staticflickr.com/3883/15198241836_24625edcf3_z.jpg) + +(如果有分区的话，可以使用 d 选项删除，w 选项应用更改)。 + +磁盘上没有分区，所以我们使用命令 ['n'] 创建一个主分区['p'], 分配分区号为['1'] 并且指定大小。你可以按回车使用默认值，或者输入一个你想设置的值。如下图： + +![](https://farm4.staticflickr.com/3875/15034475369_7e72fb9f2e_z.jpg) + +用同样的方法为/dev/sdc 分区。 + +如果我们有两个不同容量的硬盘，比如 750GB 和 1TB的话，我们需要在每个磁盘上分出一个750GB的主分区，大盘剩下的空间可以用作他用，不加入磁盘阵列。 + +### 创建 RAID-1 阵列 ### + +磁盘分区完成后，我们可以使用以下命令创建 RAID-1 阵列： + + # mdadm -Cv /dev/md0 -l1 -n2 /dev/sdb1 /dev/sdc1 + +说明： + +- **-Cv**: 创建一个阵列并打印出详细信息。 +- **/dev/md0**: 阵列名称。 +- **-l1** (l as in "level"): 指定阵列类型为 RAID-1 。 +- **-n2**: 指定我们将两个分区加入到阵列中去，分别为/dev/sdb1 和 /dev/sdc1 + +以上命令和下面的等价: + + # mdadm --create --verbose /dev/md0 --level=1 --raid-devices=2 /dev/sdb1 /dev/sdc1 + +如果你想在在磁盘失效时添加另外一个磁盘到阵列中，可以指定 '--spare-devices=1 /dev/sdd1' 到以上命令。 + +输入 “y” 继续创建阵列，回车： + +![](https://farm4.staticflickr.com/3894/15034569970_709bd51718.jpg) + +可以使用以下命令查看进度： + + # cat /proc/mdstat + +![](https://farm6.staticflickr.com/5565/15221267975_701b819e6d_z.jpg) + +另外一个获取阵列信息的方法是： + + # mdadm --query /dev/md0 + # mdadm --detail /dev/md0 (or mdadm -D /dev/md0) + +![](https://farm6.staticflickr.com/5583/15034683868_6c28564e5a_z.jpg) + +'mdadm -D'命令提供的信息中，最重要就是阵列状态类。激活状态说明阵列正在进行读写操作。其他几个状态分别为 完成(读写完成)、降级(有一块磁盘失效或丢失)或者恢复中(一张新盘已插入，系统正在写入数据)。这几个状态涵盖类大多数情况。 + +### 格式化或加载磁盘阵列 ### + +下一步就是格式化阵列了，本例中使用ext4格式： + + # mkfs.ext4 /dev/md0 + +![](https://farm4.staticflickr.com/3849/15034683838_01e34e7196_z.jpg) + +现在可以加载阵列并验证其正常加载： + + # mount /dev/md0 /mnt + # mount + +![](https://farm6.staticflickr.com/5554/15034696167_c4fc907c8e_z.jpg) + +### 监控磁盘阵列 ### + +mdadm工具内置有磁盘阵列监控功能。当mdadm作为守护程序运行的时候(就像我们上文那样)，会周期性的检测阵列运行状态，将检测到的信息通过电子邮件或者系统日志报告上来。当然，也可以配置其在发生致命性错误的时候调用紧急命令。 + +mdadm默认会记录所有已知分区和阵列的事件，并将他们记录到 /var/log/syslog中。或者你可以在配置文件中(/etc/mdadm/mdadm.conf debian系统 /etc/mdadm.conf 红帽子系统)以以下格式指定监控设备或者阵列。如果mdadm.conf文件不存在，你可以创建一个。 + + DEVICE /dev/sd[bcde]1 /dev/sd[ab]1 + + ARRAY /dev/md0 devices=/dev/sdb1,/dev/sdc1 + ARRAY /dev/md1 devices=/dev/sdd1,/dev/sde1 + ..... + + # optional email address to notify events + MAILADDR your@email.com + +编辑完毕mdadm配置文件后，重启mdadm服务： + +Debian系统，Ubuntu或者Linux Mint: + + # service mdadm restart + +Fedora, CentOS 或 RHEL 7: + + # systemctl restart mdmonitor + +CentOS或者RHEL 6: + + # service mdmonitor restart + +### 自动加载阵列 ### + +现在我们在/etc/fstab中加入条目使得系统启动的时候将阵列挂载到/mnt目录下： + + # echo "/dev/md0 /mnt ext4 defaults 0 2" << /etc/fstab + +为了验证挂载脚本工作正常，我们首先卸载阵列，重启mdadm，然后重新加载。可以看到/dev/md0已经安装我们添加到/etc/fstab中的条目加载了： + + # umount /mnt + # service mdadm restart (on Debian, Ubuntu or Linux Mint) + or systemctl restart mdmonitor (on Fedora, CentOS/RHEL7) + or service mdmonitor restart (on CentOS/RHEL6) + # mount -a + +![](https://farm6.staticflickr.com/5563/15218183681_63a10da704_z.jpg) + +现在我们的阵列已经可以访问类，拷贝文件/etc/passwd到/mnt中测试一下： + +![](https://farm6.staticflickr.com/5593/15034475219_a3476aec0a_o.png) + +Debian系统中，需要在/etc/default/mdadm 设置 AUTOSTART 变量为 true 才能使mdadm守护程序在开机时自动加载阵列： + + AUTOSTART=true + +### 模拟磁盘丢失故障 ### + +我们将使用以下命令卸载磁盘来模拟磁盘故障。注意，在实际应用中，磁盘已经上故障状态了，不需要卸载。 + +首先，卸载阵列： + + # umount /mnt + +现在注意每次执行命令后 'mdadm -D /dev/md0' 的输出。 + + # mdadm /dev/md0 --fail /dev/sdb1 #Marks /dev/sdb1 as faulty + # mdadm --remove /dev/md0 /dev/sdb1 #Removes /dev/sdb1 from the array + +然后，如果你有个备用盘的话，重新添加以下： + + # mdadm /dev/md0 --add /dev/sdb1 + +数据会被自动添加到备用盘 /dev/sdb1 上： + +![](https://farm4.staticflickr.com/3855/15221267875_dfc6af8804_z.jpg) + +注意以上所述步骤只适合支持磁盘热拔插的系统，在不支持热拔插的系统中，还是得停止阵列并关机后更换备用盘： + + # mdadm --stop /dev/md0 + # shutdown -h now + +最后将新驱动器重新添加到阵列中： + + # mdadm /dev/md0 --add /dev/sdb1 + # mdadm --assemble /dev/md0 /dev/sdb1 /dev/sdc1 + +希望本文对你有所帮助 + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/2014/09/create-software-raid1-array-mdadm-linux.html + +作者：[Gabriel Cánepa][a] +译者：[shipsw](https://github.com/shipsw) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/gabriel From 1f9e2847f5fc3eea5db504bf5430ce2f9431ff86 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Fri, 6 Feb 2015 15:42:19 +0800 Subject: [PATCH 182/207] Translating by ZTinoZ --- ...s with Answers--How to check CPU info on Linux.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md index 129bcb9824..da72d8527b 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md @@ -62,7 +62,7 @@ i7z是一个专供英特尔酷睿i3、i5和i7 CPU的实时CPU报告工具。它 ### 9. lscpu ### -The lscpu command summarizes /etc/cpuinfo content in a more user-friendly format, e.g., the number of (online/offline) CPUs, cores, sockets, NUMA nodes. +lscpu命令用一个更加用户友好的格式统计了 /etc/cpuinfo 的内容，比如CPU、核心、套接字、NUMA节点的数量（线上/线下）。 $ lscpu @@ -70,7 +70,7 @@ The lscpu command summarizes /etc/cpuinfo content in a more user-friendly format ### 10. lshw ### -The **lshw** command is a comprehensive hardware query tool. Unlike other tools, lshw requires root privilege because it query DMI information in system BIOS. It can report the total number of cores and enabled cores, but miss out on information such as L1/L2/L3 cache configuration. The GTK version lshw-gtk is also available. +**lshw**命令是一个综合性硬件查询工具。不同于其它工具，lshw需要root特权才能运行因为它是在BIOS系统里查询DMI（译者注：桌面管理接口）信息。它能报告总核心数和可用核心数，但是会遗漏掉一些信息比如L1/L2/L3缓存配置。GTK版本的lshw-gtk也是可用的。 $ sudo lshw -class processor @@ -78,7 +78,7 @@ The **lshw** command is a comprehensive hardware query tool. Unlike other tools, ### 11. lstopo ### -The lstopo command (contained in [hwloc][4] package) visualizes the topology of the system which is composed of CPUs, cache, memory and I/O devices. This command is useful to identify the processor architecture and NUMA topology of the system. +lstopo命令 (包括 [hwloc][4] 包) 使由CPU、缓存、内存和I/O设备组成的拓扑结构可见。这个命令用来识别处理器结构和系统的NUMA拓扑结构。 $ lstopo @@ -86,7 +86,7 @@ The lstopo command (contained in [hwloc][4] package) visualizes the topology of ### 12. numactl ### -Originally developed to set the NUMA scheduling and memeory placement policy of Linux processes, the numactl command can also show information about NUMA topology of the CPU hardware from the command line. +其被开发的起初是为了设置NUMA的时序安排和Linux处理器的内存布局策略，numactl命令也能通过命令行来展示关于CPU硬件的NUMA拓扑结构信息。 $ numactl --hardware @@ -94,7 +94,7 @@ Originally developed to set the NUMA scheduling and memeory placement policy of ### 13. x86info ### -x86info is a command-line tool for showing x86-based CPU information. Reported information includes CPU model, number of threads/cores, clock speed, TLB cache configuration, supported feature flags, etc. +x86info是一个为了展示基于x86架构的CPU信息的命令行工具。信息报告包括CPU型号、线程/核心数、时钟速度、TLB（译者注：传输后备缓冲器）缓存配置、支持的特征标志寄存器等等。 $ x86info --all @@ -104,7 +104,7 @@ x86info is a command-line tool for showing x86-based CPU information. Reported i via: http://ask.xmodulo.com/check-cpu-info-linux.html -译者：[译者ID](https://github.com/译者ID) +译者：[ZTinoZ](https://github.com/ZTinoZ) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 9eb7361f9b15ea58761874c4fc86e3fce44eec07 Mon Sep 17 00:00:00 2001 From: ZTinoZ Date: Fri, 6 Feb 2015 15:44:46 +0800 Subject: [PATCH 183/207] Finish the Translation by ZTinoZ --- ...121 Linux FAQs with Answers--How to check CPU info on Linux.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {sources => translated}/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md (100%) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md b/translated/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md similarity index 100% rename from sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md rename to translated/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md From 2386fb05709db50704cda0f3df6abdeb0af9ddf0 Mon Sep 17 00:00:00 2001 From: JMichaelKane <703039930@qq.com> Date: Fri, 6 Feb 2015 15:56:37 +0800 Subject: [PATCH 184/207] Update 20141219 Google Cloud offers streamlined Ubuntu for Docker use.md --- ...9 Google Cloud offers streamlined Ubuntu for Docker use.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/news/20141219 Google Cloud offers streamlined Ubuntu for Docker use.md b/sources/news/20141219 Google Cloud offers streamlined Ubuntu for Docker use.md index 9af3b6665c..c63c4a78f2 100644 --- a/sources/news/20141219 Google Cloud offers streamlined Ubuntu for Docker use.md +++ b/sources/news/20141219 Google Cloud offers streamlined Ubuntu for Docker use.md @@ -21,7 +21,7 @@ Developed in part by two ex-Rackspace engineers, [CoreOS][8] is a lightweight Li CoreOS was quickly adopted by many cloud providers, including Microsoft Azure, Amazon Web Services, DigitalOcean and Google Compute Engine. Like CoreOS, Ubuntu Core offers an expedited process for updating components, reducing the amount of time that an administrator would need to manually manage them. - +如同Coreos一样，Ubuntu内核提供了一个快速引擎来更新组件 -------------------------------------------------------------------------------- via: http://www.infoworld.com/article/2860401/cloud-computing/google-cloud-offers-streamlined-ubuntu-for-docker-use.html @@ -40,4 +40,4 @@ via: http://www.infoworld.com/article/2860401/cloud-computing/google-cloud-offer [5]:http://www.itworld.com/article/2695383/open-source-tools/docker-all-geared-up-for-the-enterprise.html [6]:http://www.itworld.com/article/2695501/cloud-computing/google-unleashes-docker-management-tools.html [7]:http://www.itworld.com/article/2696116/open-source-tools/coreos-linux-does-away-with-the-upgrade-cycle.html -[8]:https://coreos.com/using-coreos/ \ No newline at end of file +[8]:https://coreos.com/using-coreos/ From e342defb3800c5dd6e9b74b3d4681138fd928187 Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Fri, 6 Feb 2015 16:04:26 +0800 Subject: [PATCH 185/207] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...114 Why Mac users don't switch to Linux.md | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translated/talk/20150114 Why Mac users don't switch to Linux.md b/translated/talk/20150114 Why Mac users don't switch to Linux.md index ae5337b1f2..6125a676a4 100644 --- a/translated/talk/20150114 Why Mac users don't switch to Linux.md +++ b/translated/talk/20150114 Why Mac users don't switch to Linux.md @@ -2,39 +2,39 @@ ================================================================================ Linux 与 Mac 用户至少有一个共同点：他们都不太喜欢用 Windows。但除了这点外，二者再也无法达成其他共识，只得分道扬镳。为什么 Mac 用户不选择 Linux 呢？是什么因素致使 Mac 用户做出了这种选择的？ -[Datamation 就此问题做了一番调查][1]，并试图进行解答。Datamation 的结论是，所有原因都只归结于众多应用及工作区，而非操作系统的关系： +[Datamation 就此问题做了一番调查][1]，并试图进行解答。Datamation 的结论是，所有原因都只归结于众多应用及工作流程，而非操作系统的关系： -> …某些事例表明，尝试用新应用接替现有应用，并非会是很糟糕的体验 - 对工作区和实用性来说都是如此。但不幸的是，苹果在这些方面做得非常好。因此，在几乎不可能改变这些事实的情况下，想要拉拢那些 Mac忠实用户实在是很大的挑战。 +> …某些事例表明，尝试用新应用代替现有应用，并不是很实际 - 对工作流程和整体实用性来说都是如此。但不幸的是，苹果在这些方面做得非常好。因此，在几乎不可能改变这些事实的情况下，想要拉拢那些 Mac忠实用户实在是很大的挑战。 > 不过老实来说，除了 Web 开发者，我还没见过 Mac 用户仅仅为了避免升级到 OS X Yosemite 而 “ -en masse”(法语：共同，一起) 尝试变更他们的工作区。诚然，经历过 Yosemite 更新后 - 考虑过权限的用户应该会发现这方面已经变得非常令人讨厌。并且，OS X 除了在 UI 方面几乎没有变化，针对现有 Mac 用户的核心工作区也在最大程度上保持了原样。 +en masse”(法语：共同，一起) 尝试变更他们的工作流程。诚然，经历过 Yosemite 更新后 - 考虑过权限的用户应该会发现这方面已经变得非常令人讨厌。并且，OS X 除了在 UI 方面的微小变化，几乎没有改变，针对现有 Mac 用户的核心工作流程也在最大程度上保持了原样。 > 但，我相信 Linux 在未来将会继续保持多样化特点。Linux 会继续成长，但绝不是经过精确计量般得一成不变。 -我大体上同意 Datamation 关于应用和工作区的重要性的结论，在选择操作系统时这两方面是必须要考虑顾及的。但我认为对 Mac 用户来说，选择 Mac 有比这两方面更重要的因素。我相信是不同的心态造就了 Linux 和 Mac 用户，并且我认为这才是为什么 Mac 用户不选择 Linux 的真实原因。 +我大体上同意 Datamation 关于应用和工作流程重要性的结论，在选择操作系统时这两方面是必须要考虑顾及的。但我认为对 Mac 用户来说，选择 Mac 有比这两方面更重要的因素。我相信是不同的心态造就了 Linux 和 Mac 用户，并且我认为这才是为什么 Mac 用户不选择 Linux 的真实原因。 ![](http://jimlynch.com/wp-content/uploads/2015/01/mac-users-switch-to-linux.jpeg) ### 控制权才是 Linux 用户最看重的地方 ### Linux 用户倾向于控制电脑上的所有细节，他们试图作出一切能做的努力使操作系统变成他们想要的样子。但这种方式并不适用于 OS X 以及其他任何苹果的产品。如果你使用了苹果的产品，就意味着绝大多数情况下，你只能按照苹果预先设定的模式来使用它们。 -对 Mac（以及 iOS）用户来说这没什么，因为他们似乎并不在乎生活在苹果那围墙高筑的花园里，仅仅使用那些苹果给予他们的标准和选择。但这对绝大多数 Linux 用户来说是完全不能接受的。Linux 的新用户通常来自 Windows，正是从那里，他们开始厌恶那些告诉他们什么才叫操作系统，并试图限制操作系统权限的东西的。 +对 Mac（以及 iOS）用户来说这没什么，因为他们似乎并不在乎生活在苹果那围墙高筑的花园里，仅仅使用那些苹果给予他们的标准和选择。但这对绝大多数 Linux 用户来说是完全不能接受的。Linux 的新用户通常来自 Windows，正是从那里，他们开始厌恶那些告诉他们什么才叫操作系统，并试图限制操作系统权限的东西。 -自从他们尝到使用自由的 Linux 系统所带来的甜头之后，他们就再也不会再回到苹果或者微软的监牢里去了。即使你在他们死后，把 Linux 从他们那冰冷僵硬的手指下撬出来，他们也不会接受苹果和微软那种糟糕的操作系统。 +自从他们尝到使用自由的 Linux 系统所带来的甜头之后，他们就再也不会回到苹果或者微软的监牢里去了。即使在他们死后，把 Linux 从他们那冰冷僵硬的手指中撬出来，他们也不会接受苹果和微软为他们定制的操作系统。 但绝大部分 Mac 用户不会有这样的意志和决心。对他们来说当苹果升级 OS X 时放弃他们现有的习惯方式是非常容易的。在苹果那围墙高筑的花园里，即使他们不满意苹果的变化，他们也会迅速地接受。 -因此，对控制权的渴望是 Mac 用户与 Linux 用户的最大不同。但我并未把它视为一个问题，尽管这反映出使用电脑的两类人的截然不同的态度。 +因此，对控制权的渴望是 Mac 用户与 Linux 用户的最大不同。但我并未把它视为一个问题，尽管这反映出使用电脑的两类用户截然不同的态度。 ### Mac 用户离不开苹果的技术支持 ### Linux 用户与 Mac 用户的区别也体现在 Linux 用户并不介意亲自维护自己的电脑。虽然维护电脑及控制操作系统都是很大的责任，但 Linux 用户还是愿意独自承担，愿意通过自己的力量使他们的系统工作得更棒更有效率，并且深入了解操作系统是每一位 Linux 用户都乐衷的事情。 -当 Linux 用户遇到问题的时，他们会迅速地尝试自己来解决问题。如果这不奏效的话，他们会在网上寻找其他用户在遇到类似问题是怎么解决的，并不断进行尝试，直到问题解决。 +当 Linux 用户遇到问题时，他们会迅速地尝试自己来解决问题。如果这不奏效的话，他们会在网上搜索其他Linux用户的解决方案，并不断进行尝试，直到问题解决。 但 Mac 用户却不大会这样。这也许是为什么苹果零售店如此火爆、为什么如此多的 Mac 用户在拿到新 Mac 的时候会选择购买苹果维护服务的原因。Mac 用户会很轻易得带着 TA 的电脑去苹果零售店，走进天才吧并要求苹果的工作人员为其查看和修复电脑。 -绝大多数 Linux 用户连想都不会像这种事情。谁会愿意让一个你都不认识的家伙碰你的电脑并维修它呢？ +绝大多数 Linux 用户连想都不会想这种事情。谁会愿意让一个你都不认识的家伙碰你的电脑并维修它呢？ 因此对 Mac 用户来说，很难抛弃过去可以从苹果那里得到的技术支持，转而使用 Linux。这种选择会令某些 Mac 用户觉得自己的电脑将变得非常脆弱、容易被攻击，他们如同离开母亲怀抱的婴儿般充满了无助感。 @@ -42,7 +42,7 @@ Linux 用户与 Mac 用户的区别也体现在 Linux 用户并不介意亲自 Datamation 发表的文章中主要研究了软件方面的原因，但我认为硬件因素同样对 Mac 用户有很大影响。绝大部分 Mac 用户非常喜爱苹果的硬件。TA 们购买 Mac 并不仅仅是为了 OS X。苹果那精美的工艺设计也是 Mac 用户购买时着重考虑的一点。Mac 用户愿意支付高价购买电脑，因为他们认为这样绝对是物有所值的。 -另一方面，Linux 用户似乎并不会考虑这些东西。我认为他们更偏向于在他们的电脑外观上花费较少的金钱。对他们来说，花费最少的金钱来获取尽可能好的硬件才是最重要的。他们并不像 Mac 用户一样热衷于电脑的外观，因此这一点并不是他们在购买电脑时考虑的地方。 +另一方面，Linux 用户似乎并不会考虑这些东西。我认为他们更关注电脑的花费，而不太在意电脑的外观和设计。对他们来说，花费最少的金钱来获取尽可能好的硬件才是最重要的。他们并不像 Mac 用户一样热衷于电脑的外观，因此这一点并不是他们在购买电脑时考虑的地方。 我认为对于硬件的两种不同观点是没有高低之分的。这仅仅和用户的不同需求有关，仅仅会在他们购买电脑时影响他们，或者对某些 Linux 用户来说只是因为他们想要自己组装电脑而已。两种观点只是因为出发点不同、对于电脑的真正价值体现所在之处的理解不同罢了。 @@ -50,19 +50,19 @@ Datamation 发表的文章中主要研究了软件方面的原因，但我认为 ### Linux 发行版太多了不知道选哪个？ ### -另一个让 Mac 用户无法选择 Linux 的原因是：要从从众多 Linux 发行版当中选择一个实在是太困难了。在大多数 Linux 并不抗拒的多元化发行版时代，没有任何相关知识的 Mac 用户感到十分困惑。 +另一个让 Mac 用户无法选择 Linux 的原因是：要从众多 Linux 发行版当中选择一个实在是太困难了。在大多数 Linuxer 并不抗拒的多元化发行版时代，没有相关知识的 Mac 用户会对如何选择感到十分困惑。 -我认为，随着时间的推移，Mac 用户是可以找出不适应最适合自己的发行版的。但在短时间内，尤其是在长时期得使用 OS X 之后，这是一个艰巨的任务。我不认为这个问题是无法克服的，但却有必要在这里提一下。 +我认为，随着时间的推移，Mac 用户可以学习并找出最适合自己的发行版。但在短时间内，尤其是长时期得使用 OS X 之后，这是一个艰巨的任务。我不认为这个问题是无法克服的，但却有必要在这里提一下。 -当然我们可以给 Mac 用户指明道路，推荐参考 [DistroWatch][3] 还有我们人的博客 [Desktop Linux Reviews][4]，这都有助于 Mac 用户找到正确的 Linux 发行版。再说一条，网上有很多诸如“最好的 Linux 发行版”等类似的文章，当 Mac 用户想要寻找适合自己使用的发行版时可以参考一下。 +当然我们可以给大家提供资源，推荐参考 [DistroWatch][3] 还有我们的博客 [Desktop Linux Reviews][4]，这都有助于 Mac 用户找到适合的 Linux 发行版。再说一条，网上有很多诸如“最好的 Linux 发行版”等类似的文章，当 Mac 用户想要寻找适合自己使用的发行版时可以参考一下。 -但有苹果顾客购买 Mac 的其中一个原因是苹果硬件软件协调统一起来的简便性和易用性。所以我不确定有多少 Mac 用户愿意花费时间找出适合自己的 Linux 发行版。也许是否要使用 Linux 确实会令 TA 们考虑一阵子了。 +但有苹果顾客购买 Mac 的其中一个原因是苹果硬件软件协调统一起来的简便性和易用性。所以我不确定有多少 Mac 用户愿意花费时间找出适合自己的 Linux 发行版。也许是否要使用 Linux 确实会令TA们考虑一阵子了。 ### Mac 用户是苹果，Linux 用户是橘子 ### -Mac 用户与 Linux 用户分道扬镳我认为并没有什么不妥。我认为我们只是在谈论两类完全不同的人群，这是一件好事，因为两类人群都在按自己四环的方式去使用操作系统和软件。让 Mac 用户和 Linux 用户各自沉浸在 OS X 和 Linux 中吧，希望他们都能高兴，都能对自己的电脑满意。 +Mac 用户与 Linux 用户分道扬镳我认为并没有什么不妥。我认为我们只是在谈论两类完全不同的人群，这是一件好事，因为两类人群都在按自己喜欢的方式去使用操作系统和软件。让 Mac 用户和 Linux 用户各自沉浸在 OS X 和 Linux 中吧，希望他们都能高兴，都能对自己的电脑满意。 -也许 Mac 用户会偶然走入 Linux 的世界并开始转向 Linux，但我认为绝大多数时候，两类人都愿意呆在在不同的世界并不与对方接触。通常来说我并不会随意比较二者，尤其是你已经自己拿定主意的时候，况且这只不过是选苹果还是选橘子的问题罢了。 +也许 Mac 用户会偶然走入 Linux 的世界并开始转向 Linux，但我认为绝大多数时候，两类人都愿意呆在不同的世界并不与对方接触。通常来说我并不会随意比较二者，尤其是你已经自己拿定主意的时候，况且这只不过是选苹果还是选橘子的问题罢了。 -------------------------------------------------------------------------------- @@ -70,7 +70,7 @@ via: http://jimlynch.com/linux-articles/why-mac-users-dont-switch-to-linux/ 作者：[Jim Lynch][a] 译者：[Stevearzh](https://github.com/Stevearzh) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 @@ -78,4 +78,4 @@ via: http://jimlynch.com/linux-articles/why-mac-users-dont-switch-to-linux/ [1]:http://www.datamation.com/open-source/why-linux-isnt-winning-over-mac-users-1.html [2]:http://www.howtogeek.com/187410/how-to-install-and-dual-boot-linux-on-a-mac/ [3]:http://distrowatch.com/ -[4]:http://desktoplinuxreviews.com/ \ No newline at end of file +[4]:http://desktoplinuxreviews.com/ From ac3ee920fab7c649b0070e6534b5d1f0df8bf8ea Mon Sep 17 00:00:00 2001 From: geekpi Date: Fri, 6 Feb 2015 20:57:17 +0800 Subject: [PATCH 186/207] translating --- ... FAQs with Answers--How to install Go language on Linux.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md b/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md index 410d7a79b7..73b6f237b1 100644 --- a/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md +++ b/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md @@ -1,3 +1,5 @@ +translating----geekpi + Linux FAQs with Answers--How to install Go language on Linux ================================================================================ Go (also called "golang") is an open-source programming language initially developed by Google. It was born with several design principles in mind: simplicity, safety, and speed. The Go language distribution comes with various tools for debugging, testing, profiling and code-vetting. Nowadays the Go language and its tool chain are available in the base repositories of most Linux distributions, making it easy to install them with a default package manager. @@ -93,4 +95,4 @@ via: http://ask.xmodulo.com/install-go-language-linux.html 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[1]:https://golang.org/dl/ \ No newline at end of file +[1]:https://golang.org/dl/ From 0ca06eac3d0b82062b8aa4d51c8dfddc8b356f8e Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Fri, 6 Feb 2015 21:00:05 +0800 Subject: [PATCH 187/207] Delete 20150112 Best GNOME Shell Themes For Ubuntu 14.04.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完毕，删除原文。 --- ...est GNOME Shell Themes For Ubuntu 14.04.md | 113 ------------------ 1 file changed, 113 deletions(-) delete mode 100644 sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md diff --git a/sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md b/sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md deleted file mode 100644 index 9d42415be9..0000000000 --- a/sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md +++ /dev/null @@ -1,113 +0,0 @@ -Translating by FSSlc - -Best GNOME Shell Themes For Ubuntu 14.04 -================================================================================ -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Best_Gnome_Shell_Themes.jpeg) - -Themes are the best way to customize your Linux desktop. If you [install GNOME on Ubuntu 14.04][1] or 14.10, you might want to change the default theme and give it a different look. To help you in this task, I have compiled here a **list of best GNOME shell themes for Ubuntu** or any other Linux OS that has GNOME shell installed on it. But before we see the list, let’s first see how to change install new themes in GNOME Shell. - -### Install themes in GNOME Shell ### - -To install new themes in GNOME with Ubuntu, you can use Gnome Tweak Tool which is available in software repository in Ubuntu. Open a terminal and use the following command: - - sudo apt-get install gnome-tweak-tool - -Alternatively, you can use themes by putting them in ~/.themes directory. I have written a detailed tutorial on [how to install and use themes in GNOME Shell][2], in case you need it. - -### Best GNOME Shell themes ### - -The themes listed here are tested on GNOME Shell 3.10.4 but it should work for all version of GNOME 3 and higher. For the sake of mentioning, the themes are not in any kind of priority order. Let’s have a look at the best GNOME themes: - -#### Numix #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/02/mockups_numix_5.jpeg) - -No list can be completed without the mention of [Numix themes][3]. These themes got so popular that it encouraged [Numix team to work on a new Linux OS, Ozon][4]. Considering their design work with Numix theme, it won’t be exaggeration to call it one of the [most beautiful Linux OS][5] releasing in near future. - -To install Numix theme in Ubuntu based distributions, use the following commands: - - sudo apt-add-repository ppa:numix/ppa - sudo apt-get update - sudo apt-get install numix-icon-theme-circle - -#### Elegance Colors #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Elegance_Colors_Theme_GNOME_Shell.jpeg) - -Another beautiful theme from Satyajit Sahoo, who is also a member of Numix team. [Elegance Colors][6] has its own PPA so that you can easily install it: - - sudo add-apt-repository ppa:satyajit-happy/themes - sudo apt-get update - sudo apt-get install gnome-shell-theme-elegance-colors - -#### Moka #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Moka_GNOME_Shell.jpeg) - -[Moka][7] is another mesmerizing theme that is always included in the list of beautiful themes. Designed by the same developer who gave us Unity Tweak Tool, Moka is a must try: - - sudo add-apt-repository ppa:moka/stable - sudo apt-get update - sudo apt-get install moka-gnome-shell-theme - -#### Viva #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Viva_GNOME_Theme.jpg) - -Based on Gnome’s default Adwaita theme, Viva is a nice theme with shades of black and oranges. You can download Viva from the link below. - -- [Download Viva GNOME Shell Theme][8] - -#### Ciliora-Prima #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Ciliora_Prima_Gnome_Shell.jpeg) - -Previously known as Zukitwo Dark, Ciliora-Prima has square icons theme. Theme is available in three versions that are slightly different from each other. You can download it from the link below. - -- [Download Ciliora-Prima GNOME Shell Theme][9] - -#### Faience #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Faience_GNOME_Shell_Theme.jpeg) - -Faience has been a popular theme for quite some time and rightly so. You can install Faience using the PPA below for GNOME 3.10 and higher. - - sudo add-apt-repository ppa:tiheum/equinox - sudo apt-get update - sudo apt-get install faience-theme - -#### Paper [Incomplete] #### - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Paper_GTK_Theme.jpeg) - -Ever since Google talked about Material Design, people have been going gaga over it. Paper GTK theme, by Sam Hewitt (of Moka Project), is inspired by Google Material design and currently under development. Which means you will not have the best experience with Paper at the moment. But if your a bit experimental, like me, you can definitely give it a try. - - sudo add-apt-repository ppa:snwh/pulp - sudo apt-get update - sudo apt-get install paper-gtk-theme - -That concludes my list. If you are trying to give a different look to your Ubuntu, you should also try the list of [best icon themes for Ubuntu 14.04][10]. - -How do you find this list of **best GNOME Shell themes**? Which one is your favorite among the one listed here? And if it’s not listed here, do let us know which theme you think is the best GNOME Shell theme. - --------------------------------------------------------------------------------- - -via: http://itsfoss.com/gnome-shell-themes-ubuntu-1404/ - -作者：[Abhishek][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://itsfoss.com/author/Abhishek/ -[1]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ -[2]:http://itsfoss.com/install-switch-themes-gnome-shell/ -[3]:https://numixproject.org/ -[4]:http://itsfoss.com/numix-linux-distribution/ -[5]:http://itsfoss.com/new-beautiful-linux-2015/ -[6]:http://satya164.deviantart.com/art/Gnome-Shell-Elegance-Colors-305966388 -[7]:http://mokaproject.com/ -[8]:https://github.com/vivaeltopo/gnome-shell-theme-viva -[9]:http://zagortenay333.deviantart.com/art/Ciliora-Prima-Shell-451947568 -[10]:http://itsfoss.com/best-icon-themes-ubuntu-1404/ From 2b46d43aa9157604cca1953430240a97bf42f332 Mon Sep 17 00:00:00 2001 From: geekpi Date: Fri, 6 Feb 2015 21:16:57 +0800 Subject: [PATCH 188/207] translated --- ...rs--How to install Go language on Linux.md | 98 ------------------- ...rs--How to install Go language on Linux.md | 96 ++++++++++++++++++ 2 files changed, 96 insertions(+), 98 deletions(-) delete mode 100644 sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md create mode 100644 translated/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md diff --git a/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md b/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md deleted file mode 100644 index 73b6f237b1..0000000000 --- a/sources/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md +++ /dev/null @@ -1,98 +0,0 @@ -translating----geekpi - -Linux FAQs with Answers--How to install Go language on Linux -================================================================================ -Go (also called "golang") is an open-source programming language initially developed by Google. It was born with several design principles in mind: simplicity, safety, and speed. The Go language distribution comes with various tools for debugging, testing, profiling and code-vetting. Nowadays the Go language and its tool chain are available in the base repositories of most Linux distributions, making it easy to install them with a default package manager. - -### Install Go Language on Ubuntu, Debian or Linux Mint ### - -The following **apt-get** command will install Go language and its development tools on Debian-based distributions. - - $ sudo apt-get install golang - -Check the version of Go language to verify installation. - - $ go version - ----------- - - go version go1.2.1 linux/amd64 - -Depending on your need, you may want to install additional Go tools using apt-get. - - $ sudo apt-cache search golang - -![](https://farm8.staticflickr.com/7430/15812762183_f094e3bf92_c.jpg) - -### Install Go Language on Fedora, CentOS/RHEL ### - -The following yum command will install Go language and its development tools on Red Hat based distributions. - - $ sudo yum install golang - -Check the version of Go language to verify installation. - - $ go version - ----------- - - go version go1.3.3 linux/amd64 - -Depending on your need, you can install additional Go tools using yum. - - $ yum search golang - -![](https://farm8.staticflickr.com/7373/16432817805_775010dc18_c.jpg) - -### Install Go Language from the Official Website ### - -Sometimes the version of Go language that comes with your Linux distribution may not be up-to-date. In that case, you can install the latest Go language from its official website. Here is how you can do it. - -Go to the [official source][1] of Go language, and download pre-built binaries. - -**For 64-bit Linux:** - - $ wget https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz - -**For 32-bit Linux:** - - $ wget https://storage.googleapis.com/golang/go1.4.1.linux-386.tar.gz - -**Install the binaries under /usr/local.** - - $ sudo tar -xzf go1.4.1.linux-xxx.tar.gz -C /usr/local - -Update the PATH environment variable system-wide by appending the following line in /etc/profile. - - $ sudo vi /etc/profile - ----------- - - export PATH=$PATH:/usr/local/go/bin - -If you installed Go in a custom location other than /usr/local, you also need to set GOROOT environment variable to point to the custom location. - - $ sudo vi /etc/profile - ----------- - - export GOROOT=/path/to/custom/location - -Check the version of Go language. - - $ go version - ----------- - - go version go1.4.1 linux/amd64 - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/install-go-language-linux.html - -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:https://golang.org/dl/ diff --git a/translated/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md b/translated/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md new file mode 100644 index 0000000000..d7dd2bb1c6 --- /dev/null +++ b/translated/tech/20150205 Linux FAQs with Answers--How to install Go language on Linux.md @@ -0,0 +1,96 @@ +如何在Linux中安装Go语言 +================================================================================ +Go (也叫 "golang")是一款由Google开发的编程语言。它的诞生有几个设计原则：简单、安全、速度。Go语言发行版拥有各种调试、测试、调优和代码审查工具。如今Go语言和它的工具链在大多数Linux发行版的基础仓库都有了，用默认的包管理器就可以安装。 + +### 在Ubuntu、Debian 或者 Linux Mint上安装Go语言 ### + +下面是在基于Debian的发行版上使用**apt-get**来安装Go语言和它的开发工具。 + + $ sudo apt-get install golang + +检查Go语言的版本来验证安装。 + + $ go version + +---------- + + go version go1.2.1 linux/amd64 + +按照你的需要，你或许想要使用apt-get安装额外的Go工具。 + + $ sudo apt-cache search golang + +![](https://farm8.staticflickr.com/7430/15812762183_f094e3bf92_c.jpg) + +### 在Fedora、CentOS/RHEL中安装Go语言 ### + +下面的命令会在基于Red Hat的发行版中安装Go语言和它的工具。 + + $ sudo yum install golang + +检查Go语言的版本来验证安装。 + + $ go version + +---------- + + go version go1.3.3 linux/amd64 + +按照你的需要，你或许想要使用yum安装额外的Go工具。 + + $ yum search golang + +![](https://farm8.staticflickr.com/7373/16432817805_775010dc18_c.jpg) + +### 从官网安装Go语言 ### + +有时发行版中的版本并不是最新的。为防这样，你可以从官网安装最新的Go语言。下面是步骤。 + +进入Go语言的[官方源码][1]，并下载预编译二进制代码。 + +**对于64位Linux:** + + $ wget https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz + +**对于32位Linux:** + + $ wget https://storage.googleapis.com/golang/go1.4.1.linux-386.tar.gz + +**在/usr/local下安装程序** + + $ sudo tar -xzf go1.4.1.linux-xxx.tar.gz -C /usr/local + +在/etc/profile中添加系统范围的PATH环境变量。 + + $ sudo vi /etc/profile + +---------- + + export PATH=$PATH:/usr/local/go/bin + +如果你在/usr/local之外安装了了Go，你同样需要设置GOROOT环境变量来指向自定义的安装位置。 + + $ sudo vi /etc/profile + +---------- + + export GOROOT=/path/to/custom/location + +检查Go语言的版本 + + $ go version + +---------- + + go version go1.4.1 linux/amd64 + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/install-go-language-linux.html + +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:https://golang.org/dl/ From 05a5d8658bc44bcd85ee8867e1168f7678b98996 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Fri, 6 Feb 2015 21:18:13 +0800 Subject: [PATCH 189/207] Create 20150112 Best GNOME Shell Themes For Ubuntu 14.04.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完毕，进行上传。 --- ...est GNOME Shell Themes For Ubuntu 14.04.md | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 translated/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md diff --git a/translated/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md b/translated/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md new file mode 100644 index 0000000000..339ef5f836 --- /dev/null +++ b/translated/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md @@ -0,0 +1,123 @@ +Ubuntu 14.04 上 最好的 GNOME Shell 主题 +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Best_Gnome_Shell_Themes.jpeg) + +自定义主题是自定义你的 Linux 桌面的最好方式。假如你在 [Ubuntu 14.04 中安装 GNOME][1] 或 在 Ubuntu 14.10 中安装了 GNOME，你或许想改变默认的主题以呈现出不同的外观。在这里，为帮助你完成该任务，我已经编制好了一个 **Ubuntu 或其他已经安装了 GNOME shell 的 Linux 操作系统中，最好的 GNOME Shell 主题** 的清单 。但在我们揭晓这份清单之前， 让我们先了解如何在 GNOME shell 中安装和应用新的主题。 + +### 在 GNOME Shell 中安装主题 ### + +要在带有 GNOME 桌面的 Ubuntu 中安装新的主题，你可以使用 Gnome Tweak Tool，它可以在 Ubuntu 软件库中得到。打开一个终端窗口并使用如下命令： + +``` +sudo apt-get install gnome-tweak-tool +``` + +或者，你可以使用新主题通过把它们放置到 `~/.themes` 目录中。如果你需要，我已经写了一个关于 [如何安装和使用 GNOME shell][2]的具体教程。 + +### 最好的 GNOME Shell 主题 ### + +下面列举的主题都已经在 GNOME Shell 3.10.4 上进行了测试，但对于任何版本的 GNOME 3 或更高的版本，它们应该同样适用。需要指出的是，这些主题并没有按照任何优先顺序排列。下面就让我们看看这些最好的 GNOME 主题： + +#### Numix #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/02/mockups_numix_5.jpeg) + +任何没有提到 [Numix 主题][3] 的清单都是不完整的。这个主题是如此地受欢迎以至于 [Numix 团队开发出一个新的 Linux 操作系统， Ozon][4]。考虑到他们的设计作品 Numix 主题，称在不久的将来发行的 `Ozon` 为 [最美丽的 Linux 操作系统][5] 也不为过。 + +使用下面的命令，在基于 Ubuntu 的发行版本中安装 Numix 主题： + +``` +sudo apt-add-repository ppa:numix/ppa +sudo apt-get update +sudo apt-get install numix-icon-theme-circle +``` + +#### Elegance Colors #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Elegance_Colors_Theme_GNOME_Shell.jpeg) + +另一个来自 Numix 团队的成员之一的 Satyajit Sahoo 的美丽主题 。[Elegance Colors][6] 拥有自己的 PPA (译者注： 即 Personal Package Archive 的缩写) 使得你可以轻易地安装它： + +``` +sudo add-apt-repository ppa:satyajit-happy/themes +sudo apt-get update +sudo apt-get install gnome-shell-theme-elegance-colors +``` + +#### Moka #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Moka_GNOME_Shell.jpeg) + +[Moka][7] 是另一个迷人的主题，它总是位于美丽的主题的清单之中。它是由给我们带来 Unity Tweak Tool 的开发者所设计。 Moka 是你绝对要尝试的主题之一: + +``` +sudo add-apt-repository ppa:moka/stable +sudo apt-get update +sudo apt-get install moka-gnome-shell-theme +``` + +#### Viva #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Viva_GNOME_Theme.jpg) + +基于 GNOME 的默认主题 Adwaita， Viva 是一个带有黑色和橙色阴影的美丽主题。你可以从下面的链接中下载 Viva： + +- [Download Viva GNOME Shell Theme][8] + +#### Ciliora-Prima #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Ciliora_Prima_Gnome_Shell.jpeg) + +以前它以 Zukitwo Dark 的名字为人们熟知， Ciliora-Prima 是一个拥有方块图标的主题，可得到的三种版本之间相互略有不同。你可以从下面的链接中下载它们： + +- [Download Ciliora-Prima GNOME Shell Theme][9] + +#### Faience #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Faience_GNOME_Shell_Theme.jpeg) + +Faience 作为一个受欢迎的主题已经有一段时间了。你可以通过下面的 PPA 为 GNOME 3.10 及更高版本 安装 Faience： + +``` +sudo add-apt-repository ppa:tiheum/equinox +sudo apt-get update +sudo apt-get install faience-theme +``` + +#### Paper [不完善] #### + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Paper_GTK_Theme.jpeg) + +自从 Google 提出 `Material Design`，人们一直为之疯狂。Paper GTK 主题受 Google Material design 启发， 作者为 Sam Hewitt( Moka 项目开发者之一)； 它正处于开发中，这意味着当前你将不能对 Paper 拥有最好的体验。假如你和我一样，具有一点实验精神，你绝对可以试一试。 + +``` +sudo add-apt-repository ppa:snwh/pulp +sudo apt-get update +sudo apt-get install paper-gtk-theme +``` + +以上就是我的清单。假如你正试着给你的 Ubuntu 换一个不同的模样，你也应该试试这个清单： [Ubuntu 14.04 中最好的图标主题][10]。 + +你是怎样找到这份 **最好的 GNOME shell 主题** 清单的呢？在上面列举的主题中，哪个是你最中意的呢？ 如果它没有在这里列出，请一定让我们知道那个你心目中最好的 GNOME shell 主题 。 + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/gnome-shell-themes-ubuntu-1404/ + +作者：[Abhishek][a] +译者：[FSSlc](https://github.com/FSSlc) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ +[2]:http://itsfoss.com/install-switch-themes-gnome-shell/ +[3]:https://numixproject.org/ +[4]:http://itsfoss.com/numix-linux-distribution/ +[5]:http://itsfoss.com/new-beautiful-linux-2015/ +[6]:http://satya164.deviantart.com/art/Gnome-Shell-Elegance-Colors-305966388 +[7]:http://mokaproject.com/ +[8]:https://github.com/vivaeltopo/gnome-shell-theme-viva +[9]:http://zagortenay333.deviantart.com/art/Ciliora-Prima-Shell-451947568 +[10]:http://itsfoss.com/best-icon-themes-ubuntu-1404/ From cd2806640ee46eb77f1d9b8f7638eb567459b8a6 Mon Sep 17 00:00:00 2001 From: Junkai <2q1w2007@163.com> Date: Sat, 7 Feb 2015 04:20:22 +0800 Subject: [PATCH 190/207] =?UTF-8?q?20150207=20=E9=80=89=E9=A2=98=202015020?= =?UTF-8?q?7=20BQ=20and=20Canonical=20Officially=20Launch=20Aquaris=20E4.5?= =?UTF-8?q?=20Ubuntu=20Edition,=20the=20First=20Ubuntu=20Phone.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Ubuntu Edition, the First Ubuntu Phone.md | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 sources/news/20150207 BQ and Canonical Officially Launch Aquaris E4.5 Ubuntu Edition, the First Ubuntu Phone.md diff --git a/sources/news/20150207 BQ and Canonical Officially Launch Aquaris E4.5 Ubuntu Edition, the First Ubuntu Phone.md b/sources/news/20150207 BQ and Canonical Officially Launch Aquaris E4.5 Ubuntu Edition, the First Ubuntu Phone.md new file mode 100644 index 0000000000..02b147abd9 --- /dev/null +++ b/sources/news/20150207 BQ and Canonical Officially Launch Aquaris E4.5 Ubuntu Edition, the First Ubuntu Phone.md @@ -0,0 +1,45 @@ +BQ and Canonical Officially Launch Aquaris E4.5 Ubuntu Edition, the First Ubuntu Phone +------ +*Everything you need to know about Aquaris E4.5* + +##BQ and Canonical have officially announced the new Aquaris E4.5 Ubuntu Edition and the fact that the phone will be available in the coming weeks through a series of flash sales. + +Information about the imminent launch of BQ Ubuntu phone has been around for some time and now it the two companies seem to have decided to make it official. This is the first device powered by Ubuntu Touch and a lot of people will be paying very close attention to what is happening in the mobile world. + +Ubuntu Touch is the latest operating system from Canonical and it's a brand new experience that aims to be very different from what users can find right now on the market, and that includes systems like Jola or Firefox OS. The OS has been in the works for more than two years and it's a system designed to work on all kind of devices, across the hardware spectrum. + +##Who is BQ and why has Canonical chosen them? + +When Mark Shuttleworth announced the two partners for the launch of Ubuntu Touch, BQ and Meizu, most of the people watching asked the same question. Who? BQ is not a very big company, but it's a young company and it has already started to penetrate the European market with some interesting devices. In many ways, they are doing the same thing companies like Meizu or Xiaomi are trying and succeeded in China: to offer devices that are interesting and different from what everyone else is doing. + +Many Ubuntu fans have questioned Canonical’s decision of choosing small companies and not big ones, but they are trying to do the same thing as the just-mentioned hardware makers. They want to offer an operating system radically different from what everyone else is doing. It's easy to understand why the goals of Canonical and BQ are actually one and the same. + +##What is Ubuntu Touch? + +The new operating system developed by Canonical embraces the fact that people are now swiping a lot more than they are tapping. Smartphones are no longer something new and everyone can understand how to swipe and get things done on a phone. Ubuntu devs have taken this to a whole new level. The operating system has no buttons, with the exception of the regular power and volume buttons. Everything is done with swiped gestures, from all sides of the screen. + +Also, Ubuntu Touch brings a new concept to the market, that of scopes. There is no longer a home screen, just scopes defined by the user to expand the experience. For example, you can have a Music scope that aggregates all your music sources on a single screen. It's a different way of looking at your smartphone, but this is built for people who crave a new experience. Don't worry, regular apps still exist, but they are differently integrated. + +![Aquaris E4.5 Ubuntu Edition start screen](http://i1-news.softpedia-static.com/images/news2/BQ-and-Canonical-Officially-Launch-Aquaris-E4-5-Ubuntu-Edition-472397-5.jpg) + +"As any kind of content can be presented via Scopes - they provide developers an easy path for their creations to be integral to the device experience. It is simple to create new Scopes via an easy to use UI toolkit with much lower development and maintenance costs than traditional apps. Canonical and BQ have worked with a host of partners to ensure that there is a wealth of interesting, relevant and dynamic content available at launch, with more content partners to follow," said Cristian Parrino, VP Mobile at Canonical. + +##BQ’s Aquaris E4.5 Ubuntu Edition hardware specs + +First of all, it's important to know that Aquaris E4.5 Ubuntu Edition is a dual-sim phone and it comes unlocked so that everyone can use it with their network. It boasts a MediaTek Quad-Core Cortex A7 processor running at up to 1.3 GHz, a 4.5-inch screen, 1GB RAM, rear camera with high-quality BSI sensors, Largan lens, and autofocus with dual flash(8MP), and front camera with 5MP. + +It's also worth mentioning that several operators in Europe, including 3 Sweden, amena.com, giffgaff, and Portugal Telecom have decided to provide SIM bundles at purchase. The price is €169.90 ($191). + +So, are you ready to buy the Aquaris E4.5 Ubuntu Edition? + +-------------------------------------------------------------------------------- + +via: http://news.softpedia.com/news/BQ-and-Canonical-Officially-Launch-Aquaris-E4-5-Ubuntu-Edition-472397.shtml + +作者：[Silviu Stahie][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://news.softpedia.com/editors/browse/silviu-stahie \ No newline at end of file From 555e73ad9411a845a84a046857cf229b351706a4 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Sat, 7 Feb 2015 08:36:38 +0800 Subject: [PATCH 191/207] Update 20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 准备翻译该篇。 --- ... To Use Emoji Anywhere With Twitter's Open Source Library.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md b/sources/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md index e043210cf6..e1f0fd719f 100644 --- a/sources/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md +++ b/sources/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md @@ -1,3 +1,5 @@ +Translating by FSSlc + How To Use Emoji Anywhere With Twitter's Open Source Library ================================================================================ > Embed them in webpages and other projects via GitHub. From e3a83ffa29d7e03820c74750693a7657f26d0a4e Mon Sep 17 00:00:00 2001 From: geekpi Date: Sat, 7 Feb 2015 10:41:49 +0800 Subject: [PATCH 192/207] translating --- .../20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md b/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md index cd1a5eb525..1bdf762e99 100644 --- a/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md +++ b/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md @@ -1,3 +1,5 @@ +Translating----geekpi + How To Install KDE Plasma 5.2 In Ubuntu 14.10 ================================================================================ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Plasma_Ubuntu_1410.jpg) @@ -57,4 +59,4 @@ via: http://itsfoss.com/install-kde-plasma-ubuntu-1410/ [4]:http://itsfoss.com/install-mate-desktop-ubuntu-14-04/ [5]:http://itsfoss.com/install-cinnamon-24-ubuntu-1404/ [6]:http://itsfoss.com/install-budgie-desktop-ubuntu-1404/ -[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ \ No newline at end of file +[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ From d1d3ca7c3f4466f4f90e6240820660542c6baf49 Mon Sep 17 00:00:00 2001 From: geekpi Date: Sat, 7 Feb 2015 11:02:16 +0800 Subject: [PATCH 193/207] translated --- ... Install KDE Plasma 5.2 In Ubuntu 14.10.md | 62 ------------------- ... Install KDE Plasma 5.2 In Ubuntu 14.10.md | 61 ++++++++++++++++++ 2 files changed, 61 insertions(+), 62 deletions(-) delete mode 100644 sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md create mode 100644 translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md diff --git a/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md b/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md deleted file mode 100644 index 1bdf762e99..0000000000 --- a/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md +++ /dev/null @@ -1,62 +0,0 @@ -Translating----geekpi - -How To Install KDE Plasma 5.2 In Ubuntu 14.10 -================================================================================ -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Plasma_Ubuntu_1410.jpg) - -[KDE][1] Plasma 5.2 has been [released][2] and in this post we shall see how to install KDE Plasma 5.2 in Ubuntu 14.10. - -Ubuntu’s default desktop environment Unity is beautiful and packs quite some feature. But if you ask any experienced Linux user about desktop customization, his answer will be KDE. KDE is boss when it comes to customization and its popularity can be guessed that Ubuntu has an official KDE flavor, known as [Kubuntu][3]. - -A good thing about Ubuntu (or any other Linux OS for that matter) is that it doesn’t bind you with one particular desktop environment. You can always install additional desktop environments and choose to switch between them while keeping several desktop environments at the same time. Earlier, we have seen the installation of following desktop environments: - -- [How to install Mate desktop in Ubuntu 14.04][4] -- [How to install Cinnamon in Ubuntu 14.04][5] -- [How to install Budgie desktop in Ubuntu 14.04][6] -- [How to install GNOME Shell in Ubuntu 14.04][7] - -And today we shall see how to install KDE Plasma in Ubuntu 14.10. - -### Install KDE Plasma 5.2 in Ubuntu 14.04 ### - -Before you go on installing Plasma on Ubuntu 14.10, you should know that it will download around one GB of data. So consider your network speed and data package (if any) before opting for KDE installation. The PPA we are going to use for installing Plasma is the official PPA provided by the KDE community. Use the commands below in terminal: - - sudo apt-add-repository ppa:kubuntu-ppa/next-backports - sudo apt-get update - sudo apt-get dist-upgrade - sudo apt-get install kubuntu-plasma5-desktop plasma-workspace-wallpapers - -During the installation, it will as you to choose the default display manager. I chose the default LightDM. Once installed, restart the system. At the login, click on the Ubuntu symbol beside the login field. In here, select Plasma. - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Select_Plasma_KDE_Ubuntu.jpeg) - -You’ll be logged in to KDE Plasma now. Here is a quick screenshot of how KDE Plasma 5.2 looks like in Ubuntu 14.10: - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/KDE_Plasma_Desktop.jpeg) - -### Remove KDE Plasma from Ubuntu ### - -If you want to revert the changes, use the following commands to get rid of KDE Plasma from Ubuntu 14.10. - - sudo apt-get install ppa-purge - sudo apt-get remove kubuntu-plasma5-desktop - sudo ppa-purge ppa:kubuntu-ppa/next - --------------------------------------------------------------------------------- - -via: http://itsfoss.com/install-kde-plasma-ubuntu-1410/ - -作者：[Abhishek][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://itsfoss.com/author/Abhishek/ -[1]:https://www.kde.org/ -[2]:https://dot.kde.org/2015/01/27/plasma-52-beautiful-and-featureful -[3]:http://www.kubuntu.org/ -[4]:http://itsfoss.com/install-mate-desktop-ubuntu-14-04/ -[5]:http://itsfoss.com/install-cinnamon-24-ubuntu-1404/ -[6]:http://itsfoss.com/install-budgie-desktop-ubuntu-1404/ -[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ diff --git a/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md b/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md new file mode 100644 index 0000000000..0e6a83f60f --- /dev/null +++ b/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md @@ -0,0 +1,61 @@ +如何在Ubuntu 14.10 上安装KDE Plasma 5.2 +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Plasma_Ubuntu_1410.jpg) + +[KDE][1] Plasma 5.2已经[发布][2]，在本篇中我们将看到如何在Ubuntu 14.10 上安装KDE Plasma 5.2。 + +Ubuntu的默认桌面环境Unity很漂亮还有很多特性。但是如果你问任何有经验的Linux用户关于桌面自定义，他的回答将是KDE。KDE在定制上是王者并且它得到流行大概是由于Ubuntu有官方的KDE版本，也就是Kubuntu[3]。 + +对于Ubuntu（或者任何其他的Linux系统而言）的一个好消息是它没有绑定任何特定的桌面环境。你可以安装额外的桌面环境并且可以在不同的桌面环境间切换。早先我们已经了解了桌面环境的安装。 + +- [如何在Ubuntu 14.04中安装Mate桌面][4] +- [如何在Ubuntu 14.04中安装Cinnamon桌面][5] +- [如何在Ubuntu 14.04中安装Budgie桌面][6] +- [如何在Ubuntu 14.04中安装Gnome Shell][7] + +今天我们要展示如何在Ubuntu 14.10 中如何安装KDE Plasma。 + +### 如何在Ubuntu 14.10 上安装KDE Plasma 5.2 ### + +在Ubuntu 14.10上安装Plasma之前，你要知道这会下载大概1GB的内容。因此在安装KDE之前要考虑速度和数据包。我们下载所使用的PPA是KDEs社区官方提供的。在终端中使用下面的命令： + + sudo apt-add-repository ppa:kubuntu-ppa/next-backports + sudo apt-get update + sudo apt-get dist-upgrade + sudo apt-get install kubuntu-plasma5-desktop plasma-workspace-wallpapers + +During the installation, it will as you to choose the default display manager. I chose the default LightDM. Once installed, restart the system. At the login, click on the Ubuntu symbol beside the login field. In here, select Plasma. +在安装中，我们要选择默认的显示管理器。我选择的是默认的LightDM。安装完成后，重启系统。在登录时，点击登录区域旁边的Ubuntu图标。这里选择Plasma。 + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Select_Plasma_KDE_Ubuntu.jpeg) + +你现在就登录到KDE Plasma了。这里有一个KDE Plasma 5.2在Ubuntu 14.10下的截图 + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/KDE_Plasma_Desktop.jpeg) + +### 从Ubuntu卸载KDE Plasma ### + +如果你想要还原更改，使用下面的命令从Ubuntu 14.10中卸载KDE Plasma。 + + sudo apt-get install ppa-purge + sudo apt-get remove kubuntu-plasma5-desktop + sudo ppa-purge ppa:kubuntu-ppa/next + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/install-kde-plasma-ubuntu-1410/ + +作者：[Abhishek][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:https://www.kde.org/ +[2]:https://dot.kde.org/2015/01/27/plasma-52-beautiful-and-featureful +[3]:http://www.kubuntu.org/ +[4]:http://itsfoss.com/install-mate-desktop-ubuntu-14-04/ +[5]:http://itsfoss.com/install-cinnamon-24-ubuntu-1404/ +[6]:http://itsfoss.com/install-budgie-desktop-ubuntu-1404/ +[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ From 90354bfc053bfb8d3f0b55372a1fb587b2971c26 Mon Sep 17 00:00:00 2001 From: zheng Date: Sat, 7 Feb 2015 11:04:15 +0800 Subject: [PATCH 194/207] Revert "translated" This reverts commit d1d3ca7c3f4466f4f90e6240820660542c6baf49. --- ... Install KDE Plasma 5.2 In Ubuntu 14.10.md | 62 +++++++++++++++++++ ... Install KDE Plasma 5.2 In Ubuntu 14.10.md | 61 ------------------ 2 files changed, 62 insertions(+), 61 deletions(-) create mode 100644 sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md delete mode 100644 translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md diff --git a/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md b/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md new file mode 100644 index 0000000000..1bdf762e99 --- /dev/null +++ b/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md @@ -0,0 +1,62 @@ +Translating----geekpi + +How To Install KDE Plasma 5.2 In Ubuntu 14.10 +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Plasma_Ubuntu_1410.jpg) + +[KDE][1] Plasma 5.2 has been [released][2] and in this post we shall see how to install KDE Plasma 5.2 in Ubuntu 14.10. + +Ubuntu’s default desktop environment Unity is beautiful and packs quite some feature. But if you ask any experienced Linux user about desktop customization, his answer will be KDE. KDE is boss when it comes to customization and its popularity can be guessed that Ubuntu has an official KDE flavor, known as [Kubuntu][3]. + +A good thing about Ubuntu (or any other Linux OS for that matter) is that it doesn’t bind you with one particular desktop environment. You can always install additional desktop environments and choose to switch between them while keeping several desktop environments at the same time. Earlier, we have seen the installation of following desktop environments: + +- [How to install Mate desktop in Ubuntu 14.04][4] +- [How to install Cinnamon in Ubuntu 14.04][5] +- [How to install Budgie desktop in Ubuntu 14.04][6] +- [How to install GNOME Shell in Ubuntu 14.04][7] + +And today we shall see how to install KDE Plasma in Ubuntu 14.10. + +### Install KDE Plasma 5.2 in Ubuntu 14.04 ### + +Before you go on installing Plasma on Ubuntu 14.10, you should know that it will download around one GB of data. So consider your network speed and data package (if any) before opting for KDE installation. The PPA we are going to use for installing Plasma is the official PPA provided by the KDE community. Use the commands below in terminal: + + sudo apt-add-repository ppa:kubuntu-ppa/next-backports + sudo apt-get update + sudo apt-get dist-upgrade + sudo apt-get install kubuntu-plasma5-desktop plasma-workspace-wallpapers + +During the installation, it will as you to choose the default display manager. I chose the default LightDM. Once installed, restart the system. At the login, click on the Ubuntu symbol beside the login field. In here, select Plasma. + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Select_Plasma_KDE_Ubuntu.jpeg) + +You’ll be logged in to KDE Plasma now. Here is a quick screenshot of how KDE Plasma 5.2 looks like in Ubuntu 14.10: + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/KDE_Plasma_Desktop.jpeg) + +### Remove KDE Plasma from Ubuntu ### + +If you want to revert the changes, use the following commands to get rid of KDE Plasma from Ubuntu 14.10. + + sudo apt-get install ppa-purge + sudo apt-get remove kubuntu-plasma5-desktop + sudo ppa-purge ppa:kubuntu-ppa/next + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/install-kde-plasma-ubuntu-1410/ + +作者：[Abhishek][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:https://www.kde.org/ +[2]:https://dot.kde.org/2015/01/27/plasma-52-beautiful-and-featureful +[3]:http://www.kubuntu.org/ +[4]:http://itsfoss.com/install-mate-desktop-ubuntu-14-04/ +[5]:http://itsfoss.com/install-cinnamon-24-ubuntu-1404/ +[6]:http://itsfoss.com/install-budgie-desktop-ubuntu-1404/ +[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ diff --git a/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md b/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md deleted file mode 100644 index 0e6a83f60f..0000000000 --- a/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md +++ /dev/null @@ -1,61 +0,0 @@ -如何在Ubuntu 14.10 上安装KDE Plasma 5.2 -================================================================================ -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Plasma_Ubuntu_1410.jpg) - -[KDE][1] Plasma 5.2已经[发布][2]，在本篇中我们将看到如何在Ubuntu 14.10 上安装KDE Plasma 5.2。 - -Ubuntu的默认桌面环境Unity很漂亮还有很多特性。但是如果你问任何有经验的Linux用户关于桌面自定义，他的回答将是KDE。KDE在定制上是王者并且它得到流行大概是由于Ubuntu有官方的KDE版本，也就是Kubuntu[3]。 - -对于Ubuntu（或者任何其他的Linux系统而言）的一个好消息是它没有绑定任何特定的桌面环境。你可以安装额外的桌面环境并且可以在不同的桌面环境间切换。早先我们已经了解了桌面环境的安装。 - -- [如何在Ubuntu 14.04中安装Mate桌面][4] -- [如何在Ubuntu 14.04中安装Cinnamon桌面][5] -- [如何在Ubuntu 14.04中安装Budgie桌面][6] -- [如何在Ubuntu 14.04中安装Gnome Shell][7] - -今天我们要展示如何在Ubuntu 14.10 中如何安装KDE Plasma。 - -### 如何在Ubuntu 14.10 上安装KDE Plasma 5.2 ### - -在Ubuntu 14.10上安装Plasma之前，你要知道这会下载大概1GB的内容。因此在安装KDE之前要考虑速度和数据包。我们下载所使用的PPA是KDEs社区官方提供的。在终端中使用下面的命令： - - sudo apt-add-repository ppa:kubuntu-ppa/next-backports - sudo apt-get update - sudo apt-get dist-upgrade - sudo apt-get install kubuntu-plasma5-desktop plasma-workspace-wallpapers - -During the installation, it will as you to choose the default display manager. I chose the default LightDM. Once installed, restart the system. At the login, click on the Ubuntu symbol beside the login field. In here, select Plasma. -在安装中，我们要选择默认的显示管理器。我选择的是默认的LightDM。安装完成后，重启系统。在登录时，点击登录区域旁边的Ubuntu图标。这里选择Plasma。 - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Select_Plasma_KDE_Ubuntu.jpeg) - -你现在就登录到KDE Plasma了。这里有一个KDE Plasma 5.2在Ubuntu 14.10下的截图 - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/KDE_Plasma_Desktop.jpeg) - -### 从Ubuntu卸载KDE Plasma ### - -如果你想要还原更改，使用下面的命令从Ubuntu 14.10中卸载KDE Plasma。 - - sudo apt-get install ppa-purge - sudo apt-get remove kubuntu-plasma5-desktop - sudo ppa-purge ppa:kubuntu-ppa/next - --------------------------------------------------------------------------------- - -via: http://itsfoss.com/install-kde-plasma-ubuntu-1410/ - -作者：[Abhishek][a] -译者：[geekpi](https://github.com/geekpi) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://itsfoss.com/author/Abhishek/ -[1]:https://www.kde.org/ -[2]:https://dot.kde.org/2015/01/27/plasma-52-beautiful-and-featureful -[3]:http://www.kubuntu.org/ -[4]:http://itsfoss.com/install-mate-desktop-ubuntu-14-04/ -[5]:http://itsfoss.com/install-cinnamon-24-ubuntu-1404/ -[6]:http://itsfoss.com/install-budgie-desktop-ubuntu-1404/ -[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ From c0e5c3bf5db418e961dd46b738067fc8e36dfa04 Mon Sep 17 00:00:00 2001 From: geekpi Date: Sat, 7 Feb 2015 11:08:37 +0800 Subject: [PATCH 195/207] translated --- ... Install KDE Plasma 5.2 In Ubuntu 14.10.md | 62 ------------------- ... Install KDE Plasma 5.2 In Ubuntu 14.10.md | 61 ++++++++++++++++++ 2 files changed, 61 insertions(+), 62 deletions(-) delete mode 100644 sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md create mode 100644 translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md diff --git a/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md b/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md deleted file mode 100644 index 1bdf762e99..0000000000 --- a/sources/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md +++ /dev/null @@ -1,62 +0,0 @@ -Translating----geekpi - -How To Install KDE Plasma 5.2 In Ubuntu 14.10 -================================================================================ -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Plasma_Ubuntu_1410.jpg) - -[KDE][1] Plasma 5.2 has been [released][2] and in this post we shall see how to install KDE Plasma 5.2 in Ubuntu 14.10. - -Ubuntu’s default desktop environment Unity is beautiful and packs quite some feature. But if you ask any experienced Linux user about desktop customization, his answer will be KDE. KDE is boss when it comes to customization and its popularity can be guessed that Ubuntu has an official KDE flavor, known as [Kubuntu][3]. - -A good thing about Ubuntu (or any other Linux OS for that matter) is that it doesn’t bind you with one particular desktop environment. You can always install additional desktop environments and choose to switch between them while keeping several desktop environments at the same time. Earlier, we have seen the installation of following desktop environments: - -- [How to install Mate desktop in Ubuntu 14.04][4] -- [How to install Cinnamon in Ubuntu 14.04][5] -- [How to install Budgie desktop in Ubuntu 14.04][6] -- [How to install GNOME Shell in Ubuntu 14.04][7] - -And today we shall see how to install KDE Plasma in Ubuntu 14.10. - -### Install KDE Plasma 5.2 in Ubuntu 14.04 ### - -Before you go on installing Plasma on Ubuntu 14.10, you should know that it will download around one GB of data. So consider your network speed and data package (if any) before opting for KDE installation. The PPA we are going to use for installing Plasma is the official PPA provided by the KDE community. Use the commands below in terminal: - - sudo apt-add-repository ppa:kubuntu-ppa/next-backports - sudo apt-get update - sudo apt-get dist-upgrade - sudo apt-get install kubuntu-plasma5-desktop plasma-workspace-wallpapers - -During the installation, it will as you to choose the default display manager. I chose the default LightDM. Once installed, restart the system. At the login, click on the Ubuntu symbol beside the login field. In here, select Plasma. - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Select_Plasma_KDE_Ubuntu.jpeg) - -You’ll be logged in to KDE Plasma now. Here is a quick screenshot of how KDE Plasma 5.2 looks like in Ubuntu 14.10: - -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/KDE_Plasma_Desktop.jpeg) - -### Remove KDE Plasma from Ubuntu ### - -If you want to revert the changes, use the following commands to get rid of KDE Plasma from Ubuntu 14.10. - - sudo apt-get install ppa-purge - sudo apt-get remove kubuntu-plasma5-desktop - sudo ppa-purge ppa:kubuntu-ppa/next - --------------------------------------------------------------------------------- - -via: http://itsfoss.com/install-kde-plasma-ubuntu-1410/ - -作者：[Abhishek][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://itsfoss.com/author/Abhishek/ -[1]:https://www.kde.org/ -[2]:https://dot.kde.org/2015/01/27/plasma-52-beautiful-and-featureful -[3]:http://www.kubuntu.org/ -[4]:http://itsfoss.com/install-mate-desktop-ubuntu-14-04/ -[5]:http://itsfoss.com/install-cinnamon-24-ubuntu-1404/ -[6]:http://itsfoss.com/install-budgie-desktop-ubuntu-1404/ -[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ diff --git a/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md b/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md new file mode 100644 index 0000000000..0e6a83f60f --- /dev/null +++ b/translated/tech/20150203 How To Install KDE Plasma 5.2 In Ubuntu 14.10.md @@ -0,0 +1,61 @@ +如何在Ubuntu 14.10 上安装KDE Plasma 5.2 +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Plasma_Ubuntu_1410.jpg) + +[KDE][1] Plasma 5.2已经[发布][2]，在本篇中我们将看到如何在Ubuntu 14.10 上安装KDE Plasma 5.2。 + +Ubuntu的默认桌面环境Unity很漂亮还有很多特性。但是如果你问任何有经验的Linux用户关于桌面自定义，他的回答将是KDE。KDE在定制上是王者并且它得到流行大概是由于Ubuntu有官方的KDE版本，也就是Kubuntu[3]。 + +对于Ubuntu（或者任何其他的Linux系统而言）的一个好消息是它没有绑定任何特定的桌面环境。你可以安装额外的桌面环境并且可以在不同的桌面环境间切换。早先我们已经了解了桌面环境的安装。 + +- [如何在Ubuntu 14.04中安装Mate桌面][4] +- [如何在Ubuntu 14.04中安装Cinnamon桌面][5] +- [如何在Ubuntu 14.04中安装Budgie桌面][6] +- [如何在Ubuntu 14.04中安装Gnome Shell][7] + +今天我们要展示如何在Ubuntu 14.10 中如何安装KDE Plasma。 + +### 如何在Ubuntu 14.10 上安装KDE Plasma 5.2 ### + +在Ubuntu 14.10上安装Plasma之前，你要知道这会下载大概1GB的内容。因此在安装KDE之前要考虑速度和数据包。我们下载所使用的PPA是KDEs社区官方提供的。在终端中使用下面的命令： + + sudo apt-add-repository ppa:kubuntu-ppa/next-backports + sudo apt-get update + sudo apt-get dist-upgrade + sudo apt-get install kubuntu-plasma5-desktop plasma-workspace-wallpapers + +During the installation, it will as you to choose the default display manager. I chose the default LightDM. Once installed, restart the system. At the login, click on the Ubuntu symbol beside the login field. In here, select Plasma. +在安装中，我们要选择默认的显示管理器。我选择的是默认的LightDM。安装完成后，重启系统。在登录时，点击登录区域旁边的Ubuntu图标。这里选择Plasma。 + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Select_Plasma_KDE_Ubuntu.jpeg) + +你现在就登录到KDE Plasma了。这里有一个KDE Plasma 5.2在Ubuntu 14.10下的截图 + +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/KDE_Plasma_Desktop.jpeg) + +### 从Ubuntu卸载KDE Plasma ### + +如果你想要还原更改，使用下面的命令从Ubuntu 14.10中卸载KDE Plasma。 + + sudo apt-get install ppa-purge + sudo apt-get remove kubuntu-plasma5-desktop + sudo ppa-purge ppa:kubuntu-ppa/next + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/install-kde-plasma-ubuntu-1410/ + +作者：[Abhishek][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://itsfoss.com/author/Abhishek/ +[1]:https://www.kde.org/ +[2]:https://dot.kde.org/2015/01/27/plasma-52-beautiful-and-featureful +[3]:http://www.kubuntu.org/ +[4]:http://itsfoss.com/install-mate-desktop-ubuntu-14-04/ +[5]:http://itsfoss.com/install-cinnamon-24-ubuntu-1404/ +[6]:http://itsfoss.com/install-budgie-desktop-ubuntu-1404/ +[7]:http://itsfoss.com/how-to-install-gnome-in-ubuntu-14-04/ From e1022991da9dc0d85ee9138f70f0492c125d9096 Mon Sep 17 00:00:00 2001 From: KayGuoWhu Date: Sat, 7 Feb 2015 12:48:38 +0800 Subject: [PATCH 196/207] translating --- ...ow are C data types “supported directly by most computers”.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/talk/20150122 How are C data types “supported directly by most computers”.md b/sources/talk/20150122 How are C data types “supported directly by most computers”.md index 0b57189252..15dfed9c0a 100644 --- a/sources/talk/20150122 How are C data types “supported directly by most computers”.md +++ b/sources/talk/20150122 How are C data types “supported directly by most computers”.md @@ -1,3 +1,4 @@ +translating by KayGuoWhu How are C data types “supported directly by most computers”? --------- From 55277d746c50fdea4245328c6ceb86e2f7081a65 Mon Sep 17 00:00:00 2001 From: KayGuoWhu Date: Sat, 7 Feb 2015 13:57:47 +0800 Subject: [PATCH 197/207] translated --- ... “supported directly by most computers”.md | 54 ------------------- ... “supported directly by most computers”.md | 53 ++++++++++++++++++ 2 files changed, 53 insertions(+), 54 deletions(-) delete mode 100644 sources/talk/20150122 How are C data types “supported directly by most computers”.md create mode 100644 translated/talk/20150122 How are C data types “supported directly by most computers”.md diff --git a/sources/talk/20150122 How are C data types “supported directly by most computers”.md b/sources/talk/20150122 How are C data types “supported directly by most computers”.md deleted file mode 100644 index 15dfed9c0a..0000000000 --- a/sources/talk/20150122 How are C data types “supported directly by most computers”.md +++ /dev/null @@ -1,54 +0,0 @@ -translating by KayGuoWhu -How are C data types “supported directly by most computers”? ---------- - -#Q: - -I am reading K&R's *The C Programming Language*” and came across this statement [Introduction, p. 3]: - ->Because the data types and control structures provided by C are supported directly by most computers, the run-time library required to implement self-contained programs is tiny. - -What does the bolded statement mean? Is there an example of a data type or a control structure that isn't supported directly by a computer? - -#A: - -Yes, there are data types not directly supported. - -On many embedded systems, there is no hardware floating point unit. So, when you write code like this: - -```C -float x = 1.0f, y = 2.0f; -return x + y; -``` - -It gets translated into something like this: - -```C -unsigned x = 0x3f800000, y = 0x40000000; -return _float_add(x, y); -``` - -Then the compiler or standard library has to supply an implementation of `_float_add()`, which takes up memory on your embedded system. If you're counting bytes on a really tiny system, this can add up. - -Another common example is 64-bit integers (`long long` in the C standard since 1999), which are not directly supported by 32-bit systems. Old SPARC systems didn't support integer multiplication, so multiplication had to be supplied by the runtime. There are other examples. - -##Other languages - -By comparison, other languages have more complicated primitives. - -For example, a Lisp symbol requires a lot of runtime support, just like tables in Lua, strings in Python, arrays in Fortran, et cetera. The equivalent types in C are usually either not part of the standard library at all (no standard symbols or tables) or they are much simpler and don't require much runtime support (arrays in C are basically just pointers, nul-terminated strings are almost as simple). - -##Control structures - -A notable control structure missing from C is exception handling. Nonlocal exit is limited to `setjmp()` and `longjmp()`, which just save and restore certain parts of processor state. By comparison, the C++ runtime has to walk the stack and call destructors and exception handlers. - ----- -via:[stackoverflow](http://stackoverflow.com/questions/27977522/how-are-c-data-types-supported-directly-by-most-computers/27977605#27977605) - -作者：[Dietrich Epp][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://stackoverflow.com/users/82294/dietrich-epp \ No newline at end of file diff --git a/translated/talk/20150122 How are C data types “supported directly by most computers”.md b/translated/talk/20150122 How are C data types “supported directly by most computers”.md new file mode 100644 index 0000000000..d204928ad6 --- /dev/null +++ b/translated/talk/20150122 How are C data types “supported directly by most computers”.md @@ -0,0 +1,53 @@ +C语言数据类型是如何被大多数计算机系统所支持？ +--------- + +#问题： + +在读K&R版的*The C Programming Language*一书时，我在[介绍,第3页]看到这样一条说明： + +>因为C语言提供的数据类型和控制结构可以直接被大部分计算机系统所支持，所以在实现自包含程序时所需要的运行库文件一般很小。 + +这段黑体说明了什么？能找到一个例子来说明C语言中的某种数据类型或控制结构并不能被一种计算机系统所支持呢？ + +#回答: + +事实上，C语言中确实有不被直接支持的数据类型。 + +在许多嵌入式系统中，硬件上并没有浮点运算单元。因此，如果你写出下面的代码： + +```C +float x = 1.0f, y = 2.0f; +return x + y; +``` + +可能会被转化成下面这种形式： + +```C +unsigned x = 0x3f800000, y = 0x40000000; +return _float_add(x, y); +``` + +然后编译器或标准库必须提供'_float_add()'的具体实现，这会占用嵌入式系统的内存空间。依此去计算代码在某个微型系统（译者注：也就是指微型嵌入式系统）的实际字节数，也会发现有所增加。 + +另一个常见的例子是64位整型数（C语言标准中'long long'类型是1999年之后才出现的），这种类型在32位系统上也不能直接使用。古董级的SPARC系统则不支持整型乘法，所以在运行时必须提供乘法的实现。当然，还有一些其它例子。 + +##其它语言 + +相比起来，其它编程语言有更加复杂的基本类型。 + +比如，Lisp中的symbol需要大量的运行时实现支持，就像Lua中的tables、Python中的strings、Fortran中的arrays，等等。在C语言中等价的类型通常要么不属于标准库（C语言没有标准symbols或tables），要么更加简单，而且并不需要那么多的运行时支持（C语言中的array基本上就是指针，以NULL结尾的字符串实现起来也很简单）。 + +##控制结构 + +异常处理是C语言中没有的一种控制结构。非局部的退出只有'setjmp()'和'longjmp()'两种，只能提供保存和恢复某些部分的处理器状态。相比之下，C++运行时环境必须先遍历函数调用栈，然后调用析构函数和异常处理函数。 + +---- +via:[stackoverflow](http://stackoverflow.com/questions/27977522/how-are-c-data-types-supported-directly-by-most-computers/27977605#27977605) + +作者：[Dietrich Epp][a] +译者：[KayGuoWhu](https://github.com/KayGuoWhu) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://stackoverflow.com/users/82294/dietrich-epp \ No newline at end of file From 1dc146e59438a670e20354e5a830c8050e352a0d Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Sat, 7 Feb 2015 20:35:43 +0800 Subject: [PATCH 198/207] Delete 20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完毕，删除源文件。 --- ...here With Twitter's Open Source Library.md | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 sources/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md diff --git a/sources/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md b/sources/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md deleted file mode 100644 index e1f0fd719f..0000000000 --- a/sources/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md +++ /dev/null @@ -1,93 +0,0 @@ -Translating by FSSlc - -How To Use Emoji Anywhere With Twitter's Open Source Library -================================================================================ -> Embed them in webpages and other projects via GitHub. - -![](http://a3.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2OTIyNTI3MjcxNTU1.png) - -Emoji, tiny characters from Japan that convey emotions through images, have already conquered the world of cellphone text messaging. - -Now, you can post them everywhere else in the virtual world, too. Twitter has just [open-sourced][1] its emoji library so you can use them for your own websites, apps, and projects. - -This will require a little bit of heavy lifting. Unicode has recognized and even standardized the emoji alphabet, but emoji still [aren’t fully compliant with all Web browsers][2], meaning they'll show up as “tofu,” or blank boxes, most of the time. When Twitter wanted to make emoji available, the social network teamed up with a company called [Icon Factory][3] to render browser imitations of the text message symbols. As a result, Twitter says there’s been lots of demand for access to its emoji. - -Now, you can clone Twitter’s entire library on [GitHub][4] to use in your development projects. Here’s how to do that, and how to make emoji easier to use after you do. - -### Obtain Unicode Support For Emoji ### - -Unicode is an international encoding standard that assigns a string of characters to any symbol, letter, or digit people want to use online. In other words, it’s the missing link between how you read text on a computer, and how the computer reads text. For example, while you are looking at an empty space between these words, the computer sees “&mbsp.” - -Unicode even has its own [primitive emoji][5] that can be read in the browser without any effort on your part. For example while you see a ♥, your computer is decoding the string “2665.” - -To use Twitter’s emoji library in most cases, you simply need to add a script inside the section of your HTML page: - - - -This grants your project access to the JavaScript library that contains the hundreds of emoji that work on Twitter. However, creating a document with simply this script isn’t going to make emoji appear on your site. You also need to actually insert some emoji! - -In the section, paste a few of the emoji strings you can find in Twitter’s [preview.html source code][6]. I used 🎹 and 🏁 without really knowing how they'd appear in the browser window. Yeah, you’ll have to just paste and guess. You can already see the problem we're going to fix in section two. - -However, through some trial and error, you can turn a raw HTML file that looks like this— - -![](http://a4.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2ODQyNTMzNTQ1OTk0.png) - -—into a webpage that looks something like this: - -![](http://a1.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2ODExNjYzNDU1NTA2.png) - -### Convert Emoji Into Readable Language ### - -Twitter’s solution is all well and good for making a site or app emoji compliant. But if you want to be able to easily insert your favorite emoji at will via HTML, you’re going to need an easier solution than memorizing all those Unicode strings. - -That’s where programmer Elle Kasai’s [Twemoji Awesome][7] styles come in. - -By adding Elle’s open-source stylesheet to any webpage, you can use English words to understand which emoji you’re inserting. So if you want a heart emoji to show up, you can simply type this : - - - -In order to do this, let’s download Elle’s project with the “Download ZIP” button on GitHub. - -Next, let’s make a new folder on the desktop. Inside this folder, we’ll put emoji.html—the raw HTML file I showed you before, and also Elle’s [twemoji-awesome.css][8]. - -We’ll need the HTML file to acknowledge the CSS file, so in the section of the html page you’ll want to add a link from the css file: - - - -Once you put this in, you can delete Twitter's script from before. Elle's styles each link to the Unicode string for the relevant emoji, so you no longer have to. - -Now, go down to the body section and add a few emoji. I used , , and . - -You'll end up with something like this: - -![](http://a2.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2ODcyMDYxNDU2MzU0.png) - -Save and view your creation in the browser: - -![](http://a1.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2ODExOTMxODkwOTYy.png) - -Ta-da! Not only have you gotten a basic webpage to support emoji in the browser, you’ve also made it easy to do. Feel free to check out this tutorial on [my GitHub][9] for actual files you can clone instead of screenshots. - -Lead image via [Get Emoji][10]; screenshots by Lauren Orsini - --------------------------------------------------------------------------------- - -via: http://readwrite.com/2014/11/12/how-to-use-emoji-in-the-browser-window - -作者：[Lauren Orsini][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://readwrite.com/author/lauren-orsini -[1]:https://blog.twitter.com/2014/open-sourcing-twitter-emoji-for-everyone -[2]:http://www.unicode.org/reports/tr51/full-emoji-list.html -[3]:https://twitter.com/iconfactory -[4]:https://github.com/twitter/twemoji -[5]:http://www.unicode.org/reports/tr51/full-emoji-list.html -[6]:https://github.com/twitter/twemoji/blob/gh-pages/preview.html -[7]:http://ellekasai.github.io/twemoji-awesome/ -[8]:https://github.com/ellekasai/twemoji-awesome/blob/gh-pages/twemoji-awesome.css -[9]:https://github.com/laurenorsini/Emoji-Everywhere -[10]:http://getemoji.com/ From cecb5a03ffe423bd036e2a342979e13f63c1ba1f Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Sat, 7 Feb 2015 20:37:35 +0800 Subject: [PATCH 199/207] Create 20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 翻译完毕。FSSlc --- ...here With Twitter's Open Source Library.md | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 translated/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md diff --git a/translated/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md b/translated/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md new file mode 100644 index 0000000000..6f1e2b5b56 --- /dev/null +++ b/translated/tech/20141114 How To Use Emoji Anywhere With Twitter's Open Source Library.md @@ -0,0 +1,91 @@ + 怎样通过 Twitter 的开源库来随处使用 Emoji 表情符号 +================================================================================ +> 通过 GitHub 将它们嵌入到网页和其他项目中。 + +![](http://a3.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2OTIyNTI3MjcxNTU1.png) + +Emoji, 来自日本的小巧符号，通过图像表达感情，已经征服了手机文字信息的世界。 + +现在，你可以在虚拟世界中随处使用它们了。 Twitter 最近[开源了][1]他们的 emoji 符号库，使得你可以在你自己的网站，应用，和项目中使用它们。 + +但这需要一点体力活。 Unicode 已经识别甚至标准化了 emoji 字母表， 然而 emoji 仍然[不能完全与所有的网络浏览器相兼容][2],这意味着大多数情况下，它们将呈现为 “豆腐块”或 空白盒子。当 Twitter 想使得 emoji 可用时，社交网络联合一家名为[Icon Factory][3]的公司共同渲染浏览器以模仿 文本信息符号的效果。结果，Twiter 说道 人们对他们的 emoji 库有很大的需求。 + +现在， 你可以从 [GitHub][4] 上克隆 Twitter 的整个库，从而在你的开发项目中使用它们。 下面将为你介绍如何达到上面的目的以及如何使得 emoji 更容易被使用。 + +### 为 Emoji 得到 Unicode 支持 ### + +Unicode 是国际编码标准，它为任意的符号，字母或人们想在网络上使用的数字配置了一串符号。换句话说，它是 你如何在计算机上阅读文本 与 计算机如何读取文本 之间的缺失环节。例如，对于你正看到的位于这些句子中的`空白`，计算机读取为 “&mbsp”。 + +Unicode 甚至拥有其自己的 [原始 emoji][5]，它们可以 在没有你的任何努力的情况下在浏览器中被阅读。例如，当你看到了 一个 ❤ 符号，你的计算机正在解码字符串 “2665” 。 + +要在大多数情况下使用 Twitter 的 emoji 库，你只需在你的 HTML 网页中的 ``块中添加如下脚本： + + + +这样就使得你的项目可以访问 包含有已经在 Twitter 中可使用的数以百计的 Emoji 符号的 JavaScript 库。然而，创建一个仅仅包含这个脚本的文档并不能使得在你的网站中呈现出 emoji 符号，实际上，你仍需要嵌入一些 emoji 符号！ + +在 ``块中，粘贴一些可以在 Twitter 的[preview.html 文件源代码][6] 中找到的 emoji 字符串。我使用了 🎹 和 🏁，当然我并不知道在浏览器窗口中它们的样子。是的，你必须粘贴并猜测它们。你已经看出了问题，我们将在 第二小节中予以解决。 + +无论如何，通过一些尝试，你可以将一个如下图的原始 HTML 文件--- + +![](http://a4.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2ODQyNTMzNTQ1OTk0.png) + +---转变成如下图的网页： + +![](http://a1.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2ODExNjYzNDU1NTA2.png) + +### 将 Emoji 转换为可阅读的语言 ### + +对于一个网站或应用，Twitter 的解决方案是非常适用的。但如果你想通过 HTML 轻易地插入你喜爱的 emoji 符号，你需要一个更易实现的解决方案，而不是记住所有代表 emoji 的 Unicode 字符串。 + +那正是程序员 Elle Kasai 的 [Twemoji Awesome][7] 样式大展身手的地方。 + +通过向任意网页中添加 Elle 的开源样式表，你可以适用 英语单词来理解你正插入的 emoji 符号的意义。所以如若你想展示一个 心形 emoji 符号，你可以简单地输入： + + + +为了实现上面的目的，让我们下载 Elle 的项目，通过点击在 GitHub 上 “Download ZIP” 按钮。 + +接着，我们在桌面上新建一个文件夹，然后进入该文件夹，并将 emoji.html---我先前向你展示的 HTML 源文件--- 和 Elle 的 [twemoji-awesome.css][8] 一同放进去。 + +我们还需要 HTML 文件识别这个 CSS 文件，所以在 html 网页中的 `` 块中，为 CSS 文件添加一个链接： + + + + 一旦你将上面的代码添加了进去，你便可以删除先前添加的 Twitter 的脚本链接。 + + 现在，找到 `body` 块部分的代码，然后添加一些 emoji 符号。我使用了 ``, ``, `` 和 ``。 + + 最终，你将得到如下的代码： + +![](http://a2.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2ODcyMDYxNDU2MzU0.png) + +保存并在浏览器中查看上面的文件： + +![](http://a1.files.readwrite.com/image/upload/c_fit,w_620/MTI1OTA2ODExOTMxODkwOTYy.png) + +当当！这样你不仅得到了一个可以在浏览器中支持 emoji 符号的基本网页，而且还知道了如何简单地实现它。你可以随意的在[我的 GitHub][9] 中查看这个教程，并且可以克隆这些实际的文件而不只是看看这些截图。 + +来自于[得到 Emoji][10]的引导图像； Lauren Orsini 截图。 + +-------------------------------------------------------------------------------- + +via: http://readwrite.com/2014/11/12/how-to-use-emoji-in-the-browser-window + +作者：[Lauren Orsini][a] +译者：[FSSlc](https://github.com/FSSlc) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://readwrite.com/author/lauren-orsini +[1]:https://blog.twitter.com/2014/open-sourcing-twitter-emoji-for-everyone +[2]:http://www.unicode.org/reports/tr51/full-emoji-list.html +[3]:https://twitter.com/iconfactory +[4]:https://github.com/twitter/twemoji +[5]:http://www.unicode.org/reports/tr51/full-emoji-list.html +[6]:https://github.com/twitter/twemoji/blob/gh-pages/preview.html +[7]:http://ellekasai.github.io/twemoji-awesome/ +[8]:https://github.com/ellekasai/twemoji-awesome/blob/gh-pages/twemoji-awesome.css +[9]:https://github.com/laurenorsini/Emoji-Everywhere +[10]:http://getemoji.com/ From 0fb0ae13158a6adbdaddf4b67ccbb933f7985714 Mon Sep 17 00:00:00 2001 From: Vic___ Date: Sat, 7 Feb 2015 23:08:37 +0800 Subject: [PATCH 200/207] translated --- ...t be opened correctly' on Google Chrome.md | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md b/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md index 8d5c4b02ca..0a10253031 100644 --- a/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md +++ b/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md @@ -1,52 +1,50 @@ -> Vic - -Linux FAQs with Answers--How to fix “Your profile could not be opened correctly” on Google Chrome +Linux有问必答--如果修复Google Chrome 的 ‘Your profile could not be opened correctly’错误 ================================================================================ -> **Question**: When I open Google Chrome web browser on my Linux box, I have several pop-up messages saying "Your profile could not be opened correctly." This error happens every time I open Google Chrome. How can I solve this error? +> **提问**：当我在linux打开Google Chrome 浏览器时，我已经几次收到弹出窗口，提示我的档案文件没有被正确打开（Your profile could not be opened correctly.）。每次我打开Chrome都要弹出来，我应该如何修复这个问题？ -When you see an error message saying "Your profile could not be opened correctly" on your Google Chrome web browser," that is because somehow your profile data on Google Chrome got corrupted. This can happen while you upgrade your Google Chrome browser manually on Linux. +当你在你的Chrome上看见"Your profile could not be opened correctly"错误信息时，那是因为你的Chrome档案数据已经损坏。这个问题经常发生在手动升级Google Chrome时候。 ![](https://farm8.staticflickr.com/7428/16238502737_27bdda6685_o.png) -Depending on exactly which file got corrupted, you can try one of these methods. +修复取决于到底哪个文件损坏，你可以试试下面的几个方法。 -### Method One ### +### 方法一 ### -Close all your Chrome browser windows/tabs. +关掉所有Chrome窗口和子窗口。 -Go to ~/.config/google-chrome/Default, and remove/rename "Web Data" file as below. +进入~/.config/google-chrome/Default，移除或者重命名"Web Data"文件。 $ cd ~/.config/google-chrome/Default $ rm "Web Data" -Re-open Google Chrome browser. +再次开打Google Chrome浏览器。 -### Method Two ### +### 方法二 ### -Close all your Chrome browser windows/tabs. +关掉所有Chrome窗口和子窗口。 -Go to ~/.config/google-chrome/"Profile 1", and rename "History" file as below. +进入~/.config/google-chrome/"Profile 1"， 并重命名"History"文件。 $ cd ~/.config/google-chrome/"Profile 1" $ mv History History.bak -Re-open Google Chrome browser. +再次开打Google Chrome浏览器。 -### Method Three ### +### 方法三 ### -If the problem still persists, you can remove the Default profile folder (~/.config/google-chrome/Default) altogether. Note that by doing so, you will lose all previously opened Google tabs, imported bookmarks, browsing history, sign-in data, etc. +如果依然没有解决，你可以试试移除所有默认档案文件夹（~/.config/google-chrome/Default）。注意:如果这样做，你将会遗失所有之前打开的Google子窗口，导入的书签，浏览记录和登录数据等。 -Before removing it, first close all your Chrome browser windows/tabs. +在移除之前，先关掉所有Chrome窗口和子窗口 $ rm -rf ~/.config/google-chrome/Default -After restarting Google Chrome, the folder ~/.config/google-chrome/Default will automatically be re-generated. +之后重启Google Chrome，文件夹~/.config/google-chrome/Default会自动生成。 -------------------------------------------------------------------------------- via: http://ask.xmodulo.com/your-profile-could-not-be-opened-correctly-google-chrome.html -译者：[译者ID](https://github.com/译者ID) +译者：[VicYu/Vic020](http://vicyu.net) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 232d40ac2ab00a39e191484d6989f43413ce2a8f Mon Sep 17 00:00:00 2001 From: Vic___ Date: Sat, 7 Feb 2015 23:09:25 +0800 Subject: [PATCH 201/207] moved --- ...our profile could not be opened correctly' on Google Chrome.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {sources => translated}/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md (100%) diff --git a/sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md b/translated/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md similarity index 100% rename from sources/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md rename to translated/tech/20150203 Linux FAQs with Answers--How to fix 'Your profile could not be opened correctly' on Google Chrome.md From c567823cd8390bc452e24e931c3f8907ecb12ff1 Mon Sep 17 00:00:00 2001 From: VicYu Date: Sat, 7 Feb 2015 23:13:11 +0800 Subject: [PATCH 202/207] =?UTF-8?q?=E6=8A=A2=E5=9C=B0=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...5 25 Linux Shell Scripting interview Questions & Answers.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150205 25 Linux Shell Scripting interview Questions & Answers.md b/sources/tech/20150205 25 Linux Shell Scripting interview Questions & Answers.md index a042cba174..11d5e6645a 100644 --- a/sources/tech/20150205 25 Linux Shell Scripting interview Questions & Answers.md +++ b/sources/tech/20150205 25 Linux Shell Scripting interview Questions & Answers.md @@ -1,3 +1,4 @@ + Vic 25 Linux Shell Scripting interview Questions & Answers ================================================================================ ### Q:1 What is Shell Script and why it is required ? ### @@ -374,4 +375,4 @@ via: http://www.linuxtechi.com/linux-shell-scripting-interview-questions-answers 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[a]:http://www.linuxtechi.com/author/pradeep/ \ No newline at end of file +[a]:http://www.linuxtechi.com/author/pradeep/ From 36d9263f5cc3e9f0ac397fd156855bccb6c70c02 Mon Sep 17 00:00:00 2001 From: geekpi Date: Sun, 8 Feb 2015 11:10:29 +0800 Subject: [PATCH 203/207] translating --- ... Addresses To Single Network Interface Card On CentOS 7.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md b/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md index 73d91116cb..1b7ac2f5b3 100644 --- a/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md +++ b/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md @@ -1,3 +1,5 @@ +Translating---geekpi + Linux Basics: Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7 ================================================================================ Some times you might want to use more than one IP address for your network interface card. What are you going to do? Buy an extra network card and assign new IP? No, It’s not necessary(atleast in the small networks). We can now assign multiple ip addresses to single network interface card in CentOS / RHEL 7 systems. Curious to know how? Well, Follow me, It is not that difficult. @@ -205,4 +207,4 @@ via: http://www.unixmen.com/linux-basics-assign-multiple-ip-addresses-single-net 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[a]:http://www.unixmen.com/author/sk/ \ No newline at end of file +[a]:http://www.unixmen.com/author/sk/ From dff489670f227d5a838d184656371e84f4fc73a0 Mon Sep 17 00:00:00 2001 From: geekpi Date: Sun, 8 Feb 2015 11:30:18 +0800 Subject: [PATCH 204/207] translated --- ...ngle Network Interface Card On CentOS 7.md | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) rename {sources => translated}/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md (71%) diff --git a/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md b/translated/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md similarity index 71% rename from sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md rename to translated/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md index 1b7ac2f5b3..3dec583608 100644 --- a/sources/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md +++ b/translated/tech/20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md @@ -1,16 +1,14 @@ -Translating---geekpi - -Linux Basics: Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7 +Linux 基础：在CentOS 7上给一个网卡分配多个IP地址 ================================================================================ -Some times you might want to use more than one IP address for your network interface card. What are you going to do? Buy an extra network card and assign new IP? No, It’s not necessary(atleast in the small networks). We can now assign multiple ip addresses to single network interface card in CentOS / RHEL 7 systems. Curious to know how? Well, Follow me, It is not that difficult. +有时你也许想要给一个网卡多个地址。你该怎么做呢？另外买一个网卡来分配地址？不用这么做（只要在小型网络中）。我们现在可以再CentOS/RHEL 7中给一个网卡分配多个ip地址。想知道怎么做么？好的，跟随我，这并不难。 -First, let us find the IP address of the network card. In my CentOS 7 server, I use only one network card. +首先，让我们找到网卡的IP地址。在我的CentOS 7服务器中，我只使用了一个网卡。 -Run the following command with root user privileges: +用root特权运行下面的命令： ip addr -Sample output: +示例输出： 1: lo: mtu 65536 qdisc noqueue state UNKNOWN link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 @@ -23,15 +21,15 @@ Sample output: inet 192.168.1.150/24 brd 192.168.1.255 scope global enp0s3 valid_lft forever preferred_lft forever -As you see in the above output, my network card name is enp0s3, and its IP address is 192.168.1.150. +如上所见，我的网卡名是enp0s3，ip地址是192.168.1.150。 -Well, as you may know, the the network card configuration files of your system is stored under **/etc/sysconfig/network-scripts/** directory. Each cards details will be stored in different names, for example **ifcfg-enp0s3**. +如你所知，网卡的配置文件存储在 **/etc/sysconfig/network-scripts/** 目录下。每个网卡的详细内容将会以不同的名字存储，比如**ifcfg-enp0s3**。 -Let us see the details of **ifcfg-enp0s3**. +让我们看下**ifcfg-enp0s3**的细节。 cat /etc/sysconfig/network-scripts/ifcfg-enp0s3 -Sample output: +示例输出： TYPE="Ethernet" BOOTPROTO="none" @@ -52,13 +50,13 @@ Sample output: IPV6_PEERDNS="yes" IPV6_PEERROUTES="yes" -Okay, now we will assign multiple addresses in the same subnet. +好的，现在我们将在相同的子网中分配多个地址了。 -Edit file **/etc/sysconfig/network-scripts/ifcfg-enp0s3**: +编辑文件 **/etc/sysconfig/network-scripts/ifcfg-enp0s3**： vi /etc/sysconfig/network-scripts/ifcfg-enp0s3 -Add extra IP addresses one by one as shown below. +像下面那样加入额外的IP地址。 TYPE="Ethernet" BOOTPROTO="none" @@ -81,19 +79,20 @@ Add extra IP addresses one by one as shown below. IPV6_PEERDNS="yes" IPV6_PEERROUTES="yes" -As you see above, I have added two more IP addresses: **IPADDR1=”192.168.1.151″ & IPADDR2=”192.168.1.152″** +如你所见，我已经加了两个IP地址：**IPADDR1=”192.168.1.151″ & IPADDR2=”192.168.1.152″** -Like wise, you can add as many a IP addresses you want. +类似地，你可以加入更多的ip地址。 Finally, save and close the file. Restart network service to take effect the changes. +最后，保存并退出文件。重启网络服务来使更改生效。 systemctl restart network -Now, let us check the IP addresses have been added or not. +现在，让我们检查是否已经加入了ip地址。 ip addr -Sample output: +示例输出： : lo: mtu 65536 qdisc noqueue state UNKNOWN link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 @@ -112,13 +111,13 @@ Sample output: inet6 fe80::a00:27ff:fe3f:ab68/64 scope link valid_lft forever preferred_lft forever -As you see above, the single network interface card has three IP addresses. +如你所见，单个网卡已经有3个ip地址了。 -Let us ping the newly added IP addresses: +让我们ping一下新增的IP地址： ping -c 4 192.168.1.151 -Sample output: +示例输出： PING 192.168.1.151 (192.168.1.151) 56(84) bytes of data. 64 bytes from 192.168.1.151: icmp_seq=1 ttl=64 time=0.048 ms @@ -134,7 +133,7 @@ Sample output: ping -c 4 192.168.1.152 -Sample output: +示例输出： PING 192.168.1.152 (192.168.1.152) 56(84) bytes of data. 64 bytes from 192.168.1.152: icmp_seq=1 ttl=64 time=0.034 ms @@ -146,9 +145,9 @@ Sample output: 4 packets transmitted, 4 received, 0% packet loss, time 2999ms rtt min/avg/max/mdev = 0.034/0.064/0.075/0.018 ms -If you want to use **different subnet**, then you can change the **PREFIX0=24** line to different subnet, such as **PREFIX1=16**. +如果你想要使用**不同的子网**，你要改变**PREFIX0=24**成不同的子网，比如 **PREFIX1=16**。 -For example, I am going to add Class A IP address(**ex.10.0.0.1**) to my network card. +比如，我想要添加一个A类地址（**比如10.0.0.1*）到我的网卡中。 TYPE="Ethernet" BOOTPROTO="none" @@ -173,15 +172,15 @@ For example, I am going to add Class A IP address(**ex.10.0.0.1**) to my network IPV6_PEERDNS="yes" IPV6_PEERROUTES="yes" -Do you notice that I have added a Class A type address(10.0.0.1) and prefix=16. +你可以看到我已经添加一个A类地址(10.0.0.1)并且前缀是16 -Save and close the file. Restart network service, +保存并退出文件。重启网络服务， -Then, ping the new added IP: +接着，ping新增的地址： ping -c 4 10.0.0.1 -Sample output: +示例输出： PING 10.0.0.1 (10.0.0.1) 56(84) bytes of data. 64 bytes from 10.0.0.1: icmp_seq=1 ttl=64 time=0.097 ms @@ -193,16 +192,16 @@ Sample output: 4 packets transmitted, 4 received, 0% packet loss, time 3000ms rtt min/avg/max/mdev = 0.073/0.079/0.097/0.014 ms -Similarly, you can add different Gateways too. +相似地，你可以添加不同的网关。 -That’s it. +就是这样。 -------------------------------------------------------------------------------- via: http://www.unixmen.com/linux-basics-assign-multiple-ip-addresses-single-network-interface-card-centos-7/ 作者：[SK][a] -译者：[译者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/) 荣誉推出 From 985d674ba69578faed8f8d6d06640eb6a856edaa Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Sun, 8 Feb 2015 12:25:09 +0800 Subject: [PATCH 205/207] Update 20141203 Undelete Files on Linux Systems.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 准备翻译该篇。 --- sources/tech/20141203 Undelete Files on Linux Systems.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20141203 Undelete Files on Linux Systems.md b/sources/tech/20141203 Undelete Files on Linux Systems.md index d0fa7f6a98..126501e225 100644 --- a/sources/tech/20141203 Undelete Files on Linux Systems.md +++ b/sources/tech/20141203 Undelete Files on Linux Systems.md @@ -1,3 +1,5 @@ +Translating by FSSlc + Undelete Files on Linux Systems ================================================================================ Often times, a computer user will delete a needed file accidentally and not have an easy way to regain or recreate the file. Thankfully, files can be undeleted. When a user deletes a file, it is not gone, only hidden for some time. Here is how it all works. On a filesystem, the system has what is called a file allocation list. This list keeps track of what files are where on the storage unit (hard-drive, MicroSD card, flash-drive, etc.). When a file is deleted, the filesystem will perform one of two tasks on the allocation table. The file's entry on the file allocation table marked as "free space" or the file's entry on the list is erased and then the space is marked as free. Now, if a file needs to be placed on the storage unit, the operating system will put the file in the space marked as empty. After the new file is written to the "empty space", the deleted file is now gone forever. When a deleted file is to be recovered, the user must not manipulate any files because if the "empty space" is used, then the file can never be retrieved. @@ -115,4 +117,4 @@ via: http://www.linux.org/threads/undelete-files-on-linux-systems.4316/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://www.linux.org/members/devyncjohnson.4843/ -[1]:http://www.cgsecurity.org/wiki/TestDisk \ No newline at end of file +[1]:http://www.cgsecurity.org/wiki/TestDisk From 87350c07a017128e61292d3a39b247d38e620224 Mon Sep 17 00:00:00 2001 From: soooogreen <54364732@qq.com> Date: Sun, 8 Feb 2015 13:19:58 +0800 Subject: [PATCH 206/207] Update 20150202 How to create and show a presentation from the command line on Linux.md translating by soooogreen first time to apply..for testing --- ...e and show a presentation from the command line on Linux.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150202 How to create and show a presentation from the command line on Linux.md b/sources/tech/20150202 How to create and show a presentation from the command line on Linux.md index d80b385544..e871d29e42 100644 --- a/sources/tech/20150202 How to create and show a presentation from the command line on Linux.md +++ b/sources/tech/20150202 How to create and show a presentation from the command line on Linux.md @@ -1,3 +1,4 @@ +translating by soooogreen How to create and show a presentation from the command line on Linux ================================================================================ When you prepare a talk for audience, the first thing that will probably come to your mind is shiny presentation charts filled with fancy diagrams, graphics and animation effects. Fine. No one can deny the power of visually charming presentation. However, not all presentations need to be Ted talk quality. Often times, the purpose of a presentation is to convey specific information, which can easily be done with textual messages. In such cases, your time can be better spent on gathering information and checking facts, rather than searching for good-looking graphics from Google Image. @@ -183,4 +184,4 @@ via: http://xmodulo.com/presentation-command-line-linux.html [2]:https://github.com/visit1985/mdp [3]:http://daringfireball.net/projects/markdown/ [4]:https://aur.archlinux.org/packages/mdp-git/ -[5]:http://www.ngolde.de/tpp.html \ No newline at end of file +[5]:http://www.ngolde.de/tpp.html From ee93743a9cda14b7124f83d31bd69125caf18fa2 Mon Sep 17 00:00:00 2001 From: KayGuoWhu Date: Sun, 8 Feb 2015 13:36:18 +0800 Subject: [PATCH 207/207] translating by KayGuoWhu --- ...nt to a float when a float cannot represent all int values.md | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/talk/20150124 Why does C++ promote an int to a float when a float cannot represent all int values.md b/sources/talk/20150124 Why does C++ promote an int to a float when a float cannot represent all int values.md index 25a2dc6daf..b2e6372a0b 100644 --- a/sources/talk/20150124 Why does C++ promote an int to a float when a float cannot represent all int values.md +++ b/sources/talk/20150124 Why does C++ promote an int to a float when a float cannot represent all int values.md @@ -1,3 +1,4 @@ +translating by KayGuoWhu Why does C++ promote an int to a float when a float cannot represent all int values? ---------