From 3fd5e8c64d4125c63919df9c8cd5905197b66da7 Mon Sep 17 00:00:00 2001 From: tinyeyeser Date: Mon, 12 Jan 2015 11:15:33 +0800 Subject: [PATCH 001/215] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9=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 --- ...x Users Should Know About Open Hardware.md | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/translated/talk/20140929 What Linux Users Should Know About Open Hardware.md b/translated/talk/20140929 What Linux Users Should Know About Open Hardware.md index 5dd758be4c..d8a0e846b6 100644 --- a/translated/talk/20140929 What Linux Users Should Know About Open Hardware.md +++ b/translated/talk/20140929 What Linux Users Should Know About Open Hardware.md @@ -1,22 +1,22 @@ -Linux用户应该了解一下开源硬件 +Linux用户，你们真的了解开源硬件吗？ ================================================================================ > Linux用户不了解一点开源硬件制造相关的事情，他们将会很失望。 商业软件和免费软件已经互相纠缠很多年了，但是这俩经常误解对方。这并不奇怪 -- 对一方来说是生意，而另一方只是一种生活方式。但是，这种误解会给人带来痛苦，这也是为什么值得花精力去揭露这里面的内幕。 -一个逐渐普遍的现象：对开源硬件的不断尝试，不管是Canonical，Jolla，MakePlayLive，或者其他几个。不管是评论员或终端用户，一般的免费软件用户会为新的硬件平台发布表现出过分的狂热，然后因为不断延期有所醒悟，最终放弃整个产品。 +一个逐渐普遍的现象：对开源硬件的不断尝试，不管是Canonical，Jolla，MakePlayLive，或者其他公司。无论是评论员或是终端用户，一般的免费软件用户会为新的硬件平台发布表现出过分的狂热，然后因为不断延期有所醒悟，直到最终放弃整个产品。 -这是一个没有人获益的怪圈，而且滋生出不信任 - 都是因为一般的Linux用户根本不知道这些新闻背后发生的事情。 +这是一个没有人获益的怪圈，而且常常滋生出不信任 - 都是因为一般的Linux用户根本不知道这些新闻背后发生的事情。 -我个人对于把产品推向市场的经验很有限。但是，我还不知道谁能有所突破。推出一个开源硬件或其他产品到市场仍然不仅仅是个残酷的生意，而且严重不利于新加入的厂商。 +我个人对于把产品推向市场的经验很有限。但是，我还没听说谁能有所突破。推出一个开源硬件或其他产品到市场仍然不仅仅是个残酷的生意，而且严重不利于新进厂商。 ### 寻找合作伙伴 ### 不管是数码产品的生产还是分销都被相对较少的一些公司控制着，有时需要数月的预订。利润率也会很低，所以就像那些购买古老情景喜剧的电影工作室一样，生成商一般也希望复制当前热销产品的成功。像Aaron Seigo在谈到他花精力开发Vivaldi平板时告诉我的，生产商更希望能由其他人去承担开发新产品的风险。 -不仅如此，他们更希望和那些有现成销售记录的有可能带来可复制生意的人合作。 +不仅如此，他们更希望和那些有现成销售记录的有可能带来长期客户生意的人合作。 -而且，一般新加入的厂商所关心的产品只有几千的量。芯片制造商更愿意和苹果或三星合作，因为它们的订单很可能是几百K。 +而且，一般新加入的厂商所关心的产品只有几千的量。芯片制造商更愿意和苹果或三星合作，因为它们的订单很可能是几十上百万的量。 面对这种情形，开源硬件制造者们可能会发现他们在工厂的列表中被淹没了，除非能找到二线或三线厂愿意尝试一下小批量生产新产品。 @@ -28,9 +28,9 @@ Linux用户应该了解一下开源硬件 这样必然会引起潜在用户的批评，但是开源硬件制造者没得选，只能折中他们的愿景。寻找其他生产商也不能解决问题，有一个原因是这样做意味着更多延迟，但是更多的是因为完全免授权费的硬件是不存在的。像三星这样的业内巨头对免费硬件没有任何兴趣，而作为新人，开源硬件制造者也没有影响力去要求什么。 -更何况，就算有免费硬件，生产商也不能保证会用在下一批生产中。制造者们会轻易地发现他们每次需要生产的时候都要重打一样的仗。 +更何况，就算有免费硬件，生产商也不能保证会用在下一批生产中。制造者们会轻易地发现他们每次需要生产的时候都要重打一次一模一样的仗。 -这些都还不够，这个时候开源硬件制造者们也许已经花了6-12个月时间来讨价还价。机会来了，产业标准已经变更，他们也许为了升级产品规格又要从头来过。 +这些都还不够，这个时候开源硬件制造者们也许已经花了6-12个月时间来讨价还价。等机会终于来了，产业标准却已经变更，于是他们可能为了升级产品规格又要从头来过。 ### 短暂而且残忍的货架期 ### @@ -42,15 +42,15 @@ Linux用户应该了解一下开源硬件 ### 衡量整件怪事 ### -在这里我只是粗略地概括了一下，但是任何涉足过制造的人会认出我形容成标准的东西。而更糟糕的是，开源硬件制造者们通常在这个过程中才会有所觉悟。不可避免，他们也会犯错，从而带来更多的延迟。 +在这里我只是粗略地概括了一下，但是任何涉足过制造的人会认同我形容为行业标准的东西。而更糟糕的是，开源硬件制造者们通常只有在亲身经历过后才会有所觉悟。不可避免，他们也会犯错，从而带来更多的延迟。 -但重点是，一旦你对整个过程有所了解，你对另一个开源硬件进行尝试的消息的反应就会改变。这个过程意味着，除非哪家公司处于严格的保密模式，对于产品将于六个月内发布的声明会很快会被证实是过期的推测。很可能是12-18个月，而且面对之前提过的那些困难很可能意味着这个产品永远不会真正发布。 +但重点是，一旦你对整个过程有所了解，你对另一个开源硬件进行尝试的新闻的反应就会改变。这个过程意味着，除非哪家公司处于严格的保密模式，对于产品将于六个月内发布的声明会很快会被证实是过期的推测。很可能是12-18个月，而且面对之前提过的那些困难很可能意味着这个产品永远都不会真正发布。 举个例子，就像我写的，人们等待第一代Steam Machines面世，它是一台基于Linux的游戏主机。他们相信Steam Machines能彻底改变Linux和游戏。 作为一个市场分类，Steam Machines也许比其他新产品更有优势，因为参与开发的人员至少有开发软件产品的经验。然而，整整一年过去了Steam Machines的开发成果都还只有原型机，而且直到2015年中都不一定能买到。面对硬件生产的实际情况，就算有一半能见到阳光都是很幸运了。而实际上，能发布2-4台也许更实际。 -我做出这个预测并没有考虑个体努力。但是，对硬件生产的理解，比起那些Linux和游戏的黄金年代之类的预言，我估计这个更靠谱。如果我错了也会很开心，但是事实不会改变：让人吃惊的不是如此多的Linux相关硬件产品失败了，而是那些即使是短暂的成功的产品。 +我做出这个预测并没有考虑个体努力。但是，对硬件生产的理解，比起那些Linux和游戏的黄金年代之类的预言，我估计这个更靠谱。如果我错了也会很开心，但是事实不会改变：让人吃惊的不是如此多的Linux相关硬件产品失败了，而是那些虽然短暂但却成功的产品。 -------------------------------------------------------------------------------- @@ -58,7 +58,7 @@ via: http://www.datamation.com/open-source/what-linux-users-should-know-about-op 作者：[Bruce Byfield][a] 译者：[zpl1025](https://github.com/zpl1025) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Mr小眼儿](https://github.com/tinyeyeser) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From a2b404a7114eadbb3ff8f8a454c4b54ca923db9c Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 12 Jan 2015 11:25:39 +0800 Subject: [PATCH 002/215] =?UTF-8?q?20150112-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... command-line network monitors on Linux.md | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 sources/tech/20150112 What are useful command-line network monitors on Linux.md diff --git a/sources/tech/20150112 What are useful command-line network monitors on Linux.md b/sources/tech/20150112 What are useful command-line network monitors on Linux.md new file mode 100644 index 0000000000..f17e45cbf4 --- /dev/null +++ b/sources/tech/20150112 What are useful command-line network monitors on Linux.md @@ -0,0 +1,135 @@ +What are useful command-line network monitors on Linux +================================================================================ +Network monitoring is a critical IT function for businesses of all sizes. The goal of network monitoring can vary. For example, the monitoring activity can be part of long-term network provisioning, security protection, performance troubleshooting, network usage accounting, and so on. Depending on its goal, network monitoring is done in many different ways, such as performing packet-level sniffing, collecting flow-level statistics, actively injecting probes into the network, parsing server logs, etc. + +While there are many dedicated network monitoring systems capable of 24/7/365 monitoring, you can also leverage command-line network monitors in certain situations, where a dedicated monitor is an overkill. If you are a system admin, you are expected to have hands-on experience with some of well known CLI network monitors. Here is a list of **popular and useful command-line network monitors on Linux**. + +### Packet-Level Sniffing ### + +In this category, monitoring tools capture individual packets on the wire, dissect their content, and display decoded packet content or packet-level statistics. These tools conduct network monitoring from the lowest level, and as such, can possibly do the most fine-grained monitoring at the cost of network I/O and analysis efforts. + +1. **dhcpdump**: a comman-line DHCP traffic sniffer capturing DHCP request/response traffic, and displays dissected DHCP protocol messages in a human-friendly format. It is useful when you are troubleshooting DHCP related issues. + +2. **[dsniff][1]**: a collection of command-line based sniffing, spoofing and hijacking tools designed for network auditing and penetration testing. They can sniff various information such as passwords, NSF traffic, email messages, website URLs, and so on. + +3. **[httpry][2]**: an HTTP packet sniffer which captures and decode HTTP requests and response packets, and display them in a human-readable format. + +4. **IPTraf**: a console-based network statistics viewer. It displays packet-level, connection-level, interface-level, protocol-level packet/byte counters in real-time. Packet capturing can be controlled by protocol filters, and its operation is full menu-driven. + +![](https://farm8.staticflickr.com/7519/16055246118_8ea182b413_c.jpg) + +5. **[mysql-sniffer][3]**: a packet sniffer which captures and decodes packets associated with MySQL queries. It displays the most frequent or all queries in a human-readable format. + +6. **[ngrep][4]**: grep over network packets. It can capture live packets, and match (filtered) packets against regular expressions or hexadecimal expressions. It is useful for detecting and storing any anomalous traffic, or for sniffing particular patterns of information from live traffic. + +7. **[p0f][5]**: a passive fingerprinting tool which, based on packet sniffing, reliably identifies operating systems, NAT or proxy settings, network link types and various other properites associated with an active TCP connection. + +8. **pktstat**: a command-line tool which analyzes live packets to display connection-level bandwidth usages as well as descriptive information of protocols involved (e.g., HTTP GET/POST, FTP, X11). + +![](https://farm8.staticflickr.com/7477/16048970999_be60f74952_b.jpg) + +9. **Snort**: an intrusion detection and prevention tool which can detect/prevent a variety of backdoor, botnets, phishing, spyware attacks from live traffic based on rule-driven protocol analysis and content matching. + +10. **tcpdump**: a command-line packet sniffer which is capable of capturing nework packets on the wire based on filter expressions, dissect the packets, and dump the packet content for packet-level analysis. It is widely used for any kinds of networking related troubleshooting, network application debugging, or [security][6] monitoring. + +11. **tshark**: a command-line packet sniffing tool that comes with Wireshark GUI program. It can capture and decode live packets on the wire, and show decoded packet content in a human-friendly fashion. + +### Flow-/Process-/Interface-Level Monitoring ### + +In this category, network monitoring is done by classifying network traffic into flows, associated processes or interfaces, and collecting per-flow, per-process or per-interface statistics. Source of information can be libpcap packet capture library or sysfs kernel virtual filesystem. Monitoring overhead of these tools is low, but packet-level inspection capabilities are missing. + +12. **bmon**: a console-based bandwidth monitoring tool which shows various per-interface information, including not-only aggregate/average RX/TX statistics, but also a historical view of bandwidth usage. + +![](https://farm9.staticflickr.com/8580/16234265932_87f20c5d17_b.jpg) + +13. **[iftop][7]**: a bandwidth usage monitoring tool that can shows bandwidth usage for individual network connections in real time. It comes with ncurses-based interface to visualize bandwidth usage of all connections in a sorted order. It is useful for monitoring which connections are consuming the most bandwidth. + +14. **nethogs**: a process monitoring tool which offers a real-time view of upload/download bandwidth usage of individual processes or programs in an ncurses-based interface. This is useful for detecting bandwidth hogging processes. + +15. **netstat**: a command-line tool that shows various statistics and properties of the networking stack, such as open TCP/UDP connections, network interface RX/TX statistics, routing tables, protocol/socket statistics. It is useful when you diagnose performance and resource usage related problems of the networking stack. + +16. **[speedometer][8]**: a console-based traffic monitor which visualizes the historical trend of an interface's RX/TX bandwidth usage with ncurses-drawn bar charts. + +![](https://farm8.staticflickr.com/7485/16048971069_31dd573a4f_c.jpg) + +17. **[sysdig][9]**: a comprehensive system-level debugging tool with a unified interface for investigating different Linux subsystems. Its network monitoring module is capable of monitoring, either online or offline, various per-process/per-host networking statistics such as bandwidth usage, number of connections/requests, etc. + +18. **tcptrack**: a TCP connection monitoring tool which displays information of active TCP connections, including source/destination IP addresses/ports, TCP state, and bandwidth usage. + +![](https://farm8.staticflickr.com/7507/16047703080_5fdda2e811_b.jpg) + +19. **vnStat**: a command-line traffic monitor which maintains a historical view of RX/TX bandwidh usage (e.g., current, daily, monthly) on a per-interface basis. Running as a background daemon, it collects and stores interface statistics on bandwidth rate and total bytes transferred. + +### Active Network Monitoring ### + +Unlike passive monitoring tools presented so far, tools in this category perform network monitoring by actively "injecting" probes into the network and collecting corresponding responses. Monitoring targets include routing path, available bandwidth, loss rates, delay, jitter, system settings or vulnerabilities, and so on. + +20. **[dnsyo][10]**: a DNS monitoring tool which can conduct DNS lookup from open resolvers scattered across more than 1,500 different networks. It is useful when you check DNS propagation or troubleshoot DNS configuration. + +21. **[iperf][11]**: a TCP/UDP bandwidth measurement utility which can measure maximum available bandwidth between two end points. It measures available bandwidth by having two hosts pump out TCP/UDP probe traffic between them either unidirectionally or bi-directionally. It is useful when you test the network capacity, or tune the parameters of network stack. A variant called [netperf][12] exists with more features and better statistics. + +22. **[netcat][13]/socat**: versatile network debugging tools capable of reading from, writing to, or listen on TCP/UDP sockets. They are often used alongside with other programs or scripts for backend network transfer or port listening. + +23. **nmap**: a command-line port scanning and network discovery utility. It relies on a number of TCP/UDP based scanning techniques to detect open ports, live hosts, or existing operating systems on the local network. It is useful when you audit local hosts for vulnerabilities or build a host map for maintenance purpose. [zmap][14] is an alernative scanning tool with Internet-wide scanning capability. + +24. ping: a network testing tool which works by exchaning ICMP echo and reply packets with a remote host. It is useful when you measure round-trip-time (RTT) delay and loss rate of a routing path, as well as test the status or firewall rules of a remote system. Variations of ping exist with fancier interface (e.g., [noping][15]), multi-protocol support (e.g., [hping][16]) or parallel probing capability (e.g., [fping][17]). + +![](https://farm8.staticflickr.com/7466/15612665344_a4bb665a5b_c.jpg) + +25. **[sprobe][18]**: a command-line tool that heuristically infers the bottleneck bandwidth between a local host and any arbitrary remote IP address. It uses TCP three-way handshake tricks to estimate the bottleneck bandwidth. It is useful when troubleshooting wide-area network performance and routing related problems. + +26. **traceroute**: a network discovery tool which reveals a layer-3 routing/forwarding path from a local host to a remote host. It works by sending TTL-limited probe packets and collecting ICMP responses from intermediate routers. It is useful when troubleshooting slow network connections or routing related problems. Variations of traceroute exist with better RTT statistics (e.g., [mtr][19]). + +### Application Log Parsing ### + +In this category, network monitoring is targeted at a specific server application (e.g., web server or database server). Network traffic generated or consumed by a server application is monitored by analyzing its log file. Unlike network-level monitors presented in earlier categories, tools in this category can analyze and monitor network traffic from application-level. + +27. **[GoAccess][20]**: a console-based interactive viewer for Apache and Nginx web server traffic. Based on access log analysis, it presents a real-time statistics of a number of metrics including daily visits, top requests, client operating systems, client locations, client browsers, in a scrollable view. + +![](https://farm8.staticflickr.com/7518/16209185266_da6c5c56eb_c.jpg) + +28. **[mtop][21]**: a command-line MySQL/MariaDB server moniter which visualizes the most expensive queries and current database server load. It is useful when you optimize MySQL server performance and tune server configurations. + +![](https://farm8.staticflickr.com/7472/16047570248_bc996795f2_c.jpg) + +29. **[ngxtop][22]**: a traffic monitoring tool for Nginx and Apache web server, which visualizes web server traffic in a top-like interface. It works by parsing a web server's access log file and collecting traffic statistics for individual destinations or requests. + +### Conclusion ### + +In this article, I presented a wide variety of command-line network monitoring tools, ranging from the lowest packet-level monitors to the highest application-level network monitors. Knowing which tool does what is one thing, and choosing which tool to use is another, as any single tool cannot be a universal solution for your every need. A good system admin should be able to decide which tool is right for the circumstance at hand. Hopefully the list helps with that. + +You are always welcome to improve the list with your comment! + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/useful-command-line-network-monitors-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://www.monkey.org/~dugsong/dsniff/ +[2]:http://xmodulo.com/monitor-http-traffic-command-line-linux.html +[3]:https://github.com/zorkian/mysql-sniffer +[4]:http://ngrep.sourceforge.net/ +[5]:http://lcamtuf.coredump.cx/p0f3/ +[6]:http://xmodulo.com/recommend/firewallbook +[7]:http://xmodulo.com/how-to-install-iftop-on-linux.html +[8]:https://excess.org/speedometer/ +[9]:http://xmodulo.com/monitor-troubleshoot-linux-server-sysdig.html +[10]:http://xmodulo.com/check-dns-propagation-linux.html +[11]:https://iperf.fr/ +[12]:http://www.netperf.org/netperf/ +[13]:http://xmodulo.com/useful-netcat-examples-linux.html +[14]:https://zmap.io/ +[15]:http://noping.cc/ +[16]:http://www.hping.org/ +[17]:http://fping.org/ +[18]:http://sprobe.cs.washington.edu/ +[19]:http://xmodulo.com/better-alternatives-basic-command-line-utilities.html#mtr_link +[20]:http://goaccess.io/ +[21]:http://mtop.sourceforge.net/ +[22]:http://xmodulo.com/monitor-nginx-web-server-command-line-real-time.html \ No newline at end of file From 841036a33cad9b4583230a9d3531009153f8fb6d Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 12 Jan 2015 11:48:07 +0800 Subject: [PATCH 003/215] =?UTF-8?q?20150112-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...est GNOME Shell Themes For Ubuntu 14.04.md | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create 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 new file mode 100644 index 0000000000..8836812288 --- /dev/null +++ b/sources/share/20150112 Best GNOME Shell Themes For Ubuntu 14.04.md @@ -0,0 +1,111 @@ +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/ \ No newline at end of file From c1602f7bf85928b05a4cf416092196f4938d27ae Mon Sep 17 00:00:00 2001 From: kingname Date: Mon, 12 Jan 2015 13:06:55 +0800 Subject: [PATCH 004/215] Translating by kingname --- ...41219 Git 2.2.1 Released To Fix Critical Security Issue.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/news/20141219 Git 2.2.1 Released To Fix Critical Security Issue.md b/sources/news/20141219 Git 2.2.1 Released To Fix Critical Security Issue.md index 5d9e26af99..8fbfa1f071 100644 --- a/sources/news/20141219 Git 2.2.1 Released To Fix Critical Security Issue.md +++ b/sources/news/20141219 Git 2.2.1 Released To Fix Critical Security Issue.md @@ -2,6 +2,8 @@ Git 2.2.1 Released To Fix Critical Security Issue ================================================================================ ![](http://www.phoronix.com/assets/categories/freesoftware.jpg) +Translating by kingname + Git 2.2.1 was released this afternoon to fix a critical security vulnerability in Git clients. Fortunately, the vulnerability doesn't plague Unix/Linux users but rather OS X and Windows. Today's Git vulnerability affects those using the Git client on case-insensitive file-systems. On case-insensitive platforms like Windows and OS X, committing to .Git/config could overwrite the user's .git/config and could lead to arbitrary code execution. Fortunately with most Phoronix readers out there running Linux, this isn't an issue thanks to case-sensitive file-systems. @@ -22,4 +24,4 @@ via: http://www.phoronix.com/scan.php?page=news_item&px=MTg2ODA [a]:http://www.michaellarabel.com/ [1]:http://article.gmane.org/gmane.linux.kernel/1853266 -[2]:https://github.com/blog/1938-git-client-vulnerability-announced \ No newline at end of file +[2]:https://github.com/blog/1938-git-client-vulnerability-announced From 33564c2a24d5e7f35e230b13d239e0ae4b900142 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 12 Jan 2015 13:28:37 +0800 Subject: [PATCH 005/215] =?UTF-8?q?20150112-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ind and Remove Duplicate Files on Linux.md | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md diff --git a/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md b/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md new file mode 100644 index 0000000000..f974f6fca9 --- /dev/null +++ b/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md @@ -0,0 +1,93 @@ +How to Find and Remove Duplicate Files on Linux +================================================================================ +Hi all, today we're gonna learn how to find and remove duplicate files on you Linux PC or Server. So, here's a tool that you may use anyone of them according to your needs and comfort. + +Whether you’re using Linux on your desktop or a server, there are good tools that will scan your system for duplicate files and help you remove them to free up space. Solid graphical and command-line interfaces are both available. Duplicate files are an unnecessary waste of disk space. After all, if you really need the same file in two different locations you could always set up a symbolic link or hard link, storing the data in only one location on disk. + +### FSlint ### + +[FSlint][1] is available in various Linux distributions binary repository, including Ubuntu, Debian, Fedora, and Red Hat. Just fire up your package manager and install the “fslint” package. This utility provides a convenient graphical interface by default and it also includes command-line versions of its various functions. + +Don’t let that scare you away from using FSlint’s convenient graphical interface, though. By default, it opens with the Duplicates pane selected and your home directory as the default search path. + +To install fslint, as I am running ubuntu, here is the default command: + + $ sudo apt-get install fslint + +But here are installation commands for other linux distributions: + +Debian: + + svn checkout http://fslint.googlecode.com/svn/trunk/ fslint-2.45 + cd fslint-2.45 + dpkg-buildpackage -I.svn -rfakeroot -tc + sudo dpkg -i ../fslint_2.45-1_all.deb + +Fedora: + + sudo yum install fslint + +For OpenSuse: + + [ -f /etc/mandrake-release ] && pkg=rpm + [ -f /etc/SuSE-release ] && pkg=packages + wget http://www.pixelbeat.org/fslint/fslint-2.42.tar.gz + sudo rpmbuild -ta fslint-2.42.tar.gz + sudo rpm -Uvh /usr/src/$pkg/RPMS/noarch/fslint-2.42-1.*.noarch.rpm + +For Other Distro: + + wget http://www.pixelbeat.org/fslint/fslint-2.44.tar.gz + tar -xzf fslint-2.44.tar.gz + cd fslint-2.44 + (cd po && make) + ./fslint-gui + +To run fslint in GUI version run fslint-gui in Ubuntu, run command (Alt+F2) or terminal: + + $ fslint-gui + +By default, it opens with the Duplicates pane selected and your home directory as the default search path. All you have to do is click the Find button and FSlint will find a list of duplicate files in directories under your home folder. + +![Delete Duplicate files with Fslint](http://blog.linoxide.com/wp-content/uploads/2015/01/delete-duplicates-fslint.png) + +Use the buttons to delete any files you want to remove, and double-click them to preview them. + +Finally, you are done. Hurray, we have sucessfully removed duplicate files from your system. + +**Note** that the command-line utilities aren’t in your path by default, so you can’t run them like typical commands. On Ubuntu, you’ll find them under /usr/share/fslint/fslint. So, if you wanted to run the entire fslint scan on a single directory, here are the commands you’d run on Ubuntu: + + cd /usr/share/fslint/fslint + + ./fslint /path/to/directory + +**This command won’t actually delete anything. It will just print a list of duplicate files — you’re on your own for the rest.** + + $ /usr/share/fslint/fslint/findup --help + find dUPlicate files. + Usage: findup [[[-t [-m|-d]] | [--summary]] [-r] [-f] paths(s) ...] + + If no path(s) specified then the current directory is assumed. + + When -m is specified any found duplicates will be merged (using hardlinks). + When -d is specified any found duplicates will be deleted (leaving just 1). + When -t is specfied, only report what -m or -d would do. + When --summary is specified change output format to include file sizes. + You can also pipe this summary format to /usr/share/fslint/fslint/fstool/dupwaste + to get a total of the wastage due to duplicates. + +![fslint help](http://blog.linoxide.com/wp-content/uploads/2015/01/fslint-help.png) + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/file-system/find-remove-duplicate-files-linux/ + +作者：[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.pixelbeat.org/fslint/ +[2]:http://www.pixelbeat.org/fslint/fslint-2.42.tar.gz \ No newline at end of file From 43154bbb52f9557f840fecfe5fd25f9b3a70321b Mon Sep 17 00:00:00 2001 From: kingname Date: Mon, 12 Jan 2015 13:33:14 +0800 Subject: [PATCH 006/215] =?UTF-8?q?Git=20=E5=8F=91=E5=B8=832.2.1=E7=89=88?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=A5=E9=87=8D=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Released To Fix Critical Security Issue.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 translated/news/Git 2.2.1 Released To Fix Critical Security Issue.md diff --git a/translated/news/Git 2.2.1 Released To Fix Critical Security Issue.md b/translated/news/Git 2.2.1 Released To Fix Critical Security Issue.md new file mode 100644 index 0000000000..acb4e012b7 --- /dev/null +++ b/translated/news/Git 2.2.1 Released To Fix Critical Security Issue.md @@ -0,0 +1,24 @@ +Git 发布2.2.1版，修复严重安全问题 +================================================================================ +![](http://www.phoronix.com/assets/categories/freesoftware.jpg) + +Git 今天下午发布2.2.1版本，修复了Git客服端中一个严重的安全漏洞（原意为脆弱的）。幸运的是，这个漏洞虽然影响到了OS X 和Windows用户，却没有影响到Unix/Linux用户。 + +这次的Git漏洞影响那些使用Git客户端不区分大小写的文件系统。对大小写不敏感的平台，像Windows和OS X，传递.Git /config 可以覆盖用户的.Git /config，从而可能导致执行任意代码。幸运的是，大多数的Phoronix读者在Linux，感谢大小写敏感的文件系统，这就不是个问题了。 + +除了攻击不区分大小写的文件系统的，一些可能导致覆盖git 配置文件的字符出现了，Windows和OS X的HFS + 也会把某些字符串映射回.git文件。而Git 2.2.1版本就是解决这些问题。 + +更多的细节请戳[Git 2.2.1 release announcement][1] and [GitHub has additional details][2]. + +-------------------------------------------------------------------------------- +via: http://www.phoronix.com/scan.php?page=news_item&px=MTg2ODA + +作者：[Michael Larabel][a] +译者：[kingname](https://github.com/kingname) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.michaellarabel.com/ +[1]:http://article.gmane.org/gmane.linux.kernel/1853266 +[2]:https://github.com/blog/1938-git-client-vulnerability-announced From a66e60edaa77feb4feaa829983c6cd504912281d Mon Sep 17 00:00:00 2001 From: kingname Date: Mon, 12 Jan 2015 13:35:01 +0800 Subject: [PATCH 007/215] Delete 20141219 Git 2.2.1 Released To Fix Critical Security Issue.md --- ...Released To Fix Critical Security Issue.md | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 sources/news/20141219 Git 2.2.1 Released To Fix Critical Security Issue.md diff --git a/sources/news/20141219 Git 2.2.1 Released To Fix Critical Security Issue.md b/sources/news/20141219 Git 2.2.1 Released To Fix Critical Security Issue.md deleted file mode 100644 index 8fbfa1f071..0000000000 --- a/sources/news/20141219 Git 2.2.1 Released To Fix Critical Security Issue.md +++ /dev/null @@ -1,27 +0,0 @@ -Git 2.2.1 Released To Fix Critical Security Issue -================================================================================ -![](http://www.phoronix.com/assets/categories/freesoftware.jpg) - -Translating by kingname - -Git 2.2.1 was released this afternoon to fix a critical security vulnerability in Git clients. Fortunately, the vulnerability doesn't plague Unix/Linux users but rather OS X and Windows. - -Today's Git vulnerability affects those using the Git client on case-insensitive file-systems. On case-insensitive platforms like Windows and OS X, committing to .Git/config could overwrite the user's .git/config and could lead to arbitrary code execution. Fortunately with most Phoronix readers out there running Linux, this isn't an issue thanks to case-sensitive file-systems. - -Besides the attack vector from case insensitive file-systems, Windows and OS X's HFS+ would map some strings back to .git too if certain characters are present, which could lead to overwriting the Git config file. Git 2.2.1 addresses these issues. - -More details via the [Git 2.2.1 release announcement][1] and [GitHub has additional details][2]. - --------------------------------------------------------------------------------- - -via: http://www.phoronix.com/scan.php?page=news_item&px=MTg2ODA - -作者：[Michael Larabel][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.michaellarabel.com/ -[1]:http://article.gmane.org/gmane.linux.kernel/1853266 -[2]:https://github.com/blog/1938-git-client-vulnerability-announced From be147eb7fe0cb9e50940aa4b49618a280245db3e Mon Sep 17 00:00:00 2001 From: tinyeyeser Date: Mon, 12 Jan 2015 15:08:12 +0800 Subject: [PATCH 008/215] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9=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 原文真的很硬很难！译者已经翻译的很不错了~ 只是某些语句稍有逻辑上的语义错误。 我硬着头皮死啃半天，已尽量校对改正。 --- .../talk/20141108 When hackers grow old.md | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/translated/talk/20141108 When hackers grow old.md b/translated/talk/20141108 When hackers grow old.md index 1f34116808..28aabfa636 100644 --- a/translated/talk/20141108 When hackers grow old.md +++ b/translated/talk/20141108 When hackers grow old.md @@ -1,52 +1,52 @@ 黑客年暮 ================================================================================ -近来我一直在与某资深开源组织的各成员进行争斗，尽管密切关注我的人们会在读完本文后猜到是哪个组织，但我不会在这里说出这个组织的名字。 +近来我一直在与某资深开源开发团队中的多个成员缠斗，尽管密切关注我的人们会在读完本文后猜到是哪个组织，但我不会在这里说出这个组织的名字。 怎么让某些人进入 21 世纪就这么难呢？真是的... 我快56 岁了，也就是大部分年轻人会以为的我将时不时朝他们发出诸如“滚出我的草坪”之类歇斯底里咆哮的年龄。但事实并非如此 —— 我发现，尤其是在技术背景之下，我变得与我的年龄非常不相称。 -在我这个年龄的大部分人确实变成了爱发牢骚、墨守成规的老顽固。并且，尴尬的是，偶尔我会成为那个打断谈话的人，然后提出在 1995 年（或者在某些特殊情况下，1985 年）时很适合的方法... 但十年后就不是个好方法了。 +在我这个年龄的大部分人确实变成了爱发牢骚、墨守成规的老顽固。并且，尴尬的是，偶尔我会成为那个打断谈话的人，我会指出他们某个在 1995 年（或者在某些特殊情况下，1985 年）时很适合的方法... 几十年后的今天就不再是好方法了。 -为什么是我？因为我的同龄人里大部分人在孩童时期都没有什么名气。任何想要改变自己的人，就必须成为他们中具有较高思想觉悟的佼佼者。即便如此，在与习惯做斗争的过程中，我也比实际上花费了更多的时间。 +为什么是我？因为年轻人在我的同龄人中很难有什么说服力。如果有人想让那帮老头改变主意，首先他得是自己同龄人中具有较高思想觉悟的佼佼者。即便如此，在与习惯做斗争的过程中，我也比看起来花费了更多的时间。 年轻人犯下无知的错误是可以被原谅的。他们还年轻。年轻意味着缺乏经验，缺乏经验通常会导致片面的判断。我很难原谅那些经历了足够多本该有经验的人，却被长期的固化思维蒙蔽，无法发觉近在咫尺的东西。 -（补充一下：我真的不是老顽固。那些和我争论政治的，无论保守派还是非保守派都没有注意到这点，我觉得这颇有点嘲讽的意味。） +（补充一下：我真的不是保守党拥护者。那些和我争论政治的，无论保守党还是非保守党都没有注意到这点，我觉得这颇有点嘲讽的意味。） -那么，现在我们来讨论下 GNU 更新日志文件这件事。在 1985 年的时候，这是一个不错的主意，甚至可以说是必须的。当时的想法是用单独的更新日志文件来记录相关文件的变更情况。用这种方式来对那些存在版本缺失或者非常原始的版本进行版本控制确实不错。当时我也在场，所以我知道这些。 +那么，现在我们来讨论下 GNU 更新日志文件（ChangeLog）这件事。在 1985 年的时候，这是一个不错的主意，甚至可以说是必须的。当时的想法是用单独的更新日志条目来记录多个相关文件的变更情况。用这种方式来对那些存在版本缺失或者非常原始的版本进行版本控制确实不错。当时我也在场，所以我知道这些。 不过即使到了 1995 年，甚至 21 世纪早期，许多版本控制系统仍然没有太大改进。也就是说，这些版本控制系统并非对批量文件的变化进行分组再保存到一条记录上，而是对每个变化的文件分别进行记录并保存到不同的地方。CVS，当时被广泛使用的版本控制系统，仅仅是模拟日志变更 —— 并且在这方面表现得很糟糕，导致大多数人不再依赖这个功能。即便如此，更新日志文件的出现依然是必要的。 -但随后，版本控制系统 Subversion 于 2003 年发布 beta 版，并于 2004 年发布 1.0 正式版，Subversion 真正实现了更新日志记录功能，得到了人们的广泛认可。它与一年后兴起的分散式版本控制系统（Distributed Version Control System，DVCS）共同引发了主流世界的激烈争论。因为如果你在项目上同时使用了分散式版本控制与更新日志文件记录的功能，它们将会因为争夺相同元数据的控制权而产生不可预料的冲突。 +但随后，版本控制系统 Subversion 于 2003 年发布 beta 版，并于 2004 年发布 1.0 正式版，Subversion 真正实现了更新日志记录功能，得到了人们的广泛认可。它与一年后兴起的分布式版本控制系统（Distributed Version Control System，DVCS）共同引发了主流世界的激烈争论。因为如果你在项目上同时使用了分散式版本控制与更新日志文件记录的功能，它们将会因为争夺相同元数据的控制权而产生不可预料的冲突。 -另一种方法是对提交的评论日志进行授权。如果你这样做了，不久后你就会开始思忖为什么自己仍然对所有的日志更新条目进行记录。提交的元数据与变化的代码具有更好的相容性，毕竟这就是它当初设计的目的。 +有几种不同的方法可以折衷解决这个问题。一种是继续将更新日志作为代码变更的授权记录。这样一来，你基本上只能得到简陋的、形式上的提交评论数据。 + +另一种方法是对提交的评论日志进行授权。如果你这样做了，不久后你就会开始思忖为什么自己仍然对所有的日志更新条目进行记录。提交元数据与变化的代码具有更好的相容性，毕竟这才是当初设计它的目的。 （现在，试想有这样一个项目，同样本着把项目做得最好的想法，但两拨人却做出了完全不同的选择。因此你必须同时阅读更新日志和评论日志以了解到底发生了什么。最好在矛盾激化前把问题解决....） -第三种办法是尝试同时使用两种方法 —— 以另一种格式再次提交评论数据，作为更新日志提交的一部分。这解决了所有你期待的有代表性的问题，并且没有任何缺陷遗留下来；只要其中有拷贝文件损坏，日志文件就会修改，因此这不再是同步时数据匹配的问题，而且导致在其后参与进来的人试图搞清人们是怎么想的时候将会变得非常困惑。 +第三种办法是尝试同时使用以上两种方法 —— 在更新日志条目中，以稍微变化后的的格式复制一份评论数据，将其作为评论提交的一部分。这会导致各种你意想不到的问题，最具代表性的就是它不符合“真理的单点性（single point of truth）”原理；只要其中有拷贝文件损坏，或者日志文件条目被修改，这就不再是同步时数据匹配的问题，它将导致在其后参与进来的人试图搞清人们是怎么想的时候变得非常困惑。 -或者，如某个我就不说出具体名字的特定项目的高层开发只是通过电子邮件来完成这些，声明提交可以包含多个更新日志，以及提交的元数据与更新日志是无关的。这导致我们直到现在还得不断进行记录。 +或者，正如这个我就不说出具体名字的特定项目所做的，它的高层开发人员在电子邮件中最近声明说，提交可以包含多个更新日志条目，并且提交的元数据与更新日志是无关的。这导致我们直到现在还得不断进行记录。 -当我读到那条的时候我的眼光停在了那个地方。什么样的傻瓜才会没有意识到这是在自找麻烦 —— 事实上，针对更新日志文件采取的定制措施完全是不必要的，尤其是在分散式版本控制系统中 -有很好的浏览工具来阅读可靠的提交日志的时候。 +当时我读到邮件的时候都要吐了。什么样的傻瓜才会意识不到这是自找麻烦 —— 事实上，在DVCS中针对可靠的提交日志有很好的浏览工具，围绕更新日志文件的整个定制措施只会成为负担和拖累。 -唉，这是比较特殊的笨蛋：变老的并且思维僵化了的黑客。所有的合理化改革他都会极力反对。他所遵循的行事方法在十年前是有效的，但现在只能使得其反了。如果你试图解释不只是git的总摘要，还得正确掌握当前的各种工具才能完全弃用更新日志... 呵呵，准备好迎接无法忍受、无法想象的疯狂对话吧。 +唉，这是比较特殊的笨蛋：变老的并且思维僵化了的黑客。所有的合理化改革他都会极力反对。他所遵循的行事方法在几十年前是有效的，但现在只能适得其反。如果你试图向他解释这些不仅仅和git的摘要信息有关，同时还为了正确适应当前的工具集，以便实现更新日志的去条目化... 呵呵，那你就准备好迎接无法忍受、无法想象的疯狂对话吧。 -幸运的是这激怒了我。因为这点还有其他相关的胡言乱语使这个项目变成了很难完成的工作。而且，这类糟糕的事时常发生在年轻的开发者身上，这才是问题所在。相关 G+ 社群的数量已经达到了 4 位数，他们大部分都是孩子，他们也没有紧张起来。显然消息已经传到了外面；这个项目的开发者都是被莫名关注者的老牌黑客，同时还有很多对他们崇拜的人。 +的确，它成功激怒了我。这样那样的胡言乱语使这个项目变成了很难完成的工作。而且，同样的糟糕还体现在他们吸引年轻开发者的过程中，我认为这是真正的问题。相关 Google+ 社区的人员数量已经达到了 4 位数，他们大部分都是孩子，还没有成长起来。显然外界已经接受了这样的信息：这个项目的开发者都是部落中地位根深蒂固的崇高首领，最好的崇拜方式就是远远的景仰着他们。 -这件事给我的最大触动就是每当我要和这些老牌黑客较量时，我都会想：有一天我也会这样吗？或者更糟的是，我看到的只是如同镜子一般对我自己的真实写照，而我自己却浑然不觉吗？我的意思是，我的印象来自于他的网站，这个特殊的样本要比我年轻。通过十五年的仔细观察得出的结论。 +这件事给我的最大触动就是每当我要和这些部落首领较量时，我都会想：有一天我也会这样吗？或者更糟的是，我看到的只是如同镜子一般对我自己的真实写照，而我自己却浑然不觉？我的意思是，我所得到的印象来自于他的网站，这个特殊的笨蛋要比我年轻。年轻至少15岁呢。 -我觉得思路很清晰。当我和那些比我聪明的人打交道时我不会受挫，我只会因为那些不能跟上我的人而 -沮丧，这些人也不能看见事实。但这种自信也许只是邓宁·克鲁格效应的消极影响，至少我明白这点。很少有什么事情会让我感到害怕；而这件事在让我害怕的事情名单上是名列前茅的。 +我总是认为自己的思路很清晰。当我和那些比我聪明的人打交道时我不会受挫，我只会因为那些思路跟不上我、看不清事实的人而沮丧。但这种自信也许只是邓宁·克鲁格效应（Dunning-Krueger effect）在我身上的消极影响，我并不确定这意味着什么。很少有什么事情会让我感到害怕；而这件事在让我害怕的事情名单上是名列前茅的。 -另一件让人不安的事是当我逐渐变老的时候，这样的矛盾发生得越来越频繁。不知怎的，我希望我的黑客同行们能以更加优雅的姿态老去，即使身体老去也应该保持一颗年轻的心灵。有些人确实是这样；但可是绝大多数人都不是。真令人悲哀。 +另一件让人不安的事是当我逐渐变老的时候，这样的矛盾发生得越来越频繁。不知怎的，我希望我的黑客同行们能以更加优雅的姿态老去，即使身体老去也应该保持一颗年轻的心灵。有些人确实是这样；但可惜绝大多数人都不是。真令人悲哀。 我不确定我的职业生涯会不会完美收场。假如我最后成功避免了思维僵化（注意我说的是假如），我想我一定知道其中的部分原因，但我不确定这种模式是否可以被复制 —— 为了达成目的也许得在你的头脑中发生一些复杂的化学反应。尽管如此，无论对错，请听听我给年轻黑客以及其他有志青年的建议。 你们 —— 对的，也包括你 —— 一定无法在你中年老年的时候保持不错的心灵，除非你能很好的控制这点。你必须不断地去磨练你的内心、在你还年轻的时候完成自己的种种心愿，你必须把这些行为养成一种习惯直到你老去。 -有种说法是中年人锻炼身体的最佳时机是他进入中年的 30 年前。我以为同样的方法，坚持我以上所说的习惯能让你在 56 岁，甚至 65 岁的时候仍然保持灵活的头脑。挑战你的极限，使不断地挑战自己成为一种习惯。立刻离开安乐窝，由此当你以后真正需要它的时候你可以建立起自己的安乐窝。 +有种说法是中年人锻炼身体的最佳时机是30 岁以前。我以为同样的方法，坚持我以上所说的习惯能让你在 56 岁，甚至 65 岁的时候仍然保持灵活的头脑。挑战你的极限，使不断地挑战自己成为一种习惯。立刻离开安乐窝，由此当你以后真正需要它的时候你可以建立起自己的安乐窝。 你必须要清楚的了解这点；还有一个可选择的挑战是你选择一个可以实现的目标并且为了这个目标不断努力。这个月我要学习 Go 语言。不是指游戏，我早就玩儿过了（虽然玩儿的不是太好）。并不是因为工作需要，而是因为我觉得是时候来扩展下我自己了。 @@ -58,7 +58,7 @@ via: http://esr.ibiblio.org/?p=6485 作者：[Eric Raymond][a] 译者：[Stevearzh](https://github.com/Stevearzh) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Mr小眼儿](https://github.com/tinyeyeser) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 25d2d99051e2c5d7d5dc4cf32b3ecf73573e2923 Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 12 Jan 2015 15:57:42 +0800 Subject: [PATCH 009/215] PUB:20141108 When hackers grow old @Stevearzh --- .../20141108 When hackers grow old.md | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) rename {translated/talk => published}/20141108 When hackers grow old.md (75%) diff --git a/translated/talk/20141108 When hackers grow old.md b/published/20141108 When hackers grow old.md similarity index 75% rename from translated/talk/20141108 When hackers grow old.md rename to published/20141108 When hackers grow old.md index 28aabfa636..40cf39fdc9 100644 --- a/translated/talk/20141108 When hackers grow old.md +++ b/published/20141108 When hackers grow old.md @@ -1,24 +1,24 @@ -黑客年暮 +ESR：黑客年暮 ================================================================================ 近来我一直在与某资深开源开发团队中的多个成员缠斗，尽管密切关注我的人们会在读完本文后猜到是哪个组织，但我不会在这里说出这个组织的名字。 怎么让某些人进入 21 世纪就这么难呢？真是的... -我快56 岁了，也就是大部分年轻人会以为的我将时不时朝他们发出诸如“滚出我的草坪”之类歇斯底里咆哮的年龄。但事实并非如此 —— 我发现，尤其是在技术背景之下，我变得与我的年龄非常不相称。 +我快 56 岁了，也就是大部分年轻人会以为的我将时不时朝他们发出诸如“滚出我的草坪”之类歇斯底里咆哮的年龄。但事实并非如此 —— 我发现，尤其是在技术背景之下，我变得与我的年龄非常不相称。 在我这个年龄的大部分人确实变成了爱发牢骚、墨守成规的老顽固。并且，尴尬的是，偶尔我会成为那个打断谈话的人，我会指出他们某个在 1995 年（或者在某些特殊情况下，1985 年）时很适合的方法... 几十年后的今天就不再是好方法了。 为什么是我？因为年轻人在我的同龄人中很难有什么说服力。如果有人想让那帮老头改变主意，首先他得是自己同龄人中具有较高思想觉悟的佼佼者。即便如此，在与习惯做斗争的过程中，我也比看起来花费了更多的时间。 -年轻人犯下无知的错误是可以被原谅的。他们还年轻。年轻意味着缺乏经验，缺乏经验通常会导致片面的判断。我很难原谅那些经历了足够多本该有经验的人，却被长期的固化思维蒙蔽，无法发觉近在咫尺的东西。 +年轻人犯下无知的错误是可以被原谅的。他们还年轻。年轻意味着缺乏经验，缺乏经验通常会导致片面的判断。我很难原谅那些经历了足够多本该有经验的人，却被*长期的固化思维*蒙蔽，无法发觉近在咫尺的东西。 （补充一下：我真的不是保守党拥护者。那些和我争论政治的，无论保守党还是非保守党都没有注意到这点，我觉得这颇有点嘲讽的意味。） -那么，现在我们来讨论下 GNU 更新日志文件（ChangeLog）这件事。在 1985 年的时候，这是一个不错的主意，甚至可以说是必须的。当时的想法是用单独的更新日志条目来记录多个相关文件的变更情况。用这种方式来对那些存在版本缺失或者非常原始的版本进行版本控制确实不错。当时我也在场，所以我知道这些。 +那么，现在我们来讨论下 GNU 更新日志文件（ChangeLog）这件事。在 1985 年的时候，这是一个不错的主意，甚至可以说是必须的。当时的想法是用单独的更新日志条目来记录多个相关文件的变更情况。用这种方式来对那些存在版本缺失或者非常原始的版本进行版本控制确实不错。当时我也*在场*，所以我知道这些。 不过即使到了 1995 年，甚至 21 世纪早期，许多版本控制系统仍然没有太大改进。也就是说，这些版本控制系统并非对批量文件的变化进行分组再保存到一条记录上，而是对每个变化的文件分别进行记录并保存到不同的地方。CVS，当时被广泛使用的版本控制系统，仅仅是模拟日志变更 —— 并且在这方面表现得很糟糕，导致大多数人不再依赖这个功能。即便如此，更新日志文件的出现依然是必要的。 -但随后，版本控制系统 Subversion 于 2003 年发布 beta 版，并于 2004 年发布 1.0 正式版，Subversion 真正实现了更新日志记录功能，得到了人们的广泛认可。它与一年后兴起的分布式版本控制系统（Distributed Version Control System，DVCS）共同引发了主流世界的激烈争论。因为如果你在项目上同时使用了分散式版本控制与更新日志文件记录的功能，它们将会因为争夺相同元数据的控制权而产生不可预料的冲突。 +但随后，版本控制系统 Subversion 于 2003 年发布 beta 版，并于 2004 年发布 1.0 正式版，Subversion 真正实现了更新日志记录功能，得到了人们的广泛认可。它与一年后兴起的分布式版本控制系统（Distributed Version Control System，DVCS）共同引发了主流世界的激烈争论。因为如果你在项目上同时使用了分布式版本控制与更新日志文件记录的功能，它们将会因为争夺相同元数据的控制权而产生不可预料的冲突。 有几种不同的方法可以折衷解决这个问题。一种是继续将更新日志作为代码变更的授权记录。这样一来，你基本上只能得到简陋的、形式上的提交评论数据。 @@ -26,17 +26,17 @@ （现在，试想有这样一个项目，同样本着把项目做得最好的想法，但两拨人却做出了完全不同的选择。因此你必须同时阅读更新日志和评论日志以了解到底发生了什么。最好在矛盾激化前把问题解决....） -第三种办法是尝试同时使用以上两种方法 —— 在更新日志条目中，以稍微变化后的的格式复制一份评论数据，将其作为评论提交的一部分。这会导致各种你意想不到的问题，最具代表性的就是它不符合“真理的单点性（single point of truth）”原理；只要其中有拷贝文件损坏，或者日志文件条目被修改，这就不再是同步时数据匹配的问题，它将导致在其后参与进来的人试图搞清人们是怎么想的时候变得非常困惑。 +第三种办法是尝试同时使用以上两种方法 —— 在更新日志条目中，以稍微变化后的的格式复制一份评论数据，将其作为评论提交的一部分。这会导致各种你意想不到的问题，最具代表性的就是它不符合“真理的单点性（single point of truth）”原理；只要其中有拷贝文件损坏，或者日志文件条目被修改，这就不再是同步时数据匹配的问题，它将导致在其后参与进来的人试图搞清人们是怎么想的时候变得非常困惑。（LCTT 译注：《[程序员修炼之道][1]》（The Pragmatic Programmer）：任何一个知识点在系统内都应当有一个唯一、明确、权威的表述。根据Brian Kernighan的建议，把这个原则称为“真理的单点性（Single Point of Truth）”或者SPOT原则。） -或者，正如这个我就不说出具体名字的特定项目所做的，它的高层开发人员在电子邮件中最近声明说，提交可以包含多个更新日志条目，并且提交的元数据与更新日志是无关的。这导致我们直到现在还得不断进行记录。 +或者，正如这个*我就不说出具体名字的特定项目*所做的，它的高层开发人员在电子邮件中最近声明说，提交可以包含多个更新日志条目，并且提交的元数据与更新日志是无关的。这导致我们直到现在还得不断进行记录。 -当时我读到邮件的时候都要吐了。什么样的傻瓜才会意识不到这是自找麻烦 —— 事实上，在DVCS中针对可靠的提交日志有很好的浏览工具，围绕更新日志文件的整个定制措施只会成为负担和拖累。 +当时我读到邮件的时候都要吐了。什么样的傻瓜才会意识不到这是自找麻烦 —— 事实上，在 DVCS 中针对可靠的提交日志有很好的浏览工具，围绕更新日志文件的整个定制措施只会成为负担和拖累。 -唉，这是比较特殊的笨蛋：变老的并且思维僵化了的黑客。所有的合理化改革他都会极力反对。他所遵循的行事方法在几十年前是有效的，但现在只能适得其反。如果你试图向他解释这些不仅仅和git的摘要信息有关，同时还为了正确适应当前的工具集，以便实现更新日志的去条目化... 呵呵，那你就准备好迎接无法忍受、无法想象的疯狂对话吧。 +唉，这是比较特殊的笨蛋：变老的并且思维僵化了的黑客。所有的合理化改革他都会极力反对。他所遵循的行事方法在几十年前是有效的，但现在只能适得其反。如果你试图向他解释这些不仅仅和 git 的摘要信息有关，同时还为了正确适应当前的工具集，以便实现更新日志的去条目化... 呵呵，那你就准备好迎接无法忍受、无法想象的疯狂对话吧。 的确，它成功激怒了我。这样那样的胡言乱语使这个项目变成了很难完成的工作。而且，同样的糟糕还体现在他们吸引年轻开发者的过程中，我认为这是真正的问题。相关 Google+ 社区的人员数量已经达到了 4 位数，他们大部分都是孩子，还没有成长起来。显然外界已经接受了这样的信息：这个项目的开发者都是部落中地位根深蒂固的崇高首领，最好的崇拜方式就是远远的景仰着他们。 -这件事给我的最大触动就是每当我要和这些部落首领较量时，我都会想：有一天我也会这样吗？或者更糟的是，我看到的只是如同镜子一般对我自己的真实写照，而我自己却浑然不觉？我的意思是，我所得到的印象来自于他的网站，这个特殊的笨蛋要比我年轻。年轻至少15岁呢。 +这件事给我的最大触动就是每当我要和这些部落首领较量时，我都会想：有一天我也会这样吗？或者更糟的是，我看到的只是如同镜子一般对我自己的真实写照，而我自己却浑然不觉？我的意思是，我所得到的印象来自于他的网站，这个特殊的笨蛋要比我年轻。年轻至少 15 岁呢。 我总是认为自己的思路很清晰。当我和那些比我聪明的人打交道时我不会受挫，我只会因为那些思路跟不上我、看不清事实的人而沮丧。但这种自信也许只是邓宁·克鲁格效应（Dunning-Krueger effect）在我身上的消极影响，我并不确定这意味着什么。很少有什么事情会让我感到害怕；而这件事在让我害怕的事情名单上是名列前茅的。 @@ -44,9 +44,9 @@ 我不确定我的职业生涯会不会完美收场。假如我最后成功避免了思维僵化（注意我说的是假如），我想我一定知道其中的部分原因，但我不确定这种模式是否可以被复制 —— 为了达成目的也许得在你的头脑中发生一些复杂的化学反应。尽管如此，无论对错，请听听我给年轻黑客以及其他有志青年的建议。 -你们 —— 对的，也包括你 —— 一定无法在你中年老年的时候保持不错的心灵，除非你能很好的控制这点。你必须不断地去磨练你的内心、在你还年轻的时候完成自己的种种心愿，你必须把这些行为养成一种习惯直到你老去。 +你们——对的，也包括你——一定无法在你中年老年的时候保持不错的心灵，除非你能很好的控制这点。你必须不断地去磨练你的内心、在你还年轻的时候完成自己的种种心愿，你必须把这些行为养成一种习惯直到你老去。 -有种说法是中年人锻炼身体的最佳时机是30 岁以前。我以为同样的方法，坚持我以上所说的习惯能让你在 56 岁，甚至 65 岁的时候仍然保持灵活的头脑。挑战你的极限，使不断地挑战自己成为一种习惯。立刻离开安乐窝，由此当你以后真正需要它的时候你可以建立起自己的安乐窝。 +有种说法是中年人锻炼身体的最佳时机是 30 岁以前。我以为同样的方法，坚持我以上所说的习惯能让你在 56 岁，甚至 65 岁的时候仍然保持灵活的头脑。挑战你的极限，使不断地挑战自己成为一种习惯。立刻离开安乐窝，由此当你以后真正需要它的时候你可以建立起自己的安乐窝。 你必须要清楚的了解这点；还有一个可选择的挑战是你选择一个可以实现的目标并且为了这个目标不断努力。这个月我要学习 Go 语言。不是指游戏，我早就玩儿过了（虽然玩儿的不是太好）。并不是因为工作需要，而是因为我觉得是时候来扩展下我自己了。 @@ -63,3 +63,4 @@ via: http://esr.ibiblio.org/?p=6485 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://esr.ibiblio.org/?author=2 +[1]:http://book.51cto.com/art/200809/88490.htm From 084da04255f655f28e59880c705bfec6f061d7a7 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 12 Jan 2015 16:16:14 +0800 Subject: [PATCH 010/215] =?UTF-8?q?20150112-4=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inus Tells Wired Leap Second Irrelevant.md | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 sources/talk/20150112 Linus Tells Wired Leap Second Irrelevant.md diff --git a/sources/talk/20150112 Linus Tells Wired Leap Second Irrelevant.md b/sources/talk/20150112 Linus Tells Wired Leap Second Irrelevant.md new file mode 100644 index 0000000000..ee1516c474 --- /dev/null +++ b/sources/talk/20150112 Linus Tells Wired Leap Second Irrelevant.md @@ -0,0 +1,29 @@ +Linus Tells Wired Leap Second Irrelevant +================================================================================ +![](https://farm4.staticflickr.com/3852/14863156322_a354770b14_o.jpg) + +Two larger publications today featured Linux and the effect of the upcoming leap second. The Register today said that the leap second effects of the past are no longer an issue. Coincidentally, Wired talked to Linus Torvalds about the same issue today as well. + +**Linus Torvalds** spoke with Wired's Robert McMillan about the approaching leap second due to be added in June. The Register said the last leap second in 2012 took out Mozilla, StumbleUpon, Yelp, FourSquare, Reddit and LinkedIn as well as several major airlines and travel reservation services that ran Linux. Torvalds told Wired today that the kernel is patched and he doesn't expect too many issues this time around. [He said][1], "Just take the leap second as an excuse to have a small nonsensical party for your closest friends. Wear silly hats, get a banner printed, and get silly drunk. That’s exactly how relevant it should be to most people." + +**However**, The Register said not everyone agrees with Torvalds' sentiments. They quote Daily Mail saying, "The year 2015 will have an extra second — which could wreak havoc on the infrastructure powering the Internet," then remind us of the Y2K scare that ended up being a non-event. The Register's Gavin [Clarke concluded][2]: + +> No reason the Penguins were caught sans pants. + +> Now they've gone belt and braces. + +The take-away is: move along, nothing to see here. + +-------------------------------------------------------------------------------- + +via: http://ostatic.com/blog/linus-tells-wired-leap-second-irrelevant + +作者：[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]:http://www.wired.com/2015/01/torvalds_leapsecond/ +[2]:http://www.theregister.co.uk/2015/01/09/leap_second_bug_linux_hysteria/ \ No newline at end of file From e4ab9d2c783c25c1823da7c78fb49b1b66c16f7c Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 12 Jan 2015 16:28:48 +0800 Subject: [PATCH 011/215] =?UTF-8?q?20150112-5=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ff -u--What's New in Kernel Development.md | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 sources/talk/20150112 diff -u--What's New in Kernel Development.md diff --git a/sources/talk/20150112 diff -u--What's New in Kernel Development.md b/sources/talk/20150112 diff -u--What's New in Kernel Development.md new file mode 100644 index 0000000000..2e6f8e3480 --- /dev/null +++ b/sources/talk/20150112 diff -u--What's New in Kernel Development.md @@ -0,0 +1,36 @@ +diff -u: What's New in Kernel Development +================================================================================ +**David Drysdale** wanted to add Capsicum security features to Linux after he noticed that FreeBSD already had Capsicum support. Capsicum defines fine-grained security privileges, not unlike filesystem capabilities. But as David discovered, Capsicum also has some controversy surrounding it. + +Capsicum has been around for a while and was described in a USENIX paper in 2010: [http://www.cl.cam.ac.uk/research/security/capsicum/papers/2010usenix-security-capsicum-website.pdf][1]. + +Part of the controversy is just because of the similarity with capabilities. As Eric Biderman pointed out during the discussion, it would be possible to implement features approaching Capsicum's as an extension of capabilities, but implementing Capsicum directly would involve creating a whole new (and extensive) abstraction layer in the kernel. Although David argued that capabilities couldn't actually be extended far enough to match Capsicum's fine-grained security controls. + +Capsicum also was controversial within its own developer community. For example, as Eric described, it lacked a specification for how to revoke privileges. And, David pointed out that this was because the community couldn't agree on how that could best be done. David quoted an e-mail sent by Ben Laurie to the cl-capsicum-discuss mailing list in 2011, where Ben said, "It would require additional book-keeping to find and revoke outstanding capabilities, which requires knowing how to reach capabilities, and then whether they are derived from the capability being revoked. It also requires an authorization model for revocation. The former two points mean additional overhead in terms of data structure operations and synchronisation." + +Given the ongoing controversy within the Capsicum developer community and the corresponding lack of specification of key features, and given the existence of capabilities that already perform a similar function in the kernel and the invasiveness of Capsicum patches, Eric was opposed to David implementing Capsicum in Linux. + +But, given the fact that capabilities are much coarser-grained than Capsicum's security features, to the point that capabilities can't really be extended far enough to mimic Capsicum's features, and given that FreeBSD already has Capsicum implemented in its kernel, showing that it can be done and that people might want it, it seems there will remain a lot of folks interested in getting Capsicum into the Linux kernel. + +Sometimes it's unclear whether there's a bug in the code or just a bug in the written specification. Henrique de Moraes Holschuh noticed that the Intel Software Developer Manual (vol. 3A, section 9.11.6) said quite clearly that microcode updates required 16-byte alignment for the P6 family of CPUs, the Pentium 4 and the Xeon. But, the code in the kernel's microcode driver didn't enforce that alignment. + +In fact, Henrique's investigation uncovered the fact that some Intel chips, like the Xeon X5550 and the second-generation i5 chips, needed only 4-byte alignment in practice, and not 16. However, to conform to the documented specification, he suggested fixing the kernel code to match the spec. + +Borislav Petkov objected to this. He said Henrique was looking for problems where there weren't any. He said that Henrique simply had discovered a bug in Intel's documentation, because the alignment issue clearly wasn't a problem in the real world. He suggested alerting the Intel folks to the documentation problem and moving on. As he put it, "If the processor accepts the non-16-byte-aligned update, why do you care?" + +But, as H. Peter Anvin remarked, the written spec was Intel's guarantee that certain behaviors would work. If the kernel ignored the spec, it could lead to subtle bugs later on. And, Bill Davidsen said that if the kernel ignored the alignment requirement, and "if the requirement is enforced in some future revision, and updates then fail in some insane way, the vendor is justified in claiming 'I told you so'." + +The end result was that Henrique sent in some patches to make the microcode driver enforce the 16-byte alignment requirement. + +-------------------------------------------------------------------------------- + +via: http://www.linuxjournal.com/content/diff-u-whats-new-kernel-development-6 + +作者：[Zack Brown][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.linuxjournal.com/user/801501 +[1]:http://www.cl.cam.ac.uk/research/security/capsicum/papers/2010usenix-security-capsicum-website.pdf \ No newline at end of file From fa37f1d36d87feac22d7cf7d329c89c4bb337271 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Mon, 12 Jan 2015 21:28:33 +0800 Subject: [PATCH 012/215] translating --- ...4 How to configure fail2ban to protect Apache HTTP server.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md b/sources/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md index 9bbf00198b..72d7dafab8 100644 --- a/sources/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md +++ b/sources/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md @@ -1,3 +1,5 @@ +Translating-----geekpi + How to configure fail2ban to protect Apache HTTP server ================================================================================ An Apache HTTP server in production environments can be under attack in various different ways. Attackers may attempt to gain access to unauthorized or forbidden directories by using brute-force attacks or executing evil scripts. Some malicious bots may scan your websites for any security vulnerability, or collect email addresses or web forms to send spams to. From 906b9250f68b24cede6a0ef1c15d73e6f149e301 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Mon, 12 Jan 2015 22:21:29 +0800 Subject: [PATCH 013/215] translated --- ... fail2ban to protect Apache HTTP server.md | 209 ------------------ ... fail2ban to protect Apache HTTP server.md | 207 +++++++++++++++++ 2 files changed, 207 insertions(+), 209 deletions(-) delete mode 100644 sources/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md create mode 100644 translated/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md diff --git a/sources/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md b/sources/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md deleted file mode 100644 index 72d7dafab8..0000000000 --- a/sources/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md +++ /dev/null @@ -1,209 +0,0 @@ -Translating-----geekpi - -How to configure fail2ban to protect Apache HTTP server -================================================================================ -An Apache HTTP server in production environments can be under attack in various different ways. Attackers may attempt to gain access to unauthorized or forbidden directories by using brute-force attacks or executing evil scripts. Some malicious bots may scan your websites for any security vulnerability, or collect email addresses or web forms to send spams to. - -Apache HTTP server comes with comprehensive logging capabilities capturing various abnormal events indicative of such attacks. However, it is still non-trivial to systematically parse detailed Apache logs and react to potential attacks quickly (e.g., ban/unban offending IP addresses) as they are perpetrated in the wild. That is when `fail2ban` comes to the rescue, making a sysadmin's life easier. - -`fail2ban` is an open-source intrusion prevention tool which detects various attacks based on system logs and automatically initiates prevention actions e.g., banning IP addresses with `iptables`, blocking connections via /etc/hosts.deny, or notifying the events via emails. fail2ban comes with a set of predefined "jails" which use application-specific log filters to detect common attacks. You can also write custom jails to deter any specific attack on an arbitrary application. - -In this tutorial, I am going to demonstrate how you can configure fail2ban to protect your Apache HTTP server. I assume that you have Apache HTTP server and fail2ban already installed. Refer to [another tutorial][1] for fail2ban installation. - -### What is a Fail2ban Jail ### - -Let me go over more detail on fail2ban jails. A jail defines an application-specific policy under which fail2ban triggers an action to protect a given application. fail2ban comes with several jails pre-defined in /etc/fail2ban/jail.conf, for popular applications such as Apache, Dovecot, Lighttpd, MySQL, Postfix, [SSH][2], etc. Each jail relies on application-specific log filters (found in /etc/fail2ban/fileter.d) to detect common attacks. Let's check out one example jail: SSH jail. - - [ssh] - enabled = true - port = ssh - filter = sshd - logpath = /var/log/auth.log - maxretry = 6 - banaction = iptables-multiport - -This SSH jail configuration is defined with several parameters: - -- **[ssh]**: the name of a jail with square brackets. -- **enabled**: whether the jail is activated or not. -- **port**: a port number to protect (either numeric number of well-known name). -- **filter**: a log parsing rule to detect attacks with. -- **logpath**: a log file to examine. -- **maxretry**: maximum number of failures before banning. -- **banaction**: a banning action. - -Any parameter defined in a jail configuration will override a corresponding `fail2ban-wide` default parameter. Conversely, any parameter missing will be assgined a default value defined in [DEFAULT] section. - -Predefined log filters are found in /etc/fail2ban/filter.d, and available actions are in /etc/fail2ban/action.d. - -![](https://farm8.staticflickr.com/7538/16076581722_cbca3c1307_b.jpg) - -If you want to overwrite `fail2ban` defaults or define any custom jail, you can do so by creating **/etc/fail2ban/jail.local** file. In this tutorial, I am going to use /etc/fail2ban/jail.local. - -### Enable Predefined Apache Jails ### - -Default installation of `fail2ban` offers several predefined jails and filters for Apache HTTP server. I am going to enable those built-in Apache jails. Due to slight differences between Debian and Red Hat configurations, let me provide fail2ban jail configurations for them separately. - -#### Enable Apache Jails on Debian or Ubuntu #### - -To enable predefined Apache jails on a Debian-based system, create /etc/fail2ban/jail.local as follows. - - $ sudo vi /etc/fail2ban/jail.local - ----------- - - # detect password authentication failures - [apache] - enabled = true - port = http,https - filter = apache-auth - logpath = /var/log/apache*/*error.log - maxretry = 6 - - # detect potential search for exploits and php vulnerabilities - [apache-noscript] - enabled = true - port = http,https - filter = apache-noscript - logpath = /var/log/apache*/*error.log - maxretry = 6 - - # detect Apache overflow attempts - [apache-overflows] - enabled = true - port = http,https - filter = apache-overflows - logpath = /var/log/apache*/*error.log - maxretry = 2 - - # detect failures to find a home directory on a server - [apache-nohome] - enabled = true - port = http,https - filter = apache-nohome - logpath = /var/log/apache*/*error.log - maxretry = 2 - -Since none of the jails above specifies an action, all of these jails will perform a default action when triggered. To find out the default action, look for "banaction" under [DEFAULT] section in /etc/fail2ban/jail.conf. - - banaction = iptables-multiport - -In this case, the default action is iptables-multiport (defined in /etc/fail2ban/action.d/iptables-multiport.conf). This action bans an IP address using iptables with multiport module. - -After enabling jails, you must restart fail2ban to load the jails. - - $ sudo service fail2ban restart - -#### Enable Apache Jails on CentOS/RHEL or Fedora #### - -To enable predefined Apache jails on a Red Hat based system, create /etc/fail2ban/jail.local as follows. - - $ sudo vi /etc/fail2ban/jail.local - ----------- - - # detect password authentication failures - [apache] - enabled = true - port = http,https - filter = apache-auth - logpath = /var/log/httpd/*error_log - maxretry = 6 - - # detect spammer robots crawling email addresses - [apache-badbots] - enabled = true - port = http,https - filter = apache-badbots - logpath = /var/log/httpd/*access_log - bantime = 172800 - maxretry = 1 - - # detect potential search for exploits and php vulnerabilities - [apache-noscript] - enabled = true - port = http,https - filter = apache-noscript - logpath = /var/log/httpd/*error_log - maxretry = 6 - - # detect Apache overflow attempts - [apache-overflows] - enabled = true - port = http,https - filter = apache-overflows - logpath = /var/log/httpd/*error_log - maxretry = 2 - - # detect failures to find a home directory on a server - [apache-nohome] - enabled = true - port = http,https - filter = apache-nohome - logpath = /var/log/httpd/*error_log - maxretry = 2 - - # detect failures to execute non-existing scripts that - # are associated with several popular web services - # e.g. webmail, phpMyAdmin, WordPress - port = http,https - filter = apache-botsearch - logpath = /var/log/httpd/*error_log - maxretry = 2 - -Note that the default action for all these jails is iptables-multiport (defined as "banaction" under [DEFAULT] in /etc/fail2ban/jail.conf). This action bans an IP address using iptables with multiport module. - -After enabling jails, you must restart fail2ban to load the jails in fail2ban. - -On Fedora or CentOS/RHEL 7: - - $ sudo systemctl restart fail2ban - -On CentOS/RHEL 6: - - $ sudo service fail2ban restart - -### Check and Manage Fail2ban Banning Status ### - -Once jails are activated, you can monitor current banning status with fail2ban-client command-line tool. - -To see a list of active jails: - - $ sudo fail2ban-client status - -To see the status of a particular jail (including banned IP list): - - $ sudo fail2ban-client status [name-of-jail] - -![](https://farm8.staticflickr.com/7572/15891521967_5c6cbc5f8f_c.jpg) - -You can also manually ban or unban IP addresses. - -To ban an IP address with a particular jail: - - $ sudo fail2ban-client set [name-of-jail] banip [ip-address] - -To unban an IP address blocked by a particular jail: - - $ sudo fail2ban-client set [name-of-jail] unbanip [ip-address] - -### Summary ### - -This tutorial explains how a fail2ban jail works and how to protect an Apache HTTP server using built-in Apache jails. Depending on your environments and types of web services you need to protect, you may need to adapt existing jails, or write custom jails and log filters. Check outfail2ban's [official Github page][3] for more up-to-date examples of jails and filters. - -Are you using fail2ban in any production environment? Share your experience. - --------------------------------------------------------------------------------- - -via: http://xmodulo.com/configure-fail2ban-apache-http-server.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://xmodulo.com/how-to-protect-ssh-server-from-brute-force-attacks-using-fail2ban.html -[2]:http://xmodulo.com/how-to-protect-ssh-server-from-brute-force-attacks-using-fail2ban.html -[3]:https://github.com/fail2ban/fail2ban \ No newline at end of file diff --git a/translated/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md b/translated/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md new file mode 100644 index 0000000000..8f89c4b388 --- /dev/null +++ b/translated/tech/20150104 How to configure fail2ban to protect Apache HTTP server.md @@ -0,0 +1,207 @@ +如何配置fail2ban来保护Apache服务器 +================================================================================ +生产环境中的Apache服务器可能会受到不同的攻击。攻击者或许试图通过暴力攻击或者执行恶意脚本来获取未经授权或者禁止访问的目录。一些恶意爬虫或许会扫描你网站下的任意安全漏洞，或者手机email地址或者web表格来发送垃圾邮件。 + +Apache服务器具有综合的日志功能来捕捉不同表明是攻击的异常事件。然而，它还不能系统地解析具体的apache日志并迅速地反应到潜在的攻击（比如，禁止/解禁IP地址）。这时候`fail2ban`可以解救这一切，解放了系统管理员的工作。 + +`fail2ban`是一款入侵防御工具，可以基于系统日志检测不同的工具并且可以自动采取保护措施比如：通过`iptables`禁止ip、阻止/etc/hosts.deny中的连接、或者通过邮件通知事件。fail2ban具有一系列预定义的“监狱”，它使用特定程序日志过滤器来检测通常的攻击。你也可以编写自定义的规则来检测来自任意程序的攻击。 + +在本教程中，我会演示如何配置fail2ban来保护你的apache服务器。我假设你已经安装了apache和fail2ban。对于安装，请参考[另外一篇教程][1]。 + +### 什么是 Fail2ban 监狱 ### + +让我们更深入地了解fail2ban监狱。监狱定义了具体的应用策略，它会为指定的程序触发一个保护措施。fail2ban在/etc/fail2ban/jail.conf 下为一些流行程序如Apache、Dovecot、Lighttpd、MySQL、Postfix、[SSH][2]等预定义了一些监狱。每个依赖于特定的程序日志过滤器（在/etc/fail2ban/fileter.d 下面）来检测通常的攻击。让我看一个例子监狱：SSH监狱。 + + [ssh] + enabled = true + port = ssh + filter = sshd + logpath = /var/log/auth.log + maxretry = 6 + banaction = iptables-multiport + +SSH监狱的配置定义了这些参数： + +- **[ssh]**： 方括号内是监狱的名字。 +- **enabled**：是否启用监狱 +- **port**： 端口的数字 (或者数字对应的名称). +- **filter**： 检测攻击的检测规则 +- **logpath**： 检测的日志文件 +- **maxretry**： 禁止前失败的最大数字 +- **banaction**： 禁止操作 + +定义配置文件中的任意参数都会覆盖相应的默认配置`fail2ban-wide` 中的参数。相反，任意缺少的参数都会使用定义在[DEFAULT]字段的值。 + +预定义日志过滤器都必须在/etc/fail2ban/filter.d，可以采取的操作在/etc/fail2ban/action.d。 + +![](https://farm8.staticflickr.com/7538/16076581722_cbca3c1307_b.jpg) + +如果你想要覆盖`fail2ban`的默认操作或者定义任何自定义监狱，你可以创建*/etc/fail2ban/jail.local**文件。本篇教程中，我会使用/etc/fail2ban/jail.local。 + +### 启用预定义的apache监狱 ### + +`fail2ban`的默认安装为Apache服务提供了一些预定义监狱以及过滤器。我要启用这些内建的Apache监狱。由于Debian和红买配置的稍微不同，我会分别它们的配置文件。 + +#### 在Debian 或者 Ubuntu启用Apache监狱 #### + +要在基于Debian的系统上启用预定义的apache监狱，如下创建/etc/fail2ban/jail.local。 + + $ sudo vi /etc/fail2ban/jail.local + +---------- + + # detect password authentication failures + [apache] + enabled = true + port = http,https + filter = apache-auth + logpath = /var/log/apache*/*error.log + maxretry = 6 + + # detect potential search for exploits and php vulnerabilities + [apache-noscript] + enabled = true + port = http,https + filter = apache-noscript + logpath = /var/log/apache*/*error.log + maxretry = 6 + + # detect Apache overflow attempts + [apache-overflows] + enabled = true + port = http,https + filter = apache-overflows + logpath = /var/log/apache*/*error.log + maxretry = 2 + + # detect failures to find a home directory on a server + [apache-nohome] + enabled = true + port = http,https + filter = apache-nohome + logpath = /var/log/apache*/*error.log + maxretry = 2 + +由于上面的监狱没有指定措施，这些监狱都将会触发默认的措施。要查看默认的措施，在/etc/fail2ban/jail.conf中的[DEFAULT]下找到“banaction”。 + + banaction = iptables-multiport + +本例中，默认的操作是iptables-multiport（定义在/etc/fail2ban/action.d/iptables-multiport.conf）。这个措施使用iptable的多端口模块禁止一个IP地址。 + +在启用监狱后，你必须重启fail2ban来加载监狱。 + + $ sudo service fail2ban restart + +#### 在CentOS/RHEL 或者 Fedora中启用Apache监狱 #### + +要在基于红帽的系统中启用预定义的监狱，如下创建/etc/fail2ban/jail.local。 + + $ sudo vi /etc/fail2ban/jail.local + +---------- + + # detect password authentication failures + [apache] + enabled = true + port = http,https + filter = apache-auth + logpath = /var/log/httpd/*error_log + maxretry = 6 + + # detect spammer robots crawling email addresses + [apache-badbots] + enabled = true + port = http,https + filter = apache-badbots + logpath = /var/log/httpd/*access_log + bantime = 172800 + maxretry = 1 + + # detect potential search for exploits and php vulnerabilities + [apache-noscript] + enabled = true + port = http,https + filter = apache-noscript + logpath = /var/log/httpd/*error_log + maxretry = 6 + + # detect Apache overflow attempts + [apache-overflows] + enabled = true + port = http,https + filter = apache-overflows + logpath = /var/log/httpd/*error_log + maxretry = 2 + + # detect failures to find a home directory on a server + [apache-nohome] + enabled = true + port = http,https + filter = apache-nohome + logpath = /var/log/httpd/*error_log + maxretry = 2 + + # detect failures to execute non-existing scripts that + # are associated with several popular web services + # e.g. webmail, phpMyAdmin, WordPress + port = http,https + filter = apache-botsearch + logpath = /var/log/httpd/*error_log + maxretry = 2 + +注意这些监狱文件默认的操作是iptables-multiport（定义在/etc/fail2ban/jail.conf中[DEFAULT]字段下的“banaction”中）。这个措施使用iptable的多端口模块禁止一个IP地址。 + +启用监狱后，你必须重启fail2ban来加载监狱。 + +在 Fedora 或者 CentOS/RHEL 7中： + + $ sudo systemctl restart fail2ban + +在 CentOS/RHEL 6中： + + $ sudo service fail2ban restart + +### 检查和管理fail2ban禁止状态 ### + +监狱一旦激活后，你可以用fail2ban的客户端命令行工具来监测当前的禁止状态。 + +查看激活的监狱列表： + + $ sudo fail2ban-client status + +查看特定监狱的状态（包含禁止的IP列表）： + + $ sudo fail2ban-client status [监狱名] + +![](https://farm8.staticflickr.com/7572/15891521967_5c6cbc5f8f_c.jpg) + +你也可以手动禁止或者解禁IP地址 + +要用制定监狱禁止IP： + + $ sudo fail2ban-client set [name-of-jail] banip [ip-address] + +要解禁指定监狱屏蔽的IP： + + $ sudo fail2ban-client set [name-of-jail] unbanip [ip-address] + +### 总结 ### + +本篇教程解释了fail2ban监狱如何工作以及如何使用内置的监狱来保护Apache服务器。依赖于你的环境以及要保护的web服务器类型，你或许要适配已存在的监狱或者编写自定义监狱和日志过滤器。查看outfail2ban的[官方Github页面][3]来获取最新的监狱和过滤器示例。 + +你有在生产环境中使用fail2ban么？分享一下你的经验吧。 + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/configure-fail2ban-apache-http-server.html + +作者：[Dan Nanni][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/nanni +[1]:http://xmodulo.com/how-to-protect-ssh-server-from-brute-force-attacks-using-fail2ban.html +[2]:http://xmodulo.com/how-to-protect-ssh-server-from-brute-force-attacks-using-fail2ban.html +[3]:https://github.com/fail2ban/fail2ban \ No newline at end of file From 4b5c782737d159ad6694bdbc77b7629f8f658ef3 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Tue, 13 Jan 2015 11:27:50 +0800 Subject: [PATCH 014/215] translating --- .../20150112 How to Find and Remove Duplicate Files on Linux.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md b/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md index f974f6fca9..4eb85aeed1 100644 --- a/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md +++ b/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md @@ -1,3 +1,5 @@ +Translating-----geekpi + How to Find and Remove Duplicate Files on Linux ================================================================================ Hi all, today we're gonna learn how to find and remove duplicate files on you Linux PC or Server. So, here's a tool that you may use anyone of them according to your needs and comfort. From 6dcb07d9209b867b8e73ded0ef15e3fe7f216a73 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Tue, 13 Jan 2015 11:57:38 +0800 Subject: [PATCH 015/215] translated --- ...ind and Remove Duplicate Files on Linux.md | 95 ------------------- ...ind and Remove Duplicate Files on Linux.md | 93 ++++++++++++++++++ 2 files changed, 93 insertions(+), 95 deletions(-) delete mode 100644 sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md create mode 100644 translated/tech/20150112 How to Find and Remove Duplicate Files on Linux.md diff --git a/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md b/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md deleted file mode 100644 index 4eb85aeed1..0000000000 --- a/sources/tech/20150112 How to Find and Remove Duplicate Files on Linux.md +++ /dev/null @@ -1,95 +0,0 @@ -Translating-----geekpi - -How to Find and Remove Duplicate Files on Linux -================================================================================ -Hi all, today we're gonna learn how to find and remove duplicate files on you Linux PC or Server. So, here's a tool that you may use anyone of them according to your needs and comfort. - -Whether you’re using Linux on your desktop or a server, there are good tools that will scan your system for duplicate files and help you remove them to free up space. Solid graphical and command-line interfaces are both available. Duplicate files are an unnecessary waste of disk space. After all, if you really need the same file in two different locations you could always set up a symbolic link or hard link, storing the data in only one location on disk. - -### FSlint ### - -[FSlint][1] is available in various Linux distributions binary repository, including Ubuntu, Debian, Fedora, and Red Hat. Just fire up your package manager and install the “fslint” package. This utility provides a convenient graphical interface by default and it also includes command-line versions of its various functions. - -Don’t let that scare you away from using FSlint’s convenient graphical interface, though. By default, it opens with the Duplicates pane selected and your home directory as the default search path. - -To install fslint, as I am running ubuntu, here is the default command: - - $ sudo apt-get install fslint - -But here are installation commands for other linux distributions: - -Debian: - - svn checkout http://fslint.googlecode.com/svn/trunk/ fslint-2.45 - cd fslint-2.45 - dpkg-buildpackage -I.svn -rfakeroot -tc - sudo dpkg -i ../fslint_2.45-1_all.deb - -Fedora: - - sudo yum install fslint - -For OpenSuse: - - [ -f /etc/mandrake-release ] && pkg=rpm - [ -f /etc/SuSE-release ] && pkg=packages - wget http://www.pixelbeat.org/fslint/fslint-2.42.tar.gz - sudo rpmbuild -ta fslint-2.42.tar.gz - sudo rpm -Uvh /usr/src/$pkg/RPMS/noarch/fslint-2.42-1.*.noarch.rpm - -For Other Distro: - - wget http://www.pixelbeat.org/fslint/fslint-2.44.tar.gz - tar -xzf fslint-2.44.tar.gz - cd fslint-2.44 - (cd po && make) - ./fslint-gui - -To run fslint in GUI version run fslint-gui in Ubuntu, run command (Alt+F2) or terminal: - - $ fslint-gui - -By default, it opens with the Duplicates pane selected and your home directory as the default search path. All you have to do is click the Find button and FSlint will find a list of duplicate files in directories under your home folder. - -![Delete Duplicate files with Fslint](http://blog.linoxide.com/wp-content/uploads/2015/01/delete-duplicates-fslint.png) - -Use the buttons to delete any files you want to remove, and double-click them to preview them. - -Finally, you are done. Hurray, we have sucessfully removed duplicate files from your system. - -**Note** that the command-line utilities aren’t in your path by default, so you can’t run them like typical commands. On Ubuntu, you’ll find them under /usr/share/fslint/fslint. So, if you wanted to run the entire fslint scan on a single directory, here are the commands you’d run on Ubuntu: - - cd /usr/share/fslint/fslint - - ./fslint /path/to/directory - -**This command won’t actually delete anything. It will just print a list of duplicate files — you’re on your own for the rest.** - - $ /usr/share/fslint/fslint/findup --help - find dUPlicate files. - Usage: findup [[[-t [-m|-d]] | [--summary]] [-r] [-f] paths(s) ...] - - If no path(s) specified then the current directory is assumed. - - When -m is specified any found duplicates will be merged (using hardlinks). - When -d is specified any found duplicates will be deleted (leaving just 1). - When -t is specfied, only report what -m or -d would do. - When --summary is specified change output format to include file sizes. - You can also pipe this summary format to /usr/share/fslint/fslint/fstool/dupwaste - to get a total of the wastage due to duplicates. - -![fslint help](http://blog.linoxide.com/wp-content/uploads/2015/01/fslint-help.png) - --------------------------------------------------------------------------------- - -via: http://linoxide.com/file-system/find-remove-duplicate-files-linux/ - -作者：[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.pixelbeat.org/fslint/ -[2]:http://www.pixelbeat.org/fslint/fslint-2.42.tar.gz \ No newline at end of file diff --git a/translated/tech/20150112 How to Find and Remove Duplicate Files on Linux.md b/translated/tech/20150112 How to Find and Remove Duplicate Files on Linux.md new file mode 100644 index 0000000000..7e0b96c45f --- /dev/null +++ b/translated/tech/20150112 How to Find and Remove Duplicate Files on Linux.md @@ -0,0 +1,93 @@ +如何在Linux上找出并删除重复的文件 +================================================================================ +大家好，今天我们会学习如何在Linux PC或者服务器上找出和删除重复文件。这里有一款工具你可以工具自己的需要使用。 + +无论你是否正在使用Linux桌面或者服务器，有一些很好的工具能一帮你扫描系统中的重复文件并删除它们来释放空间。图形界面和命令行界面的都有。重复文件是磁盘空间不必要的浪费。毕竟，如果你的确需要在不同的位置享有同一个文件，你可以使用软链接或者硬链接，这样就可以这样就可以在磁盘的一处地方存储数据了。 + +### FSlint ### + +[FSlint][1] 在不同的Linux发行办二进制仓库中都有，包括Ubuntu、Debian、Fedora和Red Hat。只需你运行你的包管理器并安装“fslint”包就行。这个工具默认提供了一个简单的图形化界面，同样也有包含各种功能的命令行版本。 + +不要让它让你害怕使用FSlint的图形化界面。默认情况下，它会自动选中Duplicate窗格，并以你的家目录作为搜索路径。 + +要安装fslint，若像我这样运行的是Ubuntu，这里是默认的命令： + + $ sudo apt-get install fslint + +这里还有针对其他发行版的安装命令： + +Debian： + + svn checkout http://fslint.googlecode.com/svn/trunk/ fslint-2.45 + cd fslint-2.45 + dpkg-buildpackage -I.svn -rfakeroot -tc + sudo dpkg -i ../fslint_2.45-1_all.deb + +Fedora： + + sudo yum install fslint + +For OpenSuse： + + [ -f /etc/mandrake-release ] && pkg=rpm + [ -f /etc/SuSE-release ] && pkg=packages + wget http://www.pixelbeat.org/fslint/fslint-2.42.tar.gz + sudo rpmbuild -ta fslint-2.42.tar.gz + sudo rpm -Uvh /usr/src/$pkg/RPMS/noarch/fslint-2.42-1.*.noarch.rpm + +对于其他发行版： + + wget http://www.pixelbeat.org/fslint/fslint-2.44.tar.gz + tar -xzf fslint-2.44.tar.gz + cd fslint-2.44 + (cd po && make) + ./fslint-gui + +要在Ubuntu中运行fslint的GUI版本fslint-gui, 使用Alt+F2运行命令或者在终端输入： + + $ fslint-gui + +默认情况下，它会自动选中Duplicate窗格，并以你的家目录作为搜索路径。你要做的就是点击Find按钮，FSlint会自动在你的家目录下找出重复文件列表。 + +![Delete Duplicate files with Fslint](http://blog.linoxide.com/wp-content/uploads/2015/01/delete-duplicates-fslint.png) + +使用按钮来删除任何你要删除的文件，并且可以双击预览。 + +完成这一切后，我们就成功地删除你系统中的重复文件了。 + +**注意** 的是命令行工具默认不在环境的路径中，你不能像典型的命令那样运行它。在Ubuntu中，你可以在/usr/share/fslint/fslint下找到它。因此，如果你要在一个单独的目录运行fslint完整扫描，下面是Ubuntu中的运行命令： + + cd /usr/share/fslint/fslint + + ./fslint /path/to/directory + +**这个命令实际上并不会删除任何文件。它只会打印出重复文件的列表-你需要自己做接下来的事。** + + $ /usr/share/fslint/fslint/findup --help + find dUPlicate files. + Usage: findup [[[-t [-m|-d]] | [--summary]] [-r] [-f] paths(s) ...] + + If no path(s) specified then the current directory is assumed. + + When -m is specified any found duplicates will be merged (using hardlinks). + When -d is specified any found duplicates will be deleted (leaving just 1). + When -t is specfied, only report what -m or -d would do. + When --summary is specified change output format to include file sizes. + You can also pipe this summary format to /usr/share/fslint/fslint/fstool/dupwaste + to get a total of the wastage due to duplicates. + +![fslint help](http://blog.linoxide.com/wp-content/uploads/2015/01/fslint-help.png) + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/file-system/find-remove-duplicate-files-linux/ + +作者：[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.pixelbeat.org/fslint/ +[2]:http://www.pixelbeat.org/fslint/fslint-2.42.tar.gz \ No newline at end of file From a76e2d7405c677332abe0496425648b9c3ef08af Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Tue, 13 Jan 2015 14:06:57 +0800 Subject: [PATCH 016/215] =?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 --- ...What is a good subtitle editor on Linux.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/translated/talk/20140928 What is a good subtitle editor on Linux.md b/translated/talk/20140928 What is a good subtitle editor on Linux.md index 8ae39fd098..4660768029 100644 --- a/translated/talk/20140928 What is a good subtitle editor on Linux.md +++ b/translated/talk/20140928 What is a good subtitle editor on Linux.md @@ -1,18 +1,18 @@ -Linux 上好用的几款字幕编辑器介绍 +Linux上几款好用的字幕编辑器 ================================================================================ -如果你经常看国外的大片，你应该会喜欢带字幕版本而不是有国语配音的版本。在法国长大，我的童年记忆里充满了迪斯尼电影。但是这些电影因为有了法语的配音而听起来很怪。如果现在有机会能看原始的版本，我知道，对于大多数的人来说，字幕还是必须的。我很高兴能为家人制作字幕。最让我感到希望的是，Linux 也不无花哨，而且有很多开源的字幕编辑器。总之一句话，这篇文章并不是一个详尽的Linux上字幕编辑器的列表。你可以告诉我那一款是你认为最好的字幕编辑器。 +如果你经常看国外的大片，你应该会喜欢带字幕版本而不是有国语配音的版本。我在法国长大，童年的记忆里充满了迪斯尼电影。但是这些电影因为有了法语的配音而听起来很怪。如果现在有机会能看原始的版本，我想，对于大多数的人来说，字幕还是必须的。我很高兴能为家人制作字幕。给我带来希望的是，Linux 也不乏有很多花哨、开源的字幕编辑器。总之一句话，文中Linux上字幕编辑器的列表并不详尽，你可以告诉我哪一款是你认为最好的字幕编辑器。 ### 1. Gnome Subtitles ### ![](https://farm6.staticflickr.com/5596/15323769611_59bc5fb4b7_z.jpg) -[Gnome Subtitles][1] 我的一个选择，当有字幕需要快速编辑时。你可以载入视频，载入字幕文本，然后就可以即刻开始了。我很欣赏其对于易用性和高级特性之间的平衡性。它带有一个同步工具以及一个拼写检查工具。最后，虽然最后，但并不是不重要，这么好用最主要的是因为它的快捷键：当你编辑很多的台词的时候，你最好把你的手放在键盘上，使用其内置的快捷键来移动。 +当有现有字幕需要快速编辑时，[Gnome Subtitles][1] 是我的一个选择。你可以载入视频，载入字幕文本，然后就可以即刻开始了。我很欣赏其对于易用性和高级特性之间的平衡。它带有一个同步工具以及一个拼写检查工具。最后但同样重要的的一点，这么好用最主要的是因为它的快捷键：当你编辑很多的台词的时候，你最好把你的手放在键盘上，使用其内置的快捷键来移动。 ### 2. Aegisub ### ![](https://farm3.staticflickr.com/2944/15323964121_59e9b26ba5_z.jpg) -[Aegisub][2] 有更高级别的复杂性。接口仅仅反映了学习曲线。但是，除了它吓人的样子以外，Aegisub 是一个非常完整的软件，提供的工具远远超出你能想象的。和Gnome Subtitles 一样，Aegisub也采用了所见即所得（WYSIWYG:what you see is what you get）的处理方式。但是是一个全新的高度：可以再屏幕上任意拖动字幕，也可以在另一边查看音频的频谱，并且可以利用快捷键做任何的事情。除此以外，它还带有一个汉字工具，有一个kalaok模式，并且你可以导入lua 脚本让它自动完成一些任务。我希望你在用之前，先去阅读下它的[指南][3]。 +[Aegisub][2] 已经是一款高级别的复杂字幕编辑器。仅仅是界面就反映出了一定的学习曲线。但是，除了它吓人的样子以外，Aegisub 是一个非常完整的软件，提供的工具远远超出你能想象的。和Gnome Subtitles 一样，Aegisub也采用了所见即所得（WYSIWYG:what you see is what you get）的处理方式。但是是一个全新的高度：可以再屏幕上任意拖动字幕，也可以在另一边查看音频的频谱，并且可以利用快捷键做任何的事情。除此以外，它还带有一个汉字工具，有一个kalaok模式，并且你可以导入lua 脚本让它自动完成一些任务。我希望你在用之前，先去阅读下它的[指南][3]。 ### 3. Gaupol ### @@ -24,23 +24,23 @@ Linux 上好用的几款字幕编辑器介绍 ![](https://farm4.staticflickr.com/3914/15323911521_8e33126610_z.jpg) -[Subtitle Editor][6]和Gaupol 很像。但是，它的界面有点不太直观，特性也只是稍微的高级一点点。我很欣赏的一点是，它可以定义“关键帧”，而且提供所有的同步选项。然而，多一点的图标，或者是少一点的文字都能提供界面的特性。作为一个好人，我认为，Subtitle Editor 可以模仿“作家”打字的效果，虽然我不知道它是否有用。最后但并非不重要。重定义快捷键的功能很实用。 +[Subtitle Editor][6]和 Gaupol 很像，但是它的界面有点不太直观，特性也只是稍微的高级一点点。我很欣赏的一点是，它可以定义“关键帧”，而且提供所有的同步选项。然而，多一点的图标，或者是少一点的文字都能提供界面的特性。作为一个值得称赞的字幕编辑器，Subtitle Editor 可以模仿“作家”打字的效果，虽然我不确定它是否特别有用。最后但同样重要的一点，重定义快捷键的功能很实用。 ### 5. Jubler ### ![](https://farm4.staticflickr.com/3912/15323769701_3d94ca8884_z.jpg) -用Java 写的，[Jubler][7]是一个多平台支持的字幕编辑器。我对它的界面印象特别深刻。在上面我确实看出了Java-ish 方面的东西，但是，它仍然是经过精心的构造和构思的。像Aegisub 一样，你可以再屏幕上任意的拖动字幕，让你有愉快的体验而不单单是打字。它也可以为字幕自定义一个风格，在另外的一个轨道播放音频，翻译字幕，或者是是做拼写检查，然而，你必须要注意的是，你必须事先安装好媒体播放器并且正确的配置，如果你想完整的使用Jubler。我把这些归功于在[官方页面][8]下载了脚本以后其简便的安装方式。 +[Jubler][7]是一个用Java编写并有多平台支持的字幕编辑器。我对它的界面印象特别深刻。在上面我确实看出了Java特点的东西，但是，它仍然是经过精心的构造和构思的。像Aegisub 一样，你可以再屏幕上任意的拖动字幕，让你有愉快的体验而不单单是打字。它也可以为字幕自定义一个风格，在另外的一个轨道播放音频，翻译字幕，或者是是做拼写检查。不过，要注意的是，你需要事先安装好媒体播放器并且正确的配置，如果你想完整的使用Jubler。我把这些归功于在[官方页面][8]下载了脚本以后其简便的安装方式。 ### 6. Subtitle Composer ### ![](https://farm6.staticflickr.com/5578/15323769711_6c6dfbe405_z.jpg) -被视为“KDE里的字幕作曲家”，[Subtitle Composer][9]能够唤起对很多传统功能的回忆。伴随着KDE界面，我们很期望。很自然的我们就会说到快捷键，我特别喜欢这个功能。除此之外，Subtitle Composer 与上面提到的编辑器最大的不同地方就在于，它可以执行用JavaScript，Python，甚至是Ruby写成的脚本。软件带有几个例子，肯定能够帮助你很好的学习使用这些特性的语法。 +[Subtitle Composer][9]被视为“KDE里的字幕作曲家”，它能够唤起对很多传统功能的回忆。伴随着KDE界面，我们充满了期待。我们自然会说到快捷键，我特别喜欢这个功能。除此之外，Subtitle Composer 与上面提到的编辑器最大的不同地方就在于，它可以执行用JavaScript，Python，甚至是Ruby写成的脚本。软件带有几个例子，肯定能够帮助你很好的学习使用这些特性的语法。 -最后，不管你喜不喜欢我，都要为你的家庭编辑几个字幕，重新同步整个轨道，或者是一切从头开始，那么Linux 有很好的工具给你。对我来说，快捷键和易用性使得各个工具有差异，想要更高级别的使用体验，脚本和语音识别就成了很便利的一个功能。 +最后，不管你是否喜欢，都来为你的家庭编辑几个字幕吧，重新同步整个轨道，或者是一切从头开始，那么Linux 有很好的工具给你。对我来说，快捷键和易用性使得各个工具有差异，想要更高级别的使用体验，脚本和语音识别就成了很便利的一个功能。 -你会使用哪个字幕编辑器，为什么？你认为还有没有更好用的字幕编辑器这里没有提到的？在评论里告诉我们。 +你会使用哪个字幕编辑器，为什么？你认为还有没有更好用的字幕编辑器这里没有提到的？在评论里告诉我们吧。 -------------------------------------------------------------------------------- @@ -48,7 +48,7 @@ via: http://xmodulo.com/good-subtitle-editor-linux.html 作者：[Adrien Brochard][a] 译者：[barney-ro](https://github.com/barney-ro) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 34219f472beffe97fcd002af3260c2156a37cdf7 Mon Sep 17 00:00:00 2001 From: tinyeyeser Date: Tue, 13 Jan 2015 15:25:58 +0800 Subject: [PATCH 017/215] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9=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 --- ... headed for no-downtime kernel patching.md | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md b/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md index 7cf0618bb1..95ee0b5580 100644 --- a/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md +++ b/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md @@ -1,37 +1,37 @@ -四招搞定Linux内核热补丁 +不重启不当机！四招搞定Linux内核热补丁！ ================================================================================ ![Credit: Shutterstock](http://images.techhive.com/images/article/2014/10/patch_f-100526950-primary.idge.jpeg) Credit: Shutterstock -多种技术在竞争成为实现inux内核热补丁的最优方案。 +多种技术在竞争成为实现Linux内核热补丁的最优方案。 没人喜欢重启机器，尤其是涉及到一个内核问题的最新补丁程序。 -为达到不重启的目的，目前有3个项目在朝这方面努力，将为大家提供对内核进行运行时打热补丁的机制，这样就可以做到完全不重启机器。 +为达到不重启的目的，目前有3个项目在朝这方面努力，将为大家提供内核升级时打热补丁的机制，这样就可以做到完全不重启机器。 ### Ksplice项目 ### -首先要介绍的项目是Ksplice，它是热补丁技术的创始者，并于2008年建立了与项目同名的公司。Ksplice在替换新内核时，不需要预先修改；只需要一个diff文件，将内核的修改点列全即可。Ksplice公司免费提供软件，但技术支持是需要收费的，目前能够支持大部分常用的Linux发行版本。 +首先要介绍的项目是Ksplice，它是热补丁技术的创始者，并于2008年建立了与项目同名的公司。Ksplice在替换新内核时，不需要预先修改；只需要一个diff文件，列出内核即将接受的修改即可。Ksplice公司免费提供软件，但技术支持是需要收费的，目前能够支持大部分常用的Linux发行版本。 -但在2011年[Oracle收购了这家公司][1]后，情况发生了变化。 这项功能被合入到Oracle的Linux发行版本中，且只对Oralcle的版本提供技术更新。 这就导致，其他内核hacker们开始寻找替代Ksplice的方法，以避免缴纳Oracle税。 +但在2011年[Oracle收购了这家公司][1]后，情况发生了变化。 这项功能被合入到Oracle自己的Linux发行版本中，只对Oralcle自己提供技术更新。 这就导致，其他内核hacker们开始寻找替代Ksplice的方法，以避免缴纳Oracle税。 ### Kgraft项目 ### -2014年2月，Suse提供了一个很好的解决方案：[Kgraft][2]，该技术以GPLv2/GPLv3混合许可证发布，且Suse不会将其作为一个专有的实现。Kgraft被[提交][3]到Linux内核主线，很有可能被内核主线采用。目前Suse已经把此技术集成到[Suse Linux Enterprise Server 12][4]。 +2014年2月，Suse提供了一个很好的解决方案：[Kgraft][2]，该内核更新技术以GPLv2/GPLv3混合许可证发布，且Suse不会将其作为一个专有发明封闭起来。Kgraft被[提交][3]到Linux内核主线，很有可能被内核主线采用。目前Suse已经把此技术集成到[Suse Linux Enterprise Server 12][4]。 -Kgraft和Ksplice在工作原理上很相似，都是使用一组diff文件来计算内核中需要修改的部分。但与Ksplice不同的是，Kgraft在做替换时，不需要完全停止内核。 在打补丁时，正在运行的函数可以先使用老版本中对应的部分，当补丁打完后就可以切换新的版本。 +Kgraft和Ksplice在工作原理上很相似，都是使用一组diff文件来计算内核中需要修改的部分。但与Ksplice不同的是，Kgraft在做替换时，不需要完全停止内核。 在打补丁时，正在运行的函数可以先使用老版本或新内核中对应的部分，当补丁打完后就可以完全切换新的版本。 ### Kpatch项目 ### Red Hat也提出了他们的内核热补丁技术。同样是在今年年初 -- 与Suse在这方面的工作差不多 -- [Kpatch][5]的工作原理也和Kgraft相似。 -主要的区别点在于，正如Red Hat的Josh Poimboeuf[总结][6]的那样，Kpatch不能将内核调用重定向到老版本。相反，它会等待所有函数调用都停止时，再切换到新内核。Red Hat的工程师认为这种方法更为安全，且更容易维护，缺点就是在打补丁的过程中会带来更大的延迟。 +主要的区别点在于，正如Red Hat的Josh Poimboeuf[总结][6]的那样，Kpatch并不将内核调用重定向到老版本。相反，它会等待所有函数调用都停止时，再切换到新内核。Red Hat的工程师认为这种方法更为安全，且更容易维护，缺点就是在打补丁的过程中会带来更大的延迟。 -和Kgraft一样，Kpatch不仅仅能在Red Hat的发行版本上可以使用，同时也被提交到了内核主线，作为一个可能的候选。 坏消息是Red Hat还未将此技术集成到产品中。 它只是被合入到了Red Hat Enterprise Linux 7的技术预览版中。 +和Kgraft一样，Kpatch不仅仅可以在Red Hat的发行版本上使用，同时也被提交到了内核主线，作为一个可能的候选。 坏消息是Red Hat还未将此技术集成到产品中。 它只是被合入到了Red Hat Enterprise Linux 7的技术预览版中。 ### ...也许 Kgraft + Kpatch更合适? ### -Red Hat的工程师Seth Jennings在2014年11月初，提出了[第四种解决方案][7]。将Kgraft和Kpatch结合起来, 补丁包用这两种方式都可以。在新的方法中，Jennings提出，“热补丁核心为其他内核模块提供了热补丁的注册机制”， 通过这种方法，打补丁的过程 -- 更准确的说，如何处理运行时内核调用 --可以被更加有序的进行。 +Red Hat的工程师Seth Jennings在2014年11月初，提出了[第四种解决方案][7]。将Kgraft和Kpatch结合起来, 补丁包用这两种方式都可以。在新的方法中，Jennings提出，“热补丁核心为其他内核模块提供了一个热补丁的注册接口”， 通过这种方法，打补丁的过程 -- 更准确的说，如何处理运行时内核调用 --可以被更加有序的组织起来。 -这项新建议也意味着两个方案都还需要更长的时间，才能被linux内核正式采纳。尽管Suse步子迈得更快，并把Kgraft应用到了最新的enterprise版本中。让我们也关注一下Red Hat和Linux官方近期的动态。 +这项新建议也意味着两个方案都还需要更长的时间，才能被linux内核正式采纳。尽管Suse步子迈得更快，并把Kgraft应用到了最新的enterprise版本中。让我们也关注一下Red Hat和Canonical近期是否会跟进。 -------------------------------------------------------------------------------- @@ -40,7 +40,7 @@ via: http://www.infoworld.com/article/2851028/linux/four-ways-linux-is-headed-fo 作者：[Serdar Yegulalp][a] 译者：[coloka](https://github.com/coloka) -校对：[校对者ID](https://github.com/校对者ID) +校对：[tinyeyeser](https://github.com/tinyeyeser) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 @@ -51,4 +51,4 @@ via: http://www.infoworld.com/article/2851028/linux/four-ways-linux-is-headed-fo [4]:http://www.infoworld.com/article/2838421/linux/suse-linux-enterprise-12-goes-light-on-docker-heavy-on-reliability.html [5]:https://github.com/dynup/kpatch [6]:https://lwn.net/Articles/597123/ -[7]:http://lkml.iu.edu/hypermail/linux/kernel/1411.0/04020.html \ No newline at end of file +[7]:http://lkml.iu.edu/hypermail/linux/kernel/1411.0/04020.html From e1cca21879783bb58327368c11f744a51ed3887e Mon Sep 17 00:00:00 2001 From: tinyeyeser Date: Tue, 13 Jan 2015 15:27:41 +0800 Subject: [PATCH 018/215] =?UTF-8?q?=E5=B7=B2=E6=A0=A1=E5=AF=B9=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 --- ...Four ways Linux is headed for no-downtime kernel patching.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md b/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md index 95ee0b5580..daf1e08313 100644 --- a/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md +++ b/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md @@ -1,7 +1,7 @@ 不重启不当机！四招搞定Linux内核热补丁！ ================================================================================ ![Credit: Shutterstock](http://images.techhive.com/images/article/2014/10/patch_f-100526950-primary.idge.jpeg) -Credit: Shutterstock +供图: Shutterstock 多种技术在竞争成为实现Linux内核热补丁的最优方案。 没人喜欢重启机器，尤其是涉及到一个内核问题的最新补丁程序。 From f3196a73ff7b8299d80c00a2c8507c50e0515463 Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 13 Jan 2015 20:18:30 +0800 Subject: [PATCH 019/215] =?UTF-8?q?=E8=BF=87=E6=9C=9F=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @kingname ，这篇已经远超新闻期限，所以没有发布。抱歉。 --- ...Released To Fix Critical Security Issue.md | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 translated/news/Git 2.2.1 Released To Fix Critical Security Issue.md diff --git a/translated/news/Git 2.2.1 Released To Fix Critical Security Issue.md b/translated/news/Git 2.2.1 Released To Fix Critical Security Issue.md deleted file mode 100644 index acb4e012b7..0000000000 --- a/translated/news/Git 2.2.1 Released To Fix Critical Security Issue.md +++ /dev/null @@ -1,24 +0,0 @@ -Git 发布2.2.1版，修复严重安全问题 -================================================================================ -![](http://www.phoronix.com/assets/categories/freesoftware.jpg) - -Git 今天下午发布2.2.1版本，修复了Git客服端中一个严重的安全漏洞（原意为脆弱的）。幸运的是，这个漏洞虽然影响到了OS X 和Windows用户，却没有影响到Unix/Linux用户。 - -这次的Git漏洞影响那些使用Git客户端不区分大小写的文件系统。对大小写不敏感的平台，像Windows和OS X，传递.Git /config 可以覆盖用户的.Git /config，从而可能导致执行任意代码。幸运的是，大多数的Phoronix读者在Linux，感谢大小写敏感的文件系统，这就不是个问题了。 - -除了攻击不区分大小写的文件系统的，一些可能导致覆盖git 配置文件的字符出现了，Windows和OS X的HFS + 也会把某些字符串映射回.git文件。而Git 2.2.1版本就是解决这些问题。 - -更多的细节请戳[Git 2.2.1 release announcement][1] and [GitHub has additional details][2]. - --------------------------------------------------------------------------------- -via: http://www.phoronix.com/scan.php?page=news_item&px=MTg2ODA - -作者：[Michael Larabel][a] -译者：[kingname](https://github.com/kingname) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.michaellarabel.com/ -[1]:http://article.gmane.org/gmane.linux.kernel/1853266 -[2]:https://github.com/blog/1938-git-client-vulnerability-announced From 59a96f897169497efeb57452cb4aacf83fa23582 Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 13 Jan 2015 20:22:59 +0800 Subject: [PATCH 020/215] PUB:20141125 Four ways Linux is headed for no-downtime kernel patching @coloka --- ...ys Linux is headed for no-downtime kernel patching.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename {translated/talk => published}/20141125 Four ways Linux is headed for no-downtime kernel patching.md (94%) diff --git a/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md b/published/20141125 Four ways Linux is headed for no-downtime kernel patching.md similarity index 94% rename from translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md rename to published/20141125 Four ways Linux is headed for no-downtime kernel patching.md index daf1e08313..1d96465260 100644 --- a/translated/talk/20141125 Four ways Linux is headed for no-downtime kernel patching.md +++ b/published/20141125 Four ways Linux is headed for no-downtime kernel patching.md @@ -1,10 +1,13 @@ -不重启不当机！四招搞定Linux内核热补丁！ +不重启不当机！Linux内核热补丁的四种技术 ================================================================================ ![Credit: Shutterstock](http://images.techhive.com/images/article/2014/10/patch_f-100526950-primary.idge.jpeg) + 供图: Shutterstock -多种技术在竞争成为实现Linux内核热补丁的最优方案。 +有多种技术在竞争成为实现Linux内核热补丁的最优方案。 + 没人喜欢重启机器，尤其是涉及到一个内核问题的最新补丁程序。 + 为达到不重启的目的，目前有3个项目在朝这方面努力，将为大家提供内核升级时打热补丁的机制，这样就可以做到完全不重启机器。 ### Ksplice项目 ### @@ -21,7 +24,7 @@ Kgraft和Ksplice在工作原理上很相似，都是使用一组diff文件来计 ### Kpatch项目 ### -Red Hat也提出了他们的内核热补丁技术。同样是在今年年初 -- 与Suse在这方面的工作差不多 -- [Kpatch][5]的工作原理也和Kgraft相似。 +Red Hat也提出了他们的内核热补丁技术。同样是在2014年初 -- 与Suse在这方面的工作差不多 -- [Kpatch][5]的工作原理也和Kgraft相似。 主要的区别点在于，正如Red Hat的Josh Poimboeuf[总结][6]的那样，Kpatch并不将内核调用重定向到老版本。相反，它会等待所有函数调用都停止时，再切换到新内核。Red Hat的工程师认为这种方法更为安全，且更容易维护，缺点就是在打补丁的过程中会带来更大的延迟。 From 9886fdd41521b85eb3915e84c0ddee58f854fa25 Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 13 Jan 2015 20:30:17 +0800 Subject: [PATCH 021/215] PUB:20140928 What is a good subtitle editor on Linux @barney-ro --- .../20140928 What is a good subtitle editor on Linux.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {translated/talk => published}/20140928 What is a good subtitle editor on Linux.md (100%) diff --git a/translated/talk/20140928 What is a good subtitle editor on Linux.md b/published/20140928 What is a good subtitle editor on Linux.md similarity index 100% rename from translated/talk/20140928 What is a good subtitle editor on Linux.md rename to published/20140928 What is a good subtitle editor on Linux.md From 71e8d589ccdee219afe87a61bbd0583d09e864bc Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 13 Jan 2015 22:01:09 +0800 Subject: [PATCH 022/215] PUB:20140929 What Linux Users Should Know About Open Hardware @zpl1025 --- ...29 What Linux Users Should Know About Open Hardware.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename {translated/talk => published}/20140929 What Linux Users Should Know About Open Hardware.md (94%) diff --git a/translated/talk/20140929 What Linux Users Should Know About Open Hardware.md b/published/20140929 What Linux Users Should Know About Open Hardware.md similarity index 94% rename from translated/talk/20140929 What Linux Users Should Know About Open Hardware.md rename to published/20140929 What Linux Users Should Know About Open Hardware.md index d8a0e846b6..55a2ed5012 100644 --- a/translated/talk/20140929 What Linux Users Should Know About Open Hardware.md +++ b/published/20140929 What Linux Users Should Know About Open Hardware.md @@ -1,10 +1,10 @@ Linux用户，你们真的了解开源硬件吗？ ================================================================================ -> Linux用户不了解一点开源硬件制造相关的事情，他们将会很失望。 +> Linux用户不了解一点开源硬件制造相关的事情，他们就会经常陷入失望的情绪中。 商业软件和免费软件已经互相纠缠很多年了，但是这俩经常误解对方。这并不奇怪 -- 对一方来说是生意，而另一方只是一种生活方式。但是，这种误解会给人带来痛苦，这也是为什么值得花精力去揭露这里面的内幕。 -一个逐渐普遍的现象：对开源硬件的不断尝试，不管是Canonical，Jolla，MakePlayLive，或者其他公司。无论是评论员或是终端用户，一般的免费软件用户会为新的硬件平台发布表现出过分的狂热，然后因为不断延期有所醒悟，直到最终放弃整个产品。 +一个逐渐普遍的现象：对开源硬件的不断尝试，不管是Canonical，Jolla，MakePlayLive，或者其他公司。无论是评论员或是终端用户，通常免费软件用户都会为新的硬件平台发布表现出过分的狂热，然后因为不断延期有所醒悟，直到最终放弃整个产品。 这是一个没有人获益的怪圈，而且常常滋生出不信任 - 都是因为一般的Linux用户根本不知道这些新闻背后发生的事情。 @@ -12,11 +12,11 @@ Linux用户，你们真的了解开源硬件吗？ ### 寻找合作伙伴 ### -不管是数码产品的生产还是分销都被相对较少的一些公司控制着，有时需要数月的预订。利润率也会很低，所以就像那些购买古老情景喜剧的电影工作室一样，生成商一般也希望复制当前热销产品的成功。像Aaron Seigo在谈到他花精力开发Vivaldi平板时告诉我的，生产商更希望能由其他人去承担开发新产品的风险。 +不管是数码产品的生产还是分销都被相对较少的一些公司控制着，有时需要数月的预订。利润率也会很低，所以就像那些购买古老情景喜剧的电影工作室一样，生产商一般也希望复制当前热销产品的成功。像Aaron Seigo在谈到他花精力开发Vivaldi平板时告诉我的，生产商更希望能由其他人去承担开发新产品的风险。 不仅如此，他们更希望和那些有现成销售记录的有可能带来长期客户生意的人合作。 -而且，一般新加入的厂商所关心的产品只有几千的量。芯片制造商更愿意和苹果或三星合作，因为它们的订单很可能是几十上百万的量。 +而且，一般新加入的厂商所关心的产品只有几千的量。芯片制造商更愿意和苹果或三星这样的公司合作，因为它们的订单很可能是几十上百万的量。 面对这种情形，开源硬件制造者们可能会发现他们在工厂的列表中被淹没了，除非能找到二线或三线厂愿意尝试一下小批量生产新产品。 From 543ce858290e062a755739b17d29a86bec1a4d9b Mon Sep 17 00:00:00 2001 From: wxy Date: Tue, 13 Jan 2015 22:19:21 +0800 Subject: [PATCH 023/215] PUB:20141226 The Good The Bad And The Ugly Of Linux In 2014 @H-mudcup --- ...d The Bad And The Ugly Of Linux In 2014.md | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) rename {translated/talk => published}/20141226 The Good The Bad And The Ugly Of Linux In 2014.md (76%) diff --git a/translated/talk/20141226 The Good The Bad And The Ugly Of Linux In 2014.md b/published/20141226 The Good The Bad And The Ugly Of Linux In 2014.md similarity index 76% rename from translated/talk/20141226 The Good The Bad And The Ugly Of Linux In 2014.md rename to published/20141226 The Good The Bad And The Ugly Of Linux In 2014.md index 747a670b8b..a134e75432 100644 --- a/translated/talk/20141226 The Good The Bad And The Ugly Of Linux In 2014.md +++ b/published/20141226 The Good The Bad And The Ugly Of Linux In 2014.md @@ -1,10 +1,8 @@ -Translated by H-mudcup - 2014年Linux界发生的好事，坏事和丑事 ================================================================================ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/12/Buggest_Linux_Stories.jpeg) -2014年已经接近尾声，现在正是盘点**2014年Linux大事件**的时候。整整一年，我们关注了有关Linux和开源的一些好事，坏事和丑事。让我们来快速回顾一下2014对于Linux是怎样的一年。 +2014年已经过去，现在正是盘点**2014年Linux大事件**的时候。整整一年，我们关注了有关Linux和开源的一些好事，坏事和丑事。让我们来快速回顾一下2014对于Linux是怎样的一年。 ### 好事 ### @@ -14,7 +12,7 @@ Translated by H-mudcup ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/12/netflix-linux.jpg) -从使用Wine到[使用Chrome的测试功能][1]，为了能让Netflix能在Linux上工作，Linux用户曾尝试了各种方法。好消息是Netflix终于在2014年带来了Linux的本地支持。这让所有能使用Netflix的地区的Linux用户的脸上浮现出了微笑。想在[美国以外的地区使用Netflix][2]（或其他官方授权使用Netflix的国家之外）的人还是得靠其他的方法。 +从使用Wine到[使用Chrome的测试功能][1]，为了能让Netflix能在Linux上工作，Linux用户曾尝试了各种方法。好消息是Netflix终于在2014年带来了Linux的本地支持。这让所有能使用Netflix的地区的Linux用户的脸上浮现出了微笑。不过，想在[美国以外的地区使用Netflix][2]（或其他官方授权使用Netflix的国家之外）的人还是得靠其他的方法。 #### 欧洲国家采用开源/Linux #### @@ -30,19 +28,19 @@ Translated by H-mudcup ### 坏事 ### -Linux在2014年并不是一帆风顺。某些事件的发生损坏了Linux/开源的形象。 +Linux在2014年并不是一帆风顺。某些事件的发生败坏了Linux/开源的形象。 -#### Heartbleed心血 #### +#### Heartbleed 心血漏洞 #### ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/12/heartbleed-bug.jpg) -在今年的四月份，检测到[OpenSSL][8]有一个缺陷。这个漏洞被命名为[Heartbleed心血][9]。他影响了包括Facebook和Google在内的50多万个“安全”网站。这项漏洞可以真正的允许任何人读取系统的内存，并能因此给予用于加密数据流的密匙的访问权限。[xkcd上的漫画以更简单的方式解释了心血][10]。不必说，这个漏洞在OpenSSL的更新中被修复了。 +在今年的四月份，检测到[OpenSSL][8]有一个缺陷。这个漏洞被命名为[Heartbleed心血漏洞][9]。他影响了包括Facebook和Google在内的50多万个“安全”网站。这项漏洞可以真正的允许任何人读取系统的内存，并能因此给予用于加密数据流的密匙的访问权限。[xkcd上的漫画以更简单的方式解释了心血漏洞][10]。自然，这个漏洞在OpenSSL的更新中被修复了。 -#### Shellshock #### +#### Shellshock 破壳漏洞 #### ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/09/shellshock_Linux_check.jpeg) -好像有个心血还不够似的，在Bash里的一个缺陷更严重的震撼了Linux世界。这个漏洞被命名为[Shellshock][11]。这个漏洞把Linux往远程攻击的危险深渊又推了一把。这项漏洞是通过黑客的DDoS攻击暴露出来的。升级一下Bash版本应该能修复这个问题。 +好像有个心血漏洞还不够似的，在Bash里的一个缺陷更严重的震撼了Linux世界。这个漏洞被命名为[Shellshock 破壳漏洞][11]。这个漏洞把Linux往远程攻击的危险深渊又推了一把。这项漏洞是通过黑客的DDoS攻击暴露出来的。升级一下Bash版本应该能修复这个问题。 #### Ubuntu Phone和Steam控制台 #### @@ -52,13 +50,13 @@ Linux在2014年并不是一帆风顺。某些事件的发生损坏了Linux/开 ### 丑事 ### -systemd的归属战变得不知廉耻。 +是否采用 systemd 的争论变得让人羞耻。 ### systemd大论战 ### ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/12/Systemd_everywhere.jpg) -用init还是systemd的争吵已经进行了一段时间了。但是在2014年当systemd准备在包括Debian, Ubuntu, OpenSUSE, Arch Linux and Fedora几个主流Linux分布中替代init时，事情变得不知廉耻了起来。它是如此的一发不可收拾，以至于它已经不限于boycottsystemd.org这类网站了。Lennart Poettering（systemd的首席开发人员及作者）在一条Google Plus状态上声明，说那些反对systemd的人在“收集比特币来雇杀手杀他”。Lennart还声称开源社区“是个恶心得不能待的地方”。人们吵得越来越离谱以至于把Debian分裂成了一个新的操作系统，称为[Devuan][15]。 +用init还是systemd的争吵已经进行了一段时间了。但是在2014年当systemd准备在包括Debian, Ubuntu, OpenSUSE, Arch Linux 和 Fedora几个主流Linux分布中替代init时，事情变得不知廉耻了起来。它是如此的一发不可收拾，以至于它已经不限于boycottsystemd.org这类网站了。Lennart Poettering（systemd的首席开发人员及作者）在一条Google Plus状态上声明，说那些反对systemd的人在“收集比特币来雇杀手杀他”。Lennart还声称开源社区“是个恶心得不能待的地方”。人们吵得越来越离谱以至于把Debian分裂成了一个新的操作系统，称为[Devuan][15]。 ### 还有诡异的事 ### @@ -81,10 +79,10 @@ via: http://itsfoss.com/biggest-linux-stories-2014/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://itsfoss.com/author/Abhishek/ -[1]:http://itsfoss.com/watch-netflix-in-ubuntu-14-04/ +[1]:http://linux.cn/article-3024-1.html [2]:http://itsfoss.com/easiest-watch-netflix-hulu-usa/ -[3]:http://itsfoss.com/french-city-toulouse-saved-1-million-euro-libreoffice/ -[4]:http://itsfoss.com/italian-city-turin-open-source/ +[3]:http://linux.cn/article-3575-1.html +[4]:http://linux.cn/article-3602-1.html [5]:http://itsfoss.com/170-primary-public-schools-geneva-switch-ubuntu/ [6]:http://itsfoss.com/german-town-gummersbach-completes-switch-open-source/ [7]:http://itsfoss.com/windows-10-inspired-linux/ @@ -95,8 +93,8 @@ via: http://itsfoss.com/biggest-linux-stories-2014/ [12]:http://itsfoss.com/ubuntu-phone-specification-release-date-pricing/ [13]:http://www.tecmint.com/systemd-replaces-init-in-linux/ [14]:https://plus.google.com/+LennartPoetteringTheOneAndOnly/posts/J2TZrTvu7vd -[15]:http://debianfork.org/ -[16]:http://thenewstack.io/microsoft-professes-love-for-linux-adds-support-for-coreos-cloudera-and-host-of-new-features/ +[15]:http://linux.cn/article-4512-1.html +[16]:http://linux.cn/article-4056-1.html [17]:http://www.theregister.co.uk/2001/06/02/ballmer_linux_is_a_cancer/ [18]:http://azure.microsoft.com/en-us/ [19]:http://www.zdnet.com/article/top-five-linux-contributor-microsoft/ From e6e93f56b1a7c2253686078fbd5d6c9025ef2d8a Mon Sep 17 00:00:00 2001 From: Ping Date: Wed, 14 Jan 2015 07:51:53 +0800 Subject: [PATCH 024/215] Translating --- ...09 How to convert image audio and video formats on Ubuntu.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20141009 How to convert image audio and video formats on Ubuntu.md b/sources/tech/20141009 How to convert image audio and video formats on Ubuntu.md index b60bd11479..bea1e35659 100644 --- a/sources/tech/20141009 How to convert image audio and video formats on Ubuntu.md +++ b/sources/tech/20141009 How to convert image audio and video formats on Ubuntu.md @@ -1,3 +1,5 @@ +Ping - Translating + How to convert image, audio and video formats on Ubuntu ================================================================================ If you need to work with a variety of image, audio and video files encoded in all sorts of different formats, you are probably using more than one tools to convert among all those heterogeneous media formats. If there is a versatile all-in-one media conversion tool that is capable of dealing with all different image/audio/video formats, that will be awesome. From bf6fbe01792ce408e3f56e2497b3560fd5461161 Mon Sep 17 00:00:00 2001 From: joeren Date: Wed, 14 Jan 2015 08:52:41 +0800 Subject: [PATCH 025/215] Update 20150106 Managing Linux server configs with the SaltStack.md --- ...0150106 Managing Linux server configs with the SaltStack.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150106 Managing Linux server configs with the SaltStack.md b/sources/tech/20150106 Managing Linux server configs with the SaltStack.md index c98c487eb2..4fad5be3a5 100644 --- a/sources/tech/20150106 Managing Linux server configs with the SaltStack.md +++ b/sources/tech/20150106 Managing Linux server configs with the SaltStack.md @@ -1,3 +1,4 @@ +Translating by GOLinux! Managing Linux server configs with the SaltStack ================================================================================ ![](http://techarena51.com/wp-content/uploads/2015/01/SaltStack+logo+-+black+on+white.png) @@ -336,4 +337,4 @@ via: http://techarena51.com/index.php/getting-started-with-saltstack/ [1]:http://techarena51.com/index.php/a-simple-way-to-install-and-configure-a-puppet-server-on-linux/ [2]:http://docs.saltstack.com/en/latest/topics/installation/index.html [3]:http://techarena51.com/index.php/using-foreman-opensource-frontend-puppet/ -[4]:https://github.com/theforeman/foreman_salt/wiki \ No newline at end of file +[4]:https://github.com/theforeman/foreman_salt/wiki From b59c18cbfc1269109b3600a8285ec852d44a52e8 Mon Sep 17 00:00:00 2001 From: GOLinux Date: Wed, 14 Jan 2015 10:24:56 +0800 Subject: [PATCH 026/215] [Translated]20150106 Managing Linux server configs with the SaltStack.md --- ...Linux server configs with the SaltStack.md | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) rename {sources => translated}/tech/20150106 Managing Linux server configs with the SaltStack.md (56%) diff --git a/sources/tech/20150106 Managing Linux server configs with the SaltStack.md b/translated/tech/20150106 Managing Linux server configs with the SaltStack.md similarity index 56% rename from sources/tech/20150106 Managing Linux server configs with the SaltStack.md rename to translated/tech/20150106 Managing Linux server configs with the SaltStack.md index 4fad5be3a5..1acf7c2434 100644 --- a/sources/tech/20150106 Managing Linux server configs with the SaltStack.md +++ b/translated/tech/20150106 Managing Linux server configs with the SaltStack.md @@ -1,55 +1,54 @@ -Translating by GOLinux! -Managing Linux server configs with the SaltStack +SaltStack：Linux服务器配置管理神器 ================================================================================ ![](http://techarena51.com/wp-content/uploads/2015/01/SaltStack+logo+-+black+on+white.png) -I came across Salt while searching for an alternative to [Puppet][1]. I like puppet, but I am falling in love with Salt :). This maybe a personal opinion but I found Salt easier to configure and get started with as compared to Puppet. Another reason I like Salt is that it let’s you manage your server configurations from the command line, for example: +我在搜索[Puppet][1]的替代品时，偶然间碰到了Salt。我喜欢puppet，但是我又爱上Salt了:)。我发现Salt在配置和使用上都要比Puppet简单，当然这只是一家之言，你大可不必介怀。另外一个爱上Salt的理由是，它可以让你从命令行管理服务器配置，比如： -To update all your servers with Salt, just run +要通过Salt来更新所有服务器，你只需运行以下命令 salt ‘*’ pkg.upgrade -**Installing the SaltStack on Linux.** +**安装SaltStack到Linux上。** -Salt is available in the EPEL repo if you are installing it on CentOS 6/7, Pi and Ubuntu linux users can add the Salt Repository from [here][2]. Since Salt is python based you can also use ‘pip’ to install it but you have take care of dependencies like yum-utils and other packages yourself. +如果你是在CentOS 6/7上安装的话，那么Salt可以通过EPEL仓库获取到。而对于Pi和Ubuntu Linux用户，你可以从[这里][2]添加Salt仓库。Salt是基于python的，所以你也可以使用‘pip’来安装，但是你得用yum-utils或是其它包管理器来自己处理它的依赖关系哦。 -Salt follows the Server-Client model, The Server is known as the master whereas clients are called minions. +Salt遵循服务器-客户端模式，服务器端称为领主，而客户端则称为下属。 -**Installation and Configuration of a Salt Master** +**安装并配置Salt领主** [root@salt-master~]# yum install salt-master -Salt configurations files are stored in /etc/salt and /srv/salt. Salt is good to go out of the box, but I would recommend you configure a bit more verbose logging to help your troubleshoot. +Salt配置文件位于/etc/salt和/srv/salt。Salt虽然可以开箱即用，但我还是建议你将日志配置得更详细点，以方便日后排除故障。 [root@salt-master ~]# vim /etc/salt/master - #Default is warning change to the following + # 默认是warning，修改如下 log_level: debug log_level_logfile: debug [root@salt-master ~]# systemctl start salt-master -**Installation and Configuration of a Salt minion** +**安装并配置Salt下属** [root@salt-minion~]#yum install salt-minion - #Add the hostname of your Salt Master + # 添加你的Salt领主的主机名 [root@salt-minion~]#vim /etc/salt/minion master: salt-master.com - #start the minion + # 启动下属 [root@salt-minion~] systemctl start salt-minion -On Startup, a minion will generate a cryptographic key and an id. It will then connect to the Salt Master and identify itself. The Salt Master must accept the minion’s key before allowing the minion to download a configuration. +在启动时，下属客户机会生成一个密钥和一个id。然后，它会连接到Salt领主服务器并验证自己的身份。Salt领主服务器在允许下属客户机下载配置之前，必须接受下属的密钥。 -**Listing and Accepting keys on the Salt Master** +**在Salt领主服务器上列出并接受密钥** - #List all keys + # 列出所有密钥 [root@salt-master~] salt-key -L Accepted Keys: Unaccepted Keys: minion.com Rejected Keys: - #Accept key with id ‘minion.com’ + # 使用id 'minion.com'命令接受密钥 [root@salt-master~]salt-key -a minion.com [root@salt-master~] salt-key -L @@ -58,43 +57,45 @@ On Startup, a minion will generate a cryptographic key and an id. It will then c Unaccepted Keys: Rejected Keys: -Once you have accepted a minions keys, you can get information on it immediately using the ‘salt’ command. +在接受下属客户机的密钥后，你可以使用‘salt’命令来立即获取信息。 -**Salt command line examples** +**Salt命令行实例** - #Check if a minion is up and running + # 检查下属是否启动并运行 [root@salt-master~] salt 'minion.com' test.ping minion.com: True - # run shell commands on the minion + # 在下属客户机上运行shell命令 [root@salt-master~]# salt 'minion.com' cmd.run 'ls -l' minion.com: total 2988 -rw-r--r--. 1 root root 1024 Jul 31 08:24 1g.img -rw-------. 1 root root 940 Jul 14 15:04 anaconda-ks.cfg -rw-r--r--. 1 root root 1024 Aug 14 17:21 test - #install/update a software on all your servers + # 安装/更新所有服务器上的软件 [root@salt-master ~]# salt '*' pkg.install git -The salt command needs a few components to send information. One of these components is the minion id and another is the function to be called on the minion. -In the first example I used the ‘ping’ function of the ‘test’ module to check if the system is up. This function does not perform an actual ping, it just return’s ‘true’ if the minion responds. -‘cmd.run’ is used to execute remote commands and ‘pkg’ module contains functions for package management. The full list of builin modules is at the end of this post. +salt命令需要一些组件来发送信息，其中之一是mimion id，而另一个是下属客户机上要调用的函数。 -**Grains example** +在第一个实例中，我使用‘test’模块的‘ping’函数来检查系统是否启动。该函数并不是真的实施一次ping，它仅仅是在下属客户机作出回应时返回‘真’。 -Salt uses an interface called **Grains** to get system information. You can use grains to run commands on systems with particular properties. +‘cmd.run’用于执行远程命令，而‘pkg’模块包含了包管理的函数。本文结尾提供了全部内建模块的列表。 + +**颗粒实例** + +Salt使用一个名为**颗粒**的界面来获取系统信息。你可以使用颗粒在指定属性的系统上运行命令。 [root@vps4544 ~]# salt -G 'os:Centos' test.ping minion: True -More grain examples are available at http://docs.saltstack.com/en/latest/topics/targeting/grains.html +更多颗粒实例，请访问http://docs.saltstack.com/en/latest/topics/targeting/grains.html -**Package Management via the State File System.** +**通过状态文件系统进行包管理。** -In order to automate software configurations you will need to use the state system and create a state file. These files use the YAML format and python dictionaries, lists, strings and numbers for data structure. Reading up on them will help you understand the configurations better. +为了是软件配置自动化，你需要使用状态系统，并创建状态文件。这些文件使用YAML格式和python字典、列表、字符串以及编号来构成数据结构。将这些文件从头到尾研读一遍，这将有助于你更好地理解它的配置。 -**VIM state file example** +**VIM状态文件实例** [root@salt-master~]# vim /srv/salt/vim.sls vim-enhanced: @@ -105,11 +106,10 @@ In order to automate software configurations you will need to use the state syst - user: root - group: root - mode: 644 - -The first and third line in this file are called state id. They must contain the exact name or path of the package or file to be managed. After the state ids are state and function declaration. ‘pkg’ and file are state declarations whereas ‘installed’ and ‘managed’ are function declarations. Functions accept arguments, user,group,mode and source are all arguments to the function ‘managed’. +该文件的第一和第三行成为状态id，它们必须包含有需要管理的包或文件的确切名称或路径。在状态id之后是状态和函数声明，‘pkg’和‘file’是状态声明，而‘installed’和‘managed’是函数声明。函数接受参数，用户、组、模式和源都是函数‘managed’的参数。 -To apply this configuration to a minion move your ‘vimrc’ file to ‘/srv/salt’ and run. +要将该配置应用到下属客户端，请移动你的‘vimrc’文件到‘/src/salt’，然后运行以下命令。 [root@salt-master~]# salt 'minion.com' state.sls vim minion.com: @@ -135,8 +135,8 @@ To apply this configuration to a minion move your ‘vimrc’ file to ‘/srv/sa Failed: 0 ------------ Total states run: 1 - -You can also add dependencies to your configurations. + +你也可以添加依赖关系到你的配置中。 [root@salt-master~]# vim /srv/salt/ssh.sls openssh-server: @@ -155,9 +155,9 @@ You can also add dependencies to your configurations. - require: - pkg: openssh-server -The ‘require’ statement here is a requisite declaration, it creates a dependency between the ‘service’ and ‘pkg’ states. This declaration will first check if the package is installed and then run the service. +这里的‘require’声明是必须的，它在‘service’和‘pkg’状态之间创建依赖关系。该声明将首先检查包是否安装，然后运行服务。 -However, I prefer using the ‘watch’ statement as it also checks for file modifications and restarts the service. +但是，我更偏向于使用‘watch’声明，因为它也可以检查文件是否修改和重启服务。 [root@salt-master~]# vim /srv/salt/ssh.sls openssh-server: @@ -229,7 +229,7 @@ However, I prefer using the ‘watch’ statement as it also checks for file mod ------------ Total states run: 4 -Maintaining all config files in single directory can make scaling a complex task, hence you can create sub-directories and add your configuration in them with a init.sls file +在单一目录中维护所有的配置文件是一项复杂的大工程，因此，你可以创建子目录并在其中添加配置文件init.sls文件。 [root@salt-master~]# mkdir /srv/salt/ssh [root@salt-master~]# vim /srv/salt/ssh/init.sls @@ -253,13 +253,13 @@ Maintaining all config files in single directory can make scaling a complex task [root@vps4544 ssh]# cp /etc/ssh/sshd_config /srv/salt/ssh/ [root@vps4544 ssh]# salt 'minion.com' state.sls ssh -**Top File and Environments.** +**Top文件和环境。** -A Top file (top.sls) is where you define your environments. A top file allows you to map minions to packages. The default environment is ‘base’. You need to define which packages will be installed on which server under the base environment. +top文件（top.sls）是用来定义你的环境的文件，它允许你映射下属客户机到包，默认环境是‘base’。你需要定义在基本环境下，哪个包会被安装到哪台服务器。 -If there are multiple environments and more than one definitions for a particular minion is used then by default the base environment will supersede the others. +如果对于一台特定的下属客户机而言，有多个环境，并且有多于一个的定义，那么默认情况下，基本环境将取代其它环境。 -To define an environment you need to add it to the ‘file_roots’ directive in the master configuration file. +要定义环境，你需要将它添加到领主配置文件的‘file_roots’指针。 [root@salt-master ~]# vim /etc/salt/master file_roots: @@ -268,7 +268,7 @@ To define an environment you need to add it to the ‘file_roots’ directive in dev: - /srv/salt/dev -Now add a top.sls file in /srv/salt +现在，添加一个top.sls文件到/src/salt [root@salt-master ~]# vim /srv/salt/top.sls base: @@ -277,7 +277,7 @@ Now add a top.sls file in /srv/salt 'minion.com': - ssh -Apply the top file configuration with +应用top文件配置 [root@salt-master~]# salt '*' state.highstate minion.com: @@ -297,29 +297,29 @@ Apply the top file configuration with Started: 13:10:55. Duration: 2.156 ms -The minion will download the top file and search for it’s configuration. It will also apply the configuration for all minions. +下属客户机将下载top文件并搜索用于它的配置，领主服务器也会将配置应用到所有下属客户机。 -This is just a brief introduction to Salt, for in depth understanding you can go through the links below and if you are already using Salt and have any recommendations do let me know. +这仅仅是一个Salt的简明教程，如果你想要深入学习并理解，你可以访问以下链接。如果你已经在使用Salt，那么请告诉我你的建议和意见吧。 -Update: [Foreman][3] has support for salt via [plugins][4]. +更新： [Foreman][3] 已经通过[插件][4]支持salt。 -Read +阅读链接 - http://docs.saltstack.com/en/latest/ref/states/top.html#how-top-files-are-compiled - http://docs.saltstack.com/en/latest/topics/tutorials/states_pt1.html - http://docs.saltstack.com/en/latest/ref/states/highstate.html#state-declaration -Grains +颗粒 - http://docs.saltstack.com/en/latest/topics/targeting/grains.html -List of Salt Modules +Salt模块列表 -Good comparison of Salt and puppet +Salt和Puppet的充分比较 - https://mywushublog.com/2013/03/configuration-management-with-salt-stack/ -Full list of builtin execution modules +内建执行模块的完全列表 - http://docs.saltstack.com/en/latest/ref/modules/all/ @@ -328,7 +328,7 @@ Full list of builtin execution modules via: http://techarena51.com/index.php/getting-started-with-saltstack/ 作者：[Leo G][a] -译者：[译者ID](https://github.com/译者ID) +译者：[GOLinux](https://github.com/GOLinux) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 34182d3ae5bf0fcecf5157076704b0c5187bdce1 Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 14 Jan 2015 13:41:15 +0800 Subject: [PATCH 027/215] PUB:20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu @Vic020 --- ...e Apport internal error reporting on Ubuntu.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) rename {translated/tech => published}/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md (65%) diff --git a/translated/tech/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md b/published/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md similarity index 65% rename from translated/tech/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md rename to published/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md index b69e4f7de1..53ac6c69e6 100644 --- a/translated/tech/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md +++ b/published/20141208 Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu.md @@ -1,20 +1,19 @@ -Linux FAQs with Answers--How to disable Apport internal error reporting on Ubuntu -有问必答--如何禁止Ubuntu的Apport内部错误报告程序 +Linux有问必答：如何禁止Ubuntu的Apport内部错误报告程序 ================================================================================ > **问题**：在桌面版Ubuntu中，我经常遇到一些弹窗窗口，警告我Ubuntu发生了内部错误，问我要不要发送错误报告。每次软件崩溃都要烦扰我，我如何才能关掉这个错误报告功能呢？ -Ubuntu桌面版预安装了Apport，它是一个错误收集系统，会收集软件崩溃、未处理异常和其他，包括程序bug，并为调试目的生成崩溃报告。当一个应用程序崩溃或者出现Bug时候，Apport就会通过弹窗警告用户并且询问用户是否提交崩溃报告。你也许也看到过下面的消息。 +Ubuntu桌面版预装了Apport，它是一个错误收集系统，会收集软件崩溃、未处理异常和其他，包括程序bug，并为调试目的生成崩溃报告。当一个应用程序崩溃或者出现Bug时候，Apport就会通过弹窗警告用户并且询问用户是否提交崩溃报告。你也许也看到过下面的消息。 - "Sorry, the application XXXX has closed unexpectedly." -- "对不起，应用程序XXXX意外关闭了" +- "对不起，应用程序XXXX意外关闭了。" - "Sorry, Ubuntu XX.XX has experienced an internal error." -- "对不起，Ubuntu XX.XX 经历了一个内部错误" +- "对不起，Ubuntu XX.XX 发生了一个内部错误。" - "System program problem detected." -- "系统程序问题发现" +- "检测到系统程序问题。" ![](https://farm9.staticflickr.com/8635/15688551119_708b23b12a_z.jpg) -也许因为应用一直崩溃，频繁的错误报告会使人心烦。也许你担心Apport会收集和上传你的Ubuntu系统的敏感信息。无论什么原因，你需要关掉Apport的错误报告功能。 +也许因为应用一直崩溃，频繁的错误报告会使人心烦。也许你担心Apport会收集和上传你的Ubuntu系统的敏感信息。无论什么原因，你想关掉Apport的错误报告功能。 ### 临时关闭Apport错误报告 ### @@ -41,6 +40,6 @@ Ubuntu桌面版预安装了Apport，它是一个错误收集系统，会收集 via: http://ask.xmodulo.com/disable-apport-internal-error-reporting-ubuntu.html 译者：[VicYu/Vic020](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 fd7ef3bc8f6215c69acbefa89261a541cc66b210 Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 14 Jan 2015 14:11:38 +0800 Subject: [PATCH 028/215] PUB:20141027 ntpq -p output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @liaoishere 这篇好专业啊，翻译的很不错！ --- .../20141027 ntpq -p output.md | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) rename {translated/tech => published}/20141027 ntpq -p output.md (90%) diff --git a/translated/tech/20141027 ntpq -p output.md b/published/20141027 ntpq -p output.md similarity index 90% rename from translated/tech/20141027 ntpq -p output.md rename to published/20141027 ntpq -p output.md index 955b010cdc..d54843e179 100644 --- a/translated/tech/20141027 ntpq -p output.md +++ b/published/20141027 ntpq -p output.md @@ -1,11 +1,10 @@ -“ntpq -p”命令输出详解 +网络时间的那些事情及 ntpq 详解 ================================================================================ -[Gentoo][1]（也许其他发行版也是？）中 ["ntp -q" 的 man page][2] 只有简短的描述：“*打印出服务器已知的节点列表和它们的状态概要信息。*” +[Gentoo][1]（也许其他发行版也是？）中 ["ntpq -p" 的 man page][2] 只有简短的描述：“*打印出该服务器已知的节点列表和它们的状态概要信息。*” -我还没见到关于这个命令的说明文档，因此这里对此作一个总结，可以补充进 "[man ntpq][3]" man page 中。更多的细节见这里 “[ntpq – standard NTP query program][4]”（原作者），和 [其他关于 man ntpq 的例子][5]. +我还没见到关于这个命令的说明文档，因此这里对此作一个总结，可以补充进 "[man ntpq][3]" man page 中。更多的细节见这里 “[ntpq – 标准 NTP 请求程序][4]”（原作者），和 [其他关于 man ntpq 的例子][5]. [NTP][6] 是一个设计用于通过 [udp][9] 网络 ([WAN][7] 或者 [LAN][8]) 来同步计算机时钟的协议。引用 [Wikipedia – NTP][10]： -[NTP][6] is a protocol designed to synchronize the clocks of computers over a ([WAN][7] or [LAN][8]) [udp][9] network. From [Wikipedia – NTP][10]: > 网络时间协议（英语：Network Time Protocol，NTP）一种协议和软件实现，用于通过使用有网络延迟的报文交换网络同步计算机系统间的时钟。最初由美国特拉华大学的 David L. Mills 设计，现在仍然由他和志愿者小组维护，它于 1985 年之前开始使用，是因特网中最老的协议之一。 @@ -28,10 +27,10 @@ - **st** – 远程节点或服务器的 [Stratum][17]（级别，NTP 时间同步是分层的） - **t** – 类型 (u: [unicast（单播）][18] 或 [manycast（选播）][19] 客户端, b: [broadcast（广播）][20] 或 [multicast（多播）][21] 客户端, l: 本地时钟, s: 对称节点（用于备份）, A: 选播服务器, B: 广播服务器, M: 多播服务器, 参见“[Automatic Server Discovery][22]“) - **when** – 最后一次同步到现在的时间 (默认单位为秒, “h”表示小时，“d”表示天) -- **poll** – 同步的频率：[rfc5905][23]建议在 NTPv4 中这个值的范围在 4 (16s) 至 17 (36h) 之间（2的指数次秒），然而观察发现这个值的实际大小在一个小的多的范围内 ：64 (2的6次方)秒 至 1024 (2的10次方)秒 +- **poll** – 同步的频率：[rfc5905][23]建议在 NTPv4 中这个值的范围在 4 (16秒) 至 17 (36小时) 之间（即2的指数次秒），然而观察发现这个值的实际大小在一个小的多的范围内 ：64 (2^6 )秒 至 1024 (2^10 )秒 - **reach** – 一个8位的左移移位寄存器值，用来测试能否和服务器连接，每成功连接一次它的值就会增加，以 [8 进制][24]显示 - **delay** – 从本地到远程节点或服务器通信的往返时间（毫秒） -- **offset** – 主机与远程节点或服务器时间源的时间偏移量，offset 越接近于0，主机和 NTP 服务器的时间越接近([方均根][25]表示，单位为毫秒) +- **offset** – 主机与远程节点或服务器时间源的时间偏移量，offset 越接近于0，主机和 NTP 服务器的时间越接近(以[方均根][25]表示，单位为毫秒) - **jitter** – 与远程节点同步的时间源的平均偏差（多个时间样本中的 offset 的偏差，单位是毫秒），这个数值的绝对值越小，主机的时间就越精确 #### 字段的统计代码 #### @@ -47,7 +46,7 @@ - “**-**” – 已不再使用 - “**#**” – 良好的远程节点或服务器但是未被使用 （不在按同步距离排序的前六个节点中，作为备用节点使用） - “**+**” – 良好的且优先使用的远程节点或服务器（包含在组合算法中） -- “*****” – 当前作为优先主同步对象的远程节点或服务器 +- “*” – 当前作为优先主同步对象的远程节点或服务器 - “**o**” – PPS 节点 (当优先节点是有效时)。实际的系统同步是源于秒脉冲信号（pulse-per-second，PPS），可能通过PPS 时钟驱动或者通过内核接口。 参考 [Clock Select Algorithm][27]. @@ -74,9 +73,9 @@ - **.WWV.** – [WWV][46] (HF, Ft. Collins, CO, America) 标准时间无线电接收器 - **.WWVB.** – [WWVB][47] (LF, Ft. Collins, CO, America) 标准时间无线电接收器 - **.WWVH.** – [WWVH][48] (HF, Kauai, HI, America) 标准时间无线电接收器 -- **.GOES.** – 美国 [静止环境观测卫星][49]; +- **.GOES.** – 美国[静止环境观测卫星][49]; - **.GPS.** – 美国 [GPS][50]; -- **.GAL.** – [伽利略定位系统][51] 欧洲 [GNSS][52]; +- **.GAL.** – [伽利略定位系统][51]欧洲 [GNSS][52]; - **.ACST.** – 选播服务器 - **.AUTH.** – 认证错误 - **.AUTO.** – Autokey （NTP 的一种认证机制）顺序错误 @@ -105,7 +104,7 @@ NTP 协议是高精度的，使用的精度小于纳秒（2的 -32 次方）。 #### “ntpq -c rl”输出参数 #### -- **precision** 为四舍五入值，且为 2 的幂数。因此精度为 2 的 *precision* 此幂（秒） +- **precision** 为四舍五入值，且为 2 的幂数。因此精度为 2^precision （秒） - **rootdelay** – 与同步网络中主同步服务器的总往返延时。注意这个值可以是正数或者负数，取决于时钟的精度。 - **rootdisp** – 相对于同步网络中主同步服务器的偏差(秒) - **tc** – NTP 算法 [PLL][59] （phase locked loop，锁相环路） 或 [FLL][60] (frequency locked loop，锁频回路) 时间常量 @@ -122,20 +121,20 @@ Jitter (也叫 timing jitter) 表示短期变化大于10HZ 的频率， wander NTP 软件维护一系列连续更新的频率变化的校正值。对于设置正确的稳定系统，在非拥塞的网络中，现代硬件的 NTP 时钟同步通常与 UTC 标准时间相差在毫秒内。（在千兆 LAN 网络中可以达到何种精度？） -对于 UTC 时间，[闰秒][62] 可以每两年插入一次用于同步地球自传的变化。注意本地时间为[夏令时][63]时时间会有一小时的变化。在重同步之前客户端设备会使用独立的 UTC 时间，除非客户端使用了偏移校准。 +对于 UTC 时间，[闰秒 leap second ][62] 可以每两年插入一次用于同步地球自传的变化。注意本地时间为[夏令时][63]时时间会有一小时的变化。在重同步之前客户端设备会使用独立的 UTC 时间，除非客户端使用了偏移校准。 #### [闰秒发生时会怎样][64] #### > 闰秒发生时，会对当天时间增加或减少一秒。闰秒的调整在 UTC 时间当天的最后一秒。如果增加一秒，UTC 时间会出现 23:59:60。即 23:59:59 到 0:00:00 之间实际上需要 2 秒钟。如果减少一秒，时间会从 23:59:58 跳至 0:00:00 。另见 [The Kernel Discipline][65]. -好了… 间隔阈值（step threshold）的真实值是多少: 125ms 还是 128ms？ PLL/FLL tc 的单位是什么 (log2 s? ms?)？在非拥塞的千兆 LAN 中时间节点间的精度能达到多少？ +那么… 间隔阈值（step threshold）的真实值是多少: 125ms 还是 128ms？ PLL/FLL tc 的单位是什么 (log2 s? ms?)？在非拥塞的千兆 LAN 中时间节点间的精度能达到多少？ 感谢 Camilo M 和 Chris B的评论。 欢迎校正错误和更多细节的探讨。 谢谢 Martin -### 外传 ### +### 附录 ### - [NTP 的纪元][66] 从 1900 开始而 UNIX 的从 1970开始. - [时间校正][67] 是逐渐进行的，因此时间的完全同步可能会画上几个小时。 @@ -152,7 +151,7 @@ Martin - [ntpq – 标准 NTP 查询程序][77] - [The Network Time Protocol (NTP) 分布][78] -- NTP 的简明 [历史][79] +- NTP 的简明[历史][79] - 一个更多细节的简明历史 “Mills, D.L., A brief history of NTP time: confessions of an Internet timekeeper. Submitted for publication; please do not cite or redistribute” ([pdf][80]) - [NTP RFC][81] 标准文档 - Network Time Protocol (Version 3) RFC – [txt][82], or [pdf][83]. Appendix E, The NTP Timescale and its Chronometry, p70, 包含了对过去 5000 年我们的计时系统的变化和关系的有趣解释。 @@ -165,7 +164,7 @@ Martin ### 其他 ### -SNTP （Simple Network Time Protocol, [RFC 4330][91]，简单未落协议）基本上也是NTP，但是缺少一些基于 [RFC 1305][92] 实现的 NTP 的一些不再需要的内部算法。 +SNTP （Simple Network Time Protocol, [RFC 4330][91]，简单网络协议）基本上也是NTP，但是少了一些基于 [RFC 1305][92] 实现的 NTP 的一些不再需要的内部算法。 Win32 时间 [Windows Time Service][93] 是 SNTP 的非标准实现，没有精度的保证，并假设精度几乎有 1-2 秒的范围。（因为没有系统时间变化校正） @@ -184,7 +183,7 @@ via: http://nlug.ml1.co.uk/2012/01/ntpq-p-output/831 作者：Martin L 译者：[Liao](https://github.com/liaosishere) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From e0433490251776767d7422f51524bd0cbabe6059 Mon Sep 17 00:00:00 2001 From: Ping Date: Wed, 14 Jan 2015 14:37:27 +0800 Subject: [PATCH 029/215] translated by ping --- ...image audio and video formats on Ubuntu.md | 88 ------------------- ...image audio and video formats on Ubuntu.md | 87 ++++++++++++++++++ 2 files changed, 87 insertions(+), 88 deletions(-) delete mode 100644 sources/tech/20141009 How to convert image audio and video formats on Ubuntu.md create mode 100644 translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md diff --git a/sources/tech/20141009 How to convert image audio and video formats on Ubuntu.md b/sources/tech/20141009 How to convert image audio and video formats on Ubuntu.md deleted file mode 100644 index bea1e35659..0000000000 --- a/sources/tech/20141009 How to convert image audio and video formats on Ubuntu.md +++ /dev/null @@ -1,88 +0,0 @@ -Ping - Translating - -How to convert image, audio and video formats on Ubuntu -================================================================================ -If you need to work with a variety of image, audio and video files encoded in all sorts of different formats, you are probably using more than one tools to convert among all those heterogeneous media formats. If there is a versatile all-in-one media conversion tool that is capable of dealing with all different image/audio/video formats, that will be awesome. - -[Format Junkie][1] is one such all-in-one media conversion tool with an extremely user-friendly GUI. Better yet, it is free software! With Format Junkie, you can convert image, audio, video and archive files of pretty much all the popular formats simply with a few mouse clicks. - -### Install Format Junkie on Ubuntu 12.04, 12.10 and 13.04 ### - -Format Junkie is available for installation via Ubuntu PPA format-junkie-team. This PPA supports Ubuntu 12.04, 12.10 and 13.04. To install Format Junkie on one of those Ubuntu releases, simply run the following. - - $ sudo add-apt-repository ppa:format-junkie-team/release - $ sudo apt-get update - $ sudo apt-get install formatjunkie - $ sudo ln -s /opt/extras.ubuntu.com/formatjunkie/formatjunkie /usr/bin/formatjunkie - -### Install Format Junkie on Ubuntu 13.10 ### - -If you are running Ubuntu 13.10 (Saucy Salamander), you can download and install .deb package for Ubuntu 13.04 as follows. Since the .deb package for Format Junkie requires quite a few dependent packages, install it using [gdebi deb installer][2]. - -On 32-bit Ubuntu 13.10: - - $ wget https://launchpad.net/~format-junkie-team/+archive/release/+files/formatjunkie_1.07-1~raring0.2_i386.deb - $ sudo gdebi formatjunkie_1.07-1~raring0.2_i386.deb - $ sudo ln -s /opt/extras.ubuntu.com/formatjunkie/formatjunkie /usr/bin/formatjunkie - -On 64-bit Ubuntu 13.10: - - $ wget https://launchpad.net/~format-junkie-team/+archive/release/+files/formatjunkie_1.07-1~raring0.2_amd64.deb - $ sudo gdebi formatjunkie_1.07-1~raring0.2_amd64.deb - $ sudo ln -s /opt/extras.ubuntu.com/formatjunkie/formatjunkie /usr/bin/formatjunkie - -### Install Format Junkie on Ubuntu 14.04 or Later ### - -The currently available official Format Junkie .deb file requires libavcodec-extra-53 which has become obsolete starting from Ubuntu 14.04. Thus if you want to install Format Junkie on Ubuntu 14.04 or later, you can use the following third-party PPA repositories instead. - - $ sudo add-apt-repository ppa:jon-severinsson/ffmpeg - $ sudo add-apt-repository ppa:noobslab/apps - $ sudo apt-get update - $ sudo apt-get install formatjunkie - -### How to Use Format Junkie ### - -To start Format Junkie after installation, simply run: - - $ formatjunkie - -#### Convert audio, video, image and archive formats with Format Junkie #### - -The user interface of Format Junkie is pretty simple and intuitive, as shown below. To choose among audio, video, image and iso media, click on one of four tabs at the top. You can add as many files as you want for batch conversion. After you add files, and select output format, simply click on "Start Converting" button to convert. - -![](http://farm9.staticflickr.com/8107/8643695905_082b323059.jpg) - -Format Junkie supports conversion among the following media formats: - -- **Audio**: mp3, wav, ogg, wma, flac, m4r, aac, m4a, mp2. -- **Video**: avi, ogv, vob, mp4, 3gp, wmv, mkv, mpg, mov, flv, webm. -- **Image**: jpg, png, ico, bmp, svg, tif, pcx, pdf, tga, pnm. -- **Archive**: iso, cso. - -#### Subtitle encoding with Format Junkie #### - -Besides media conversion, Format Junkie also provides GUI for subtitle encoding. Actual subtitle encoding is done by MEncoder. In order to do subtitle encoding via Format Junkie interface, first you need to install MEencoder. - - $ sudo apt-get install mencoder - -Then click on "Advanced" tab on Format Junkie. Choose AVI/subtitle files to use for encoding, as shown below. - -![](http://farm9.staticflickr.com/8100/8644791396_bfe602cd16.jpg) - -Overall, Format Junkie is an extremely easy-to-use and versatile media conversion tool. One drawback, though, is that it does not allow any sort of customization during conversion (e.g., bitrate, fps, sampling frequency, image quality, size). So this tool is recommended for newbies who are looking for an easy-to-use simple media conversion tool. - -Enjoyed this post? I will appreciate your like/share buttons on Facebook, Twitter and Google+. - --------------------------------------------------------------------------------- - -via: http://xmodulo.com/how-to-convert-image-audio-and-video-formats-on-ubuntu.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]:https://launchpad.net/format-junkie -[2]:http://xmodulo.com/how-to-install-deb-file-with-dependencies.html diff --git a/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md b/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md new file mode 100644 index 0000000000..8dee779cea --- /dev/null +++ b/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md @@ -0,0 +1,87 @@ +如何在Ubuntu上转换图片音频和视频格式 +================================================================================ + +如果你的工作中需要接触到各种不同编码格式的图片、音频和视频，那么你或许正在使用多个工具来转换这些不同的媒介格式。如果存在一个能够处理所有文件/音频/视频格式的多和一的转换工具，那就太好了。 + +[Format Junkie][1] 就是这样一个有着极其友好的用户界面的多和一的媒介转换工具。更棒的是它是一个免费软件。你可以使用 Format Junkie 来转换几乎所有的流行格式的图像、音频、视频和归档文件（或称压缩文件），所有这些只需要简单地点击几下鼠标而已。 + +### 在Ubuntu 12.04, 12.10 和 13.04 上安装 Format Junkie ### + +Format Junkie 可以通过 Ubuntu PPA format-junkie-team 进行安装。这个PPA支持Ubuntu 12.04, 12.10 和 13.04。在以上任意一种Ubuntu版本中安装Format Junkie的话，简单的执行一下命令即可： + + $ sudo add-apt-repository ppa:format-junkie-team/release + $ sudo apt-get update + $ sudo apt-get install formatjunkie + $ sudo ln -s /opt/extras.ubuntu.com/formatjunkie/formatjunkie /usr/bin/formatjunkie + +### 将 Format Junkie 安装到 Ubuntu 13.10 ### + +如果你正在运行Ubuntu 13.10 (Saucy Salamander)，你可以按照以下步骤下载 .deb 安装包来进行安装。由于Format Junkie 的 .deb 安装包只有很少的依赖包，所以使用 [gdebi deb installer][2] 来按安装它。 + +在32位版Ubuntu 13.10上： + + $ wget https://launchpad.net/~format-junkie-team/+archive/release/+files/formatjunkie_1.07-1~raring0.2_i386.deb + $ sudo gdebi formatjunkie_1.07-1~raring0.2_i386.deb + $ sudo ln -s /opt/extras.ubuntu.com/formatjunkie/formatjunkie /usr/bin/formatjunkie + +在32位版Ubuntu 13.10上： + + $ wget https://launchpad.net/~format-junkie-team/+archive/release/+files/formatjunkie_1.07-1~raring0.2_amd64.deb + $ sudo gdebi formatjunkie_1.07-1~raring0.2_amd64.deb + $ sudo ln -s /opt/extras.ubuntu.com/formatjunkie/formatjunkie /usr/bin/formatjunkie + +### 将 Format Junkie 安装到 Ubuntu 14.04 或 之后版本 ### + +现有的可供使用的官方 Format Junkie .deb 文件 需要 libavcodec-extra-53，这个东西从Ubuntu 14.04开始就已经过时了。所以如果你想在Ubuntu 14.04或之后版本上安装Format Junkie的话，可以使用以下的第三方PPA来代替。 + + $ sudo add-apt-repository ppa:jon-severinsson/ffmpeg + $ sudo add-apt-repository ppa:noobslab/apps + $ sudo apt-get update + $ sudo apt-get install formatjunkie + +### 如何使用 Format Junkie ### + +安装完成后，只需运行以下命令即可启动 Format Junkie： + + $ formatjunkie + +#### 使用 Format Junkie 来转换音频、视频、图像和归档格式 #### + +就像下方展示的一样，Format Junkie 的用户界面简单而且直观。在音频、视频、图像和iso媒介之间进行选择，在顶部四个标签当中点击你需要的那个。你可以根据需要添加无限量的文件用于批量转换。添加文件后，选择输出格式，直接点击 "Start Converting" 按钮进行转换。 + +![](http://farm9.staticflickr.com/8107/8643695905_082b323059.jpg) + +Format Junkie支持以下媒介媒介媒介格式间的转换： + +- **Audio**: mp3, wav, ogg, wma, flac, m4r, aac, m4a, mp2. +- **Video**: avi, ogv, vob, mp4, 3gp, wmv, mkv, mpg, mov, flv, webm. +- **Image**: jpg, png, ico, bmp, svg, tif, pcx, pdf, tga, pnm. +- **Archive**: iso, cso. + +#### 用 Format Junkie 进行字幕编码 #### + +除了媒介转换，Format Junkie 可提供了字幕编码的图形界面。实际的字幕编码是由MEncoder来完成的。为了使用Format Junkie的字幕编码接口，首先你需要安装MEencoder。 + + $ sudo apt-get install mencoder + +然后点击Format Junkie 中的 "Advanced"标签。选择 AVI/subtitle 文件来进行编码，如下所示： + +![](http://farm9.staticflickr.com/8100/8644791396_bfe602cd16.jpg) + +总而言之，Format Junkie 是一个非常易于使用和多才多艺的媒介转换工具。但也有一个缺陷，它不允许对转换进行任何定制化（例如：比特率，帧率，采样频率，图像质量，尺寸）。所以这个工具推荐正在寻找一个简单易用的媒介转换工具的新手使用。 + +喜欢这篇文章吗？在facebook、twitter和google+上给我点赞吧。多谢！ + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/how-to-convert-image-audio-and-video-formats-on-ubuntu.html + +作者：[Dan Nanni][a] +译者：[Ping](https://github.com/mr-ping) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://xmodulo.com/author/nanni +[1]:https://launchpad.net/format-junkie +[2]:http://xmodulo.com/how-to-install-deb-file-with-dependencies.html From 6b0663b4fad108e3a6b15ceca4a4817a1435c9da Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 14 Jan 2015 21:00:50 +0800 Subject: [PATCH 030/215] PUB:20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu @zhouj-sh --- ...er When Dual Booting Windows And Ubuntu.md | 67 ++++++++++--------- 1 file changed, 37 insertions(+), 30 deletions(-) rename {translated/share => published}/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md (59%) diff --git a/translated/share/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md b/published/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md similarity index 59% rename from translated/share/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md rename to published/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md index 0342aaf726..d182bd2f77 100644 --- a/translated/share/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md +++ b/published/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md @@ -4,7 +4,9 @@ Windows和Ubuntu双系统，修复UEFI引导的两种办法 这里有两种修复EFI启动引导的方法，使Ubuntu可以正常启动 -![](http://0.tqn.com/y/linux/1/L/E/J/1/grub2.JPG) "将GRUB2设置为启动引导" +![](http://0.tqn.com/y/linux/1/L/E/J/1/grub2.JPG) + +*将GRUB2设置为启动引导* ### 1. 启用GRUB引导 ### @@ -18,22 +20,22 @@ Windows和Ubuntu双系统，修复UEFI引导的两种办法 可以按照以下几个步骤将GRUB2设置为默认的引导程序： -1.登录Windows 8 -2.转到桌面 -3.右击开始按钮，选择管理员命令行 -4.输入 mountvol g: (将你的EFI目录结构映射到G盘) -5.输入 cd g:\EFI -6.当你输入 dir 列出文件夹内容时，你可以看到一个Ubuntu的文件夹 -7.这里的参数可以是grubx64.efi或者shimx64.efi -8.运行下列命令将grub64.efi设置为启动引导程序： +1. 登录Windows 8 +2. 转到桌面 +3. 右击开始按钮，选择管理员命令行 +4. 输入 mountvol g: /s (这将你的EFI目录结构映射到G盘) +5. 输入 cd g:\EFI +6. 当你输入 dir 列出文件夹内容时，你可以看到一个Ubuntu的文件夹 +7. 这里的参数可以是grubx64.efi或者shimx64.efi +8. 运行下列命令将grub64.efi设置为启动引导程序： bcdedit /set {bootmgr} path \EFI\ubuntu\grubx64.efi -9.重启你的电脑 -10.你将会看到一个包含Ubuntu和Windows选项的GRUB菜单 -11.如果你的电脑仍然直接启动到Windows，重复步骤1到7，但是这次输入： +9. 重启你的电脑 +10. 你将会看到一个包含Ubuntu和Windows选项的GRUB菜单 +11. 如果你的电脑仍然直接启动到Windows，重复步骤1到7，但是这次输入： bcdedit /set {bootmgr} path \EFI\ubuntu\shimx64.efi -12.重启你的电脑 +12. 重启你的电脑 -这里你做的事情是登录Windows管理员命令行，将EFI引导区映射到磁盘上，来查看Ubuntu的引导程序是否安装成功，然后选择grubx64.efi或者shimx64.efi作为引导程序。 +这里你做的事情就是登录Windows管理员命令行，将EFI引导区映射到磁盘上，来查看Ubuntu的引导程序是否安装成功，然后选择grubx64.efi或者shimx64.efi作为引导程序。 那么[grubx64.efi和shimx64.efi有什么区别呢][4]？在安全启动（serureboot）关闭的情况下，你可以使用grubx64.efi。如果安全启动打开则需要选择shimx64.efi。 @@ -41,28 +43,30 @@ bcdedit /set {bootmgr} path \EFI\ubuntu\shimx64.efi ### 2.使用rEFInd引导Ubuntu和Windows双系统 ### +![](http://f.tqn.com/y/linux/1/L/F/J/1/refind.png) + [rEFInd引导程序][5]会以图标的方式列出你所有的操作系统。因此，你可以通过点击相应的图标来启动Windows、Ubuntu或者优盘中的操作系统。 [点击这里][6]下载rEFInd for Windows 8。 下载和解压以后，按照以下的步骤安装rEFInd。 -1.返回桌面 -2.右击开始按钮，选择管理员命令行 -3.输入 mountvol g: (将你的EFI目录结构映射到G盘) -4.进入解压的rEFInd目录。例如： -cd c:\users\gary\downloads\refind-bin-0.8.4\refind-bin-0.8.4 +1. 返回桌面 +2. 右击开始按钮，选择管理员命令行 +3. 输入 mountvol g: /s (这将你的EFI目录结构映射到G盘) +4. 进入解压的rEFInd目录。例如： +cd c:\users\gary\downloads\refind-bin-0.8.4\refind-bin-0.8.4 。 当你输入 dir 命令，你可以看到一个refind目录 -5.输入如下命令将refind拷贝到EFI引导区 +5. 输入如下命令将refind拷贝到EFI引导区 xcopy /E refind g:\EFI\refind\ -6.输入如下命令进入refind文件夹 +6. 输入如下命令进入refind文件夹 cd g:\EFI\refind -7.重命名示例配置文件 +7. 重命名示例配置文件 rename refind.conf-sample refind.conf -8.运行如下命令将rEFind设置为引导程序 +8. 运行如下命令将rEFind设置为引导程序 bcdedit /set {bootmgr} path \EFI\refind\refind_x64.efi -9.重启你的电脑 -10.你将会看到一个包含Ubuntu和Windows的图形菜单 +9. 重启你的电脑 +10. 你将会看到一个包含Ubuntu和Windows的图形菜单 这个过程和选择GRUB引导程序十分相似。 @@ -72,17 +76,20 @@ bcdedit /set {bootmgr} path \EFI\refind\refind_x64.efi 希望这篇文章可以解决有些人在安装Ubuntu和Windows 8.1双系统时出现的问题。如果你仍然有问题，可以通过上面的电邮和我进行交流。 +--- +via: http://linux.about.com/od/LinuxNewbieDesktopGuide/tp/3-Ways-To-Fix-The-UEFI-Bootloader-When-Dual-Booting-Windows-And-Ubuntu.htm + + 作者：[Gary Newell][a] 译者：[zhouj-sh](https://github.com/zhouj-sh) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -via:http://linux.about.com/od/LinuxNewbieDesktopGuide/tp/3-Ways-To-Fix-The-UEFI-Bootloader-When-Dual-Booting-Windows-And-Ubuntu.htm [a]:http://linux.about.com/bio/Gary-Newell-132058.htm -[1]:http://linux.about.com/od/LinuxNewbieDesktopGuide/ss/The-Ultimate-Windows-81-And-Ubuntu- -[2]:http://linux.about.com/od/howtos/ss/How-To-Create-A-UEFI-Bootable-Ubuntu-USB-Drive-Using-Windows_3.htm#step-heading -[3]:http://linux.about.com/od/howtos/ss/How-To-Create-A-UEFI-Bootable-Ubuntu-USB-Drive-Using-Windows.htm +[1]:http://linux.cn/article-3178-1.html +[2]:http://linux.cn/article-3178-1.html#4_3289 +[3]:http://linux.cn/article-3178-1.html#4_1717 [4]:https://wiki.ubuntu.com/SecurityTeam/SecureBoot [5]:http://www.rodsbooks.com/refind/installing.html#windows [6]:http://sourceforge.net/projects/refind/files/0.8.4/refind-bin-0.8.4.zip/download \ No newline at end of file From 60cfb46909cc8e962163d5bfc0f60aaf75a4a60e Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 14 Jan 2015 21:03:28 +0800 Subject: [PATCH 031/215] =?UTF-8?q?=E8=AF=A5=E6=96=87=E5=B7=B2=E6=9C=89?= =?UTF-8?q?=E4=B8=80=E6=A0=B7=E7=9A=84=E5=8F=91=E5=B8=83=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 所以不发布了。 --- ...g Started With Ubuntu 14.04 (PDF Guide).md | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 translated/share/20141208 Getting Started With Ubuntu 14.04 (PDF Guide).md diff --git a/translated/share/20141208 Getting Started With Ubuntu 14.04 (PDF Guide).md b/translated/share/20141208 Getting Started With Ubuntu 14.04 (PDF Guide).md deleted file mode 100644 index 2488e72f24..0000000000 --- a/translated/share/20141208 Getting Started With Ubuntu 14.04 (PDF Guide).md +++ /dev/null @@ -1,22 +0,0 @@ -开始使用Ubuntu 14.04（PDF指南） -================================================================================ -开始熟悉每天的任务，像上网冲浪，听听音乐，还有扫描文档之类。 - -好好享受这份全面而综合的Ubuntu操作系统初学者指南吧。本教程适用于任何经验等级的人，跟着傻瓜式的指令一步一步操作吧。好好探索Ubuntu系统的潜力吧，你不会因为技术细节而陷入困境。 - -- [**开始使用Ubuntu 14.04 (PDF指南)**][1] - -![](http://img.tradepub.com/free/w_ubun06/images/w_ubun06c.gif) - --------------------------------------------------------------------------------- - -via: http://www.ubuntugeek.com/getting-started-with-ubuntu-14-04-pdf-guide.html - -作者：[ruchi][a] -译者：[GOLinux](https://github.com/GOLinux) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.ubuntugeek.com/author/ubuntufix -[1]:http://ubuntugeek.tradepub.com/free/w_ubun06/ From 03d18259520456c08d2ee72b3fd42d8ec13ac5a3 Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 14 Jan 2015 21:42:54 +0800 Subject: [PATCH 032/215] PUB:20141211 NetHack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @Stevearzh 翻译的很不错！游戏也很给力！ --- .../share => published}/20141211 NetHack.md | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) rename {translated/share => published}/20141211 NetHack.md (79%) diff --git a/translated/share/20141211 NetHack.md b/published/20141211 NetHack.md similarity index 79% rename from translated/share/20141211 NetHack.md rename to published/20141211 NetHack.md index 4b6c3ecea5..20c504bb11 100644 --- a/translated/share/20141211 NetHack.md +++ b/published/20141211 NetHack.md @@ -1,10 +1,9 @@ -NetHack +也许是有史以来最好的游戏：NetHack ================================================================================ -## 一直以来最好的游戏？ ## **这款游戏非常容易让你上瘾。你可能需要花费一生的时间来掌握它。许多人玩了几十年也没有通关。欢迎来到 NetHack 的世界...** -不管你信不信，在 NetHack 里你见到字母 D 的时候你会被吓着。但是当你看见一个 % 的时候，你将会欣喜若狂。（忘了说 ^，你看见它将会更激动）在你寻思我们的脑子是不是烧坏了并准备关闭浏览器标签之前，请给我们一点时间解释：这些符号分别代表龙、食物以及陷阱。欢迎来到 NetHack 的世界，在这里你的想象力需要发挥巨大的作用。 +不管你信不信，在 NetHack 里你见到字母 **D** 的时候你会被吓着。但是当你看见一个 **%** 的时候，你将会欣喜若狂。（忘了说 **\^**，你看见它将会更激动）在你寻思我们的脑子是不是烧坏了并准备关闭浏览器标签之前，请给我们一点时间解释：这些符号分别代表龙、食物以及陷阱。欢迎来到 NetHack 的世界，在这里你的想象力需要发挥巨大的作用。 如你所见，NetHack 是一款文字模式的游戏：它仅仅使用标准终端字符集来刻画玩家、敌人、物品还有环境。游戏的图形版是存在的，不过 NetHack 的骨灰级玩家们都倾向于不去使用它们，问题在于假如你使用图形界面，当你通过 SSH 登录到你的古董级的运行着 NetBSD 的 Amiga 3000 上时，你还能进行游戏吗？在某些方面，NetHack 和 Vi 非常相似 - 几乎被移植到了现存的所有的操作系统上，并且依赖都非常少。 @@ -16,68 +15,68 @@ NetHack ![NetHack 界面](http://www.linuxvoice.com/wp-content/uploads/2014/12/nh_annotated.png) -NetHack 界面 +*NetHack 界面* ### 也许是最古老的仍在开发的游戏里 ### 名非其实，NetHack 并不是一款网络游戏。它只不过是基于一款出现较早的名为 Hack 的地牢探险类游戏开发出来的，而这款 Hack 游戏是 1980 年的游戏 Rogue 的后代。NetHack 在 1987 年发布了第一个版本，并于 2003 年发布了 3.4.3 版本，尽管在这期间一直没有加入新的功能，但各种补丁、插件，以及衍生作品还是在网络上疯狂流传。这使得它可以说是最古老的、拥有众多对游戏乐此不疲的粉丝的游戏。当你访问 [www.reddit.com/r/nethack][1] 之后，你就会了解我们的意思了 - 骨灰级的 NetHack 的玩家们仍然聚集在一起讨论新的策略、发现和技巧。偶尔你也可以发现 NetHack 的元老级玩家在历经千辛万苦终于通关之后发出的欢呼。 - 但怎样才能通关呢？首先，NetHack 被设定在既大又深的地牢中。游戏开始时你在最顶层 - 第 1 层 - 你的目标是不断往下深入直到你找到一个非常宝贵的物品，护身符 Yendor。通常来说 Yendor 在 第 20 层或者更深的地方，但它是可以变化的。随着你在地牢的不断深入，你会遇到各种各样的怪物、陷阱以及 NPC；有些会试图杀掉你，有些会挡在你前进的路上，还有些... 总而言之，在你靠近 TA 们之前你永远不知道 TA 们会怎样。 > 要学习的有太多太多，绝大多数物品只有在和其他物品同时使用的情况下才会发挥最好的效果。 -是 NetHack 如此引人入胜的原因是游戏中所加入的大量物品。武器、盔甲、附魔书、戒指、宝石 - 要学习的有太多太多，绝大多数物品只有在和其他物品同时使用的情况下才会发挥最好的效果。怪物在死亡后经常会掉落一些有用的物品，以及某些物品如果你不正确使用的话会产生及其不良的作用。你可以在地牢找到商店，里面有许多看似平凡实则非常有用的物品，，不过别指望店主能给你详细的描述。你只能靠自己的经验来了解各个物品的用途。有些物品确实没有太大用处，NetHack 中有很多的恶搞元素 - 比如你可以把一块奶油砸到自己的脸上。 +使 NetHack 如此引人入胜的原因是游戏中所加入的大量物品。武器、盔甲、附魔书、戒指、宝石 - 要学习的有太多太多，绝大多数物品只有在和其他物品同时使用的情况下才会发挥最好的效果。怪物在死亡后经常会掉落一些有用的物品，以及某些物品如果你不正确使用的话会产生及其不良的作用。你可以在地牢找到商店，里面有许多看似平凡实则非常有用的物品，不过别指望店主能给你详细的描述。你只能靠自己的经验来了解各个物品的用途。有些物品确实没有太大用处，NetHack 中有很多的恶搞元素 - 比如你可以把一块奶油砸到自己的脸上。 不过在你踏入地牢之前，NetHack 会询问你要选择哪种角色进行游戏。你可以为你接下来的地牢之行选择骑士、修道士、巫师，或者卑微的旅者，还有许多其他的角色类型。每种角色都有其独特的优势与弱点，NetHack 的重度玩家喜欢选择那些相对较弱的角色来挑战游戏。你懂的，这样可以向其他玩家炫耀自己的实力。 -> ## 情报不会降低游戏的乐趣 ## +> **情报不会降低游戏的乐趣** > 用 NetHack 的说法来讲，“情报员”给指其他玩家提供关于怪物、物品、武器和盔甲信息的玩家。理论上来说，完全可以不借助任何外来信息而通关，但几乎没有几个玩家能做到，游戏实在是太难了。因此使用情报并不会被视为一件糟糕的事情 - 但是一开始由你自己来探索游戏和解决难题，这样才会获得更多的乐趣，只有当你遇到瓶颈的时候再去使用那些情报。 > 在这里给出一个比较有名的情报站点 [www.statslab.cam.ac.uk/~eva/nethack/spoilerlist.html][2]，其中的情报被分为了不同的类别。游戏中随机发生的事，比如在喷泉旁饮水可能导致的不同结果，从这里你可以得知已确定的不同结果的发生概率。 > -> ### 你的首次地牢之行 ### -NetHack 几乎可以在所有的主流操作系统以及 Linux 发行版上运行，因此你可以通过 "apt-get install nethack" 或者 "yum install nethack" 等适合你用的发行版的命令来安装游戏。安装完毕后，在一个命令行窗口中键入 "nethack" 就可以开始游戏了。游戏开始时系统会询问是否为你随机挑选一位角色 - 但作为一个新手，你最好自己从里面挑选一位比较强的角色。所以，你应该点 "n"，然后点 "v" 以选取女武神（Valkyrie），最后点 "d" 选择成为侏儒（dwarf）。 +### 你的首次地牢之行 ### + +NetHack 几乎可以在所有的主流操作系统以及 Linux 发行版上运行，因此你可以通过 "apt-get install nethack" 或者 "yum install nethack" 等适合你用的发行版的命令来安装游戏。安装完毕后，在一个命令行窗口中键入 "nethack" 就可以开始游戏了。游戏开始时系统会询问是否为你随机挑选一位角色 - 但作为一个新手，你最好自己从里面挑选一位比较强的角色。所以，你应该点 "n"，然后点 "v" 以选取女武神（Valkyrie），而点 "d" 会选择成为侏儒（dwarf）。 接着 NetHack 上会显示出剧情，说你的神正在寻找护身符 Yendor，你的目标就是找到它并将它带给神。阅读完毕后点击空格键（其他任何时候当你见到屏幕上的 "-More-" 时都可以这样）。接着就让我们出发 - 开始地牢之行吧！ -先前已经介绍过了，你的角色用 @ 来表示。你可以看见角色所出房间周围的墙壁，房间里显示点的那些地方是你可以移动的空间。首先，你得明白怎样移动角色：h、j、k 以及 l。（是的，和 Vim 中移动光标的操作相同）这些操作分别会使角色向向左、向下、向上以及向右移动。你也可以通过 y、u、b 和 n 来使角色斜向移动。在你熟悉如何控制角色移动前你最好在房间里来回移动你的角色。 +先前已经介绍过了，你的角色用 @ 来表示。你可以看见角色所出房间周围的墙壁，房间里显示“点”的那些地方是你可以移动的空间。首先，你得明白怎样移动角色：h、j、k 以及 l。（是的，和 Vim 中移动光标的操作相同）这些操作分别会使角色向向左、向下、向上以及向右移动。你也可以通过 y、u、b 和 n 来使角色斜向移动。在你熟悉如何控制角色移动前你最好在房间里来回移动你的角色。 -NetHack 采用了回合制，因此即使你不进行任何动作，游戏仍然在进行。这是你可以提前计划你的行动。你可以看见一个 "d" 字符或者 "f" 字符在房间里来回移动：这是你的宠物狗/猫，（通常情况下）它们 不会伤害你而是帮助你击杀怪物。但是宠物也会被惹怒 - 它们偶尔也会抢在你接近食物或者怪物尸体之前吃掉它们。 +NetHack 采用了回合制，因此即使你不进行任何动作，游戏仍然在进行。这是你可以提前计划你的行动。你可以看见一个 "d" 字符或者 "f" 字符在房间里来回移动：这是你的宠物狗/猫，（通常情况下）它们不会伤害你而是帮助你击杀怪物。但是宠物也会被惹怒 - 它们偶尔也会抢在你接近食物或者怪物尸体之前吃掉它们。 ![点击 “i” 列出你当前携带的物品清单](http://www.linuxvoice.com/wp-content/uploads/2014/12/nh_inventory.png) -点击 “i” 列出你当前携带的物品清单 +*点击 “i” 列出你当前携带的物品清单* ### 门后有什么？ ### 接下来，让我们离开房间。房间四周的墙壁某处会有缝隙，可能是 "+" 号。"+" 号表示一扇关闭的门，这时你应该靠近它然后点击 "o" 来开门。接着系统会询问你开门的方向，假如门在你的左方，就点击 "h"。（如果门被卡住了，就多试几次）然后你就可以看见门后的走廊了，它们由 "#" 号表示，沿着走廊前进直到你找到另一个房间。 -地牢之行中你会见到各种各样的物品。某些物品，比如金币（由 "$" 号表示）会被自动捡起来；至于另一些物品，你只能站在上面按下逗号键手动拾起。如果同一位置有多个物品，系统会给你显示一个列表，你只要通过合适的案件选择列表中你想要的物品最后按下 "Enter" 键即可。任何时间你都可以点击 "i" 键在屏幕上列出你当前携带的物品清单。 +地牢之行中你会见到各种各样的物品。某些物品，比如金币（由 "$" 号表示）会被自动捡起来；至于另一些物品，你只能站在上面按下逗号键手动拾起。如果同一位置有多个物品，系统会给你显示一个列表，你只要通过合适的按键选择列表中你想要的物品最后按下 "Enter" 键即可。任何时间你都可以点击 "i" 键在屏幕上列出你当前携带的物品清单。 -如果看见了怪物该怎么办？在游戏早期，你可能会遇到的怪物会用符号 "d"、"x" 和 ":" 表示。想要攻击的话，只要简单地朝怪物的方向移动即可。系统会在屏幕顶部通过信息显示来告诉你你的攻击是否成功 - 以及怪物做出了何种反应。早期的怪物很容易击杀，所以你可以毫不费力地打败他们，但请留意底部状态栏里显示的角色的 HP 值。 +如果看见了怪物该怎么办？在游戏早期，你可能会遇到的怪物会用符号 "d"、"x" 和 ":" 表示。想要攻击的话，只要简单地朝怪物的方向移动即可。系统会在屏幕顶部通过信息显示来告诉你攻击是否成功 - 以及怪物做出了何种反应。早期的怪物很容易击杀，所以你可以毫不费力地打败他们，但请留意底部状态栏里显示的角色的 HP 值。 > 早期的怪物很容易击杀，但请留意角色的 HP 值。 -如果怪物死后掉落了一具尸体（"%"），你可以点击逗号进行拾取，并点击 "e" 来食用。（在任何时候系统提示你选择一件物品，你都可以从物品列表中点击相应的按键，或者点击 "?" 来查询迷你菜单。）主意！有些尸体是有毒的，这些知识你将在日后的冒险中逐渐学会掌握。 +如果怪物死后掉落了一具尸体（"%"），你可以点击逗号进行拾取，并点击 "e" 来食用。（在任何时候系统提示你选择一件物品，你都可以从物品列表中点击相应的按键，或者点击 "?" 来查询迷你菜单。）注意！有些尸体是有毒的，这些知识你将在日后的冒险中逐渐学会掌握。 -如果你在走廊里行进时遇到了死胡同，你可以点击 "s" 进行搜寻直到找到一扇门。这会花费时间，但是你由此加速了游戏进程：输入 "10" 并点击 "s" 你将一下搜索 10 次。这将花费游戏中进行 10 次动作的时间，不过如果你正在饥饿状态，你将有可能会被饿死。 +如果你在走廊里行进时遇到了死胡同，你可以点击 "s" 进行搜寻直到找到一扇门。这会花费时间，但是你可以这样加速游戏进程：输入 "10" 并点击 "s" 你将一下搜索 10 次。这将花费游戏中进行 10 次动作的时间，不过如果你正在饥饿状态，你将有可能会被饿死！ -通常你可以在地牢顶部找到 "{"（喷泉）以及 "!"（药水）。当你找到喷泉的时候，你可以站在上面并点击 "q" 键开始 “畅饮（quaff）” - 引用后会得到积极的到致命的多种效果。当你找到药水的时候，将其拾起并点击 "q" 来引用。如果你找到一个商店，你可以拾取其中的物品并在离开前点击 "p" 键进行支付。当你负重过大时，你可以点击 "d" 键丢掉一些东西。 +通常你可以在地牢顶部找到 "{"（喷泉）以及 "!"（药水）。当你找到喷泉的时候，你可以站在上面并点击 "q" 键开始 “畅饮（quaff）” - 引用后会得到从振奋的到致命的多种效果。当你找到药水的时候，将其拾起并点击 "q" 来饮用。如果你找到一个商店，你可以拾取其中的物品并在离开前点击 "p" 键进行支付。当你负重过大时，你可以点击 "d" 键丢掉一些东西。 ![现在已经有带音效的 3D 版 Nethack 了，如：Falcon’s Eye](http://www.linuxvoice.com/wp-content/uploads/2014/12/falcon.jpg) -现在已经有带音效的 3D 版 Nethack 了，如：Falcon’s Eye +*现在已经有带音效的 3D 版 Nethack 了，如：Falcon’s Eye* -> ## 愚蠢的死法 ## +> **愚蠢的死法** -> 在 NetHack 玩家中流行着一个缩写词 "YASD" - 又一种愚蠢的死法（Yet Another Stupid Death）。这个缩写词表示了玩家由于自身的的愚蠢或者粗心大意导致了角色的死亡。我们搜集了很多这类死法，但我们最喜欢的是下面描述的： +> 在 NetHack 玩家中流行着一个缩写词 "YASD" - 又一种愚蠢的死法（Yet Another Stupid Death）。这个缩写词表示了玩家由于自身的的愚蠢或者粗心大意导致了角色的死亡。我们搜集了很多这类死法，但我们最喜欢的是下面这种死法： > 我们正在商店浏览商品，这时一条蛇突然从药剂后面跳了出来。在杀死蛇之后，系统弹出一条信息提醒我们角色饥饿值过低了，因此我们顺手食用了蛇的尸体。坏事了！这使得我们的角色失明，导致我们的角色再也不能看见商店里的其他角色及地上的商品了。我们试图离开商店，但在慌乱中却撞在了店主身上并攻击了他。这种做法激怒了店主：他立即向我们的角色使用了火球术。我们试图逃到商店外的走廊上，但却在逃亡的过程中被烧死。 -> 如果你有类似的死法，一定要来我们的论坛告诉我们。不要担心 - 没有人会嘲笑你。经历这样的死法也是你在 NetHack 的世界里不断成长的一部分。 +> 如果你有类似的死法，一定要来我们的论坛告诉我们。不要担心 - 没有人会嘲笑你。经历这样的死法也是你在 NetHack 的世界里不断成长的一部分。哈哈。 ### 武装自己 ### @@ -85,7 +84,7 @@ NetHack 采用了回合制，因此即使你不进行任何动作，游戏仍然 在靠近掉在地下的装备之前最好检查一下身上的东西。点击 ";"（分号）后，"Pick an object"（选择一样物品）选项将出现在屏幕顶部。选择该选项，使用移动键直到选中你想要检查的物品，然后点击 ":"（冒号）。接着屏幕顶部将出现这件物品的描述。 -因为你的目标是不断深入地牢直到找到护身符 Yendor，所以请随时留意周围的 "<" 和 ">" 符号。这两个符号分别表示向上和向下的楼梯，你可以用与之对应的按键来上楼或下楼。注意！如果你想让宠物跟随你进入下/上一层地牢，下/上楼前请确保你的宠物在你邻近的方格内。若果你想退出，点击 "S"（大写的 s）来保存进度，输入 #quit 退出游戏。当你再次运行 NetHack 时，系统将会自动读取你上次退出时的游戏进度。 +因为你的目标是不断深入地牢直到找到护身符 Yendor，所以请随时留意周围的 "<" 和 ">" 符号。这两个符号分别表示向上和向下的楼梯，你可以用与之对应的按键来上楼或下楼。注意！如果你想让宠物跟随你进入下/上一层地牢，下/上楼前请确保你的宠物在你邻近的方格内。若果你想退出，点击 "S"（大写的）来保存进度，输入 #quit 退出游戏。当你再次运行 NetHack 时，系统将会自动读取你上次退出时的游戏进度。 我们就不继续剧透了，地牢深处还有更多的神秘细节、陌生的 NPC 以及不为人知的秘密等着你去发掘。那么，我们再给你点建议：当你遇到了让你困惑不已的物品时，你可以尝试去 NetHack 维基 [http://nethack.wikia.com][3] 进行搜索。你也可以在 [www.nethack.org/v343/Guidebook.html][4] 找到一本非常不错（尽管很长）的指导手册。最后，祝游戏愉快！ @@ -95,7 +94,7 @@ via: http://www.linuxvoice.com/nethack/ 作者：[Mike Saunders][a] 译者：[Stevearzh](https://github.com/Stevearzh) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 735b0d58e5f1b99a4f77debfa90f0a4c2aa5c0db Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 14 Jan 2015 22:18:49 +0800 Subject: [PATCH 033/215] =?UTF-8?q?20150114-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ost on Ubuntu Server 14.04 LTS (Trusty).md | 74 ++++++++ ...sing nmcli Tool in RedHat or CentOS 7.x.md | 93 +++++++++++ ...l Gitblit On Ubuntu or Fedora or CentOS.md | 149 +++++++++++++++++ ...entOS or RHEL or Scientific Linux 6 & 7.md | 158 ++++++++++++++++++ 4 files changed, 474 insertions(+) create mode 100644 sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md create mode 100644 sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md create mode 100644 sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md create mode 100644 sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md diff --git a/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md b/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md new file mode 100644 index 0000000000..0e23ec3eae --- /dev/null +++ b/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md @@ -0,0 +1,74 @@ +How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty) +================================================================================ +Today, we will install Ghost, a blogging platform in an Ubuntu Server 14.04 LTS (Trusty). + +Ghost is the most amazing publishing platform which is beautifully designed, easy to use, and free for everyone. It is Free and Open Source Software (FOSS), its source code is available in github. The interface is intended to be simple, and an analytics dashboard is planned, as of January 2014. Editing is facilitated using a split screen display. + +So, here are the steps-wise tutorial below on how to setup Ghost on Ubuntu Server: + +### 1. Updating Ubuntu ### + +The first step will be to run through the Ubuntu software updates and install a couple of extra packages that will be needed. + + sudo apt-get update + sudo apt-get upgrade -y + sudo aptitude install -y build-essential zip vim wget + +### 2. Download and Install the Node.js Source Code ### + + wget http://nodejs.org/dist/node-latest.tar.gz + tar -xzf node-latest.tar.gz + cd node-v* + +Now, we'll install Node.js by the following commands: + + ./configure + make + sudo make install + +### 3. Download and Install Ghost ### + + sudo mkdir -p /var/www/ + cd /var/www/ + sudo wget https://ghost.org/zip/ghost-latest.zip + sudo unzip -d ghost ghost-latest.zip + cd ghost/ + sudo npm install --production + +### 4.Configuring Ghost ### + + sudo nano config.example.js + +In the "Production" section, change the following: + + host: '127.0.0.1', + +to + + host: '0.0.0.0', + +### Create Ghost User ### + + sudo adduser --shell /bin/bash --gecos 'Ghost application' ghost + sudo chown -R ghost:ghost /var/www/ghost/ + +Now to start Ghost, you will need to log into your "ghost" user. + + su - ghost + cd /var/www/ghost/ + +Now that you are logged in with your "ghost" user you can start Ghost: + + npm start --production + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/ubuntu-how-to/install-ghost-ubuntu-server-14-04/ + +作者：[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/ \ No newline at end of file diff --git a/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md b/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md new file mode 100644 index 0000000000..b874ccd089 --- /dev/null +++ b/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md @@ -0,0 +1,93 @@ +How to Manage Network using nmcli Tool in RedHat / CentOS 7.x +================================================================================ +A new feature of [**Red Hat Enterprise Linux 7**][1] and **CentOS 7** is that the default networking service is provided by **NetworkManager**, a dynamic network control and configuration daemon that attempts to keep network devices and connections up and active when they are available while still supporting the traditional ifcfg type configuration files. NetworkManager can be used with the following types of connections: Ethernet, VLANs, Bridges, Bonds, Teams, Wi-Fi, mobile broadband (such as cellular 3G), and IP-over-InfiniBand. For these connection types, NetworkManager can configure network aliases, IP addresses, static routes, DNS information, and VPN connections, as well as many connection-specific parameters. + +The NetworkManager can be controlled with the command-line tool, **nmcli**. + +### General nmcli usage ### + +The general syntax for nmcli is: + + # nmcli [ OPTIONS ] OBJECT { COMMAND | help } + +One cool thing is that you can use the TAB key to complete actions when you write the command so if at any time you forget the syntax you can just press TAB to see a list of available options. + +![nmcli tab](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-tab.jpg) + +Some examples of general nmcli usage: + + # nmcli general status + +Will display the overall status of NetworkManager. + + # nmcli connection show + +Will display all connections. + + # nmcli connection show -a + +Will display only the active connections. + + # nmcli device status + +Will display a list of devices recognized by NetworkManager and their current state. + +![nmcli general](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-gneral.jpg) + +### Starting / stopping network interfaces ### + +You can use the nmcli tool to start or stop network interfaces from the command line, this is the equivalent of up/down in ifconfig. + +To stop an interface use the following syntax: + + # nmcli device disconnect eno16777736 + +To start it you can use this syntax: + + # nmcli device connect eno16777736 + +### Adding an ethernet connection with static IP ### + +To add a new ethernet connection with a static IP address you can use the following command: + + # nmcli connection add type ethernet con-name NAME_OF_CONNECTION ifname interface-name ip4 IP_ADDRESS gw4 GW_ADDRESS + +replacing the NAME_OF_CONNECTION with the name you wish to apply to the new connection, the IP_ADDRESS with the IP address you wish to use and the GW_ADDRESS with the gateway address you use (if you don't use a gateway you can omit this last part). + + # nmcli connection add type ethernet con-name NEW ifname eno16777736 ip4 192.168.1.141 gw4 192.168.1.1 + +To set the DNS servers for this connection you can use the following command: + + # nmcli connection modify NEW ipv4.dns "8.8.8.8 8.8.4.4" + +To bring up the new Ethernet connection, issue a command as follows: + + # nmcli connection up NEW ifname eno16777736 + +To view detailed information about the newly configured connection, issue a command as follows: + + # nmcli -p connection show NEW + +![nmcli add static](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-add-static.jpg) + +### Adding a connection that will use DHCP ### + +If you wish to add a new connection that will use DHCP to configure the interface IP address, gateway address and dns servers, all you have to do is omit the ip/gw address part of the command and Network Manager will use DHCP to get the configuration details. + +For example, to create a DHCP configured connection profile named NEW_DHCP, on device +eno16777736 you can use the following command: + + # nmcli connection add type ethernet con-name NEW_DHCP ifname eno16777736 + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-command/nmcli-tool-red-hat-centos-7/ + +作者：[Adrian Dinu][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/adriand/ +[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ \ No newline at end of file diff --git a/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md b/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md new file mode 100644 index 0000000000..2a23ca74fa --- /dev/null +++ b/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md @@ -0,0 +1,149 @@ +Install Gitblit On Ubuntu / Fedora / CentOS +================================================================================ +**Git** is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed by Linus Torvalds for Linux kernel development in 2005, and has since become the most widely adopted version control system for software development. + +As with most other distributed revision control systems, and unlike most client–server systems, every Git working directory is a full-fledged repository with complete history and full version-tracking capabilities, independent of network access or a central server. Like the Linux kernel, Git is free software distributed under the terms of the GNU General Public License version 2. + +In this tutorial let me show you how to install gitblit server. The recent stable release of gitblit is 1.6.2. [Gitblit][1] is an open-source, pure Java stack for managing, viewing, and serving [Git][2] repositories. It’s designed primarily as a tool for small workgroups who want to host centralized repositories. + + mkdir -p /opt/gitblit; cd /opt/gitblit; wget http://dl.bintray.com/gitblit/releases/gitblit-1.6.2.tar.gz + +### List the directory: ### + + root@vps124229 [/opt/gitblit]# ls + ./ docs/ gitblit-stop.sh* LICENSE service-ubuntu.sh* + ../ ext/ install-service-centos.sh* migrate-tickets.sh* + add-indexed-branch.sh* gitblit-1.6.2.tar.gz install-service-fedora.sh* NOTICE + authority.sh* gitblit.jar install-service-ubuntu.sh* reindex-tickets.sh* + data/ gitblit.sh* java-proxy-config.sh* service-centos.sh* + +The default configurations in this file data/gitblit.properties you can change it to your need. + +### Start gitblit server with: ### + +### Via service: ### + + root@vps124229 [/opt/gitblit]# cp service-centos.sh /etc/init.d/gitblit + root@vps124229 [/opt/gitblit]# chkconfig --add gitblit + root@vps124229 [/opt/gitblit]# service gitblit start + Starting gitblit server + . + +### Start it manually: ### + + root@vps124229 [/opt/gitblit]# java -jar gitblit.jar --baseFolder data + 2015-01-10 09:16:53 [INFO ] ***************************************************************** + 2015-01-10 09:16:53 [INFO ] _____ _ _ _ _ _ _ + 2015-01-10 09:16:53 [INFO ] | __ \(_)| | | | | |(_)| | + 2015-01-10 09:16:53 [INFO ] | | \/ _ | |_ | |__ | | _ | |_ + 2015-01-10 09:16:53 [INFO ] | | __ | || __|| '_ \ | || || __| + 2015-01-10 09:16:53 [INFO ] | |_\ \| || |_ | |_) || || || |_ + 2015-01-10 09:16:53 [INFO ] \____/|_| \__||_.__/ |_||_| \__| + 2015-01-10 09:16:53 [INFO ] Gitblit v1.6.2 + 2015-01-10 09:16:53 [INFO ] + 2015-01-10 09:16:53 [INFO ] ***************************************************************** + 2015-01-10 09:16:53 [INFO ] Running on Linux (3.8.13-xxxx-grs-ipv6-64-vps) + 2015-01-10 09:16:53 [INFO ] Logging initialized @842ms + 2015-01-10 09:16:54 [INFO ] Using JCE Unlimited Strength Jurisdiction Policy files + 2015-01-10 09:16:54 [INFO ] Setting up HTTPS transport on port 8443 + 2015-01-10 09:16:54 [INFO ] certificate alias = localhost + 2015-01-10 09:16:54 [INFO ] keyStorePath = /opt/gitblit/data/serverKeyStore.jks + 2015-01-10 09:16:54 [INFO ] trustStorePath = /opt/gitblit/data/serverTrustStore.jks + 2015-01-10 09:16:54 [INFO ] crlPath = /opt/gitblit/data/certs/caRevocationList.crl + 2015-01-10 09:16:54 [INFO ] Shutdown Monitor listening on port 8081 + 2015-01-10 09:16:54 [INFO ] jetty-9.2.3.v20140905 + 2015-01-10 09:16:55 [INFO ] NO JSP Support for /, did not find org.apache.jasper.servlet.JspServlet + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IRuntimeManager]---- + 2015-01-10 09:16:55 [INFO ] Basefolder : /opt/gitblit/data + 2015-01-10 09:16:55 [INFO ] Settings : /opt/gitblit/data/gitblit.properties + 2015-01-10 09:16:55 [INFO ] JVM timezone: America/Montreal (EST -0500) + 2015-01-10 09:16:55 [INFO ] App timezone: America/Montreal (EST -0500) + 2015-01-10 09:16:55 [INFO ] JVM locale : en_US + 2015-01-10 09:16:55 [INFO ] App locale : + 2015-01-10 09:16:55 [INFO ] PF4J runtime mode is 'deployment' + 2015-01-10 09:16:55 [INFO ] Enabled plugins: [] + 2015-01-10 09:16:55 [INFO ] Disabled plugins: [] + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.INotificationManager]---- + 2015-01-10 09:16:55 [WARN ] Mail service disabled. + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IUserManager]---- + 2015-01-10 09:16:55 [INFO ] ConfigUserService(/opt/gitblit/data/users.conf) + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IAuthenticationManager]---- + 2015-01-10 09:16:55 [INFO ] External authentication disabled. + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ---- [com.gitblit.transport.ssh.IPublicKeyManager]---- + 2015-01-10 09:16:55 [INFO ] FileKeyManager (/opt/gitblit/data/ssh) + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IRepositoryManager]---- + 2015-01-10 09:16:55 [INFO ] Repositories folder : /opt/gitblit/data/git + 2015-01-10 09:16:55 [INFO ] Identifying repositories... + 2015-01-10 09:16:55 [INFO ] 0 repositories identified with calculated folder sizes in 11 msecs + 2015-01-10 09:16:55 [INFO ] Lucene will process indexed branches every 2 minutes. + 2015-01-10 09:16:55 [INFO ] Garbage Collector (GC) is disabled. + 2015-01-10 09:16:55 [INFO ] Mirror service is disabled. + 2015-01-10 09:16:55 [INFO ] Alias UTF-9 & UTF-18 encodings as UTF-8 in JGit + 2015-01-10 09:16:55 [INFO ] Preparing 14 day commit cache. please wait... + 2015-01-10 09:16:55 [INFO ] 0 repositories identified with calculated folder sizes in 0 msecs + 2015-01-10 09:16:55 [INFO ] built 14 day commit cache of 0 commits across 0 repositories in 2 msecs + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IProjectManager]---- + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IFederationManager]---- + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IGitblit]---- + 2015-01-10 09:16:55 [INFO ] Starting services manager... + 2015-01-10 09:16:55 [INFO ] Federation passphrase is blank! This server can not be PULLED from. + 2015-01-10 09:16:55 [INFO ] Fanout PubSub service is disabled. + 2015-01-10 09:16:55 [INFO ] Git Daemon is listening on 0.0.0.0:9418 + 2015-01-10 09:16:55 [INFO ] SSH Daemon (NIO2) is listening on 0.0.0.0:29418 + 2015-01-10 09:16:55 [WARN ] No ticket service configured. + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IPluginManager]---- + 2015-01-10 09:16:55 [INFO ] No plugins + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] All managers started. + +Open your browser to **http://localhost:8080** or **https://localhost:8443** depending on your chosen configuration. Enter the default administrator credentials: **admin / admin** and click the **Login** button. + +![snapshot2](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot2.png) + +### Add user: ### + +![snapshot1](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot1.png) + +Add repo: + +![snapshot3](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot3.png) + +### Create a new repository on the command-line: ### + + touch README.md + git init + git add README.md + git commit -m "first commit" + git remote add origin ssh://admin@142.4.202.70:29418/Programming.git + git push -u origin master + +### Push an existing repository from the command-line: ### + + git remote add origin ssh://admin@142.4.202.70:29418/Programming.git + git push -u origin master + +Done! + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/install-gitblit-ubuntu-fedora-centos/ + +作者：[M.el Khamlichi][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/pirat9/ +[1]:http://gitblit.com/ +[2]:http://git-scm.com/ \ No newline at end of file diff --git a/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md b/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md new file mode 100644 index 0000000000..1c16f35b63 --- /dev/null +++ b/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md @@ -0,0 +1,158 @@ +Installing Telnet In CentOS/RHEL/Scientific Linux 6 & 7 +================================================================================ +#### Disclaimer: #### + +Before installing and using Telnet, keep the following in mind. + +- Using Telnet in public network(WAN) is very very bad idea. It transmits login data in the clear format. Everything will be sent in plain text. +- If you still need Telnet, It is highly recommended use it in the local area network only. +- Alternatively, you can use **SSH**. But make sure you’ve disabled root login in SSH. + +### What Is Telnet? ### + +[Telnet][1] is a network protocol which is used to connect to remote computers over TCP/IP network. Once you establish a connection to the remote computer, it becomes a virtual terminal and will allow you to communicate with the remote host from your local system. + +In this brief tutorial, let us see how to install Telnet, and how to access remote systems via Telnet. + +### Installation ### + +Open your terminal and type the following command to install telnet: + + yum install telnet telnet-server -y + +Now, the telnet has been installed in your server. Next, edit the telnet configuration file **/etc/xinetd.d/telnet**; + + vi /etc/xinetd.d/telnet + +Set **disable = no**: + + # default: on + # description: The telnet server serves telnet sessions; it uses \ + # unencrypted username/password pairs for authentication. + service telnet + { + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/in.telnetd + log_on_failure += USERID + disable = no + } + +Save and quit the file. Be mindful that you don’t have do this step in CentOS 7. + +Now restart the telnet service using the following command: + +On CentOS 6.x systems: + + service xinetd start + +Make this service to start automatically on every reboot: + +On CentOS 6: + + chkconfig telnet on + chkconfig xinetd on + +On CentOS 7: + + systemctl start telnet.socket + systemctl enable telnet.socket + +Allow the telnet default port **23** through your firewall and Router. To allow the telnet port through firewall, Edit file **/etc/sysconfig/iptables** on CentOS 6.x systems: + + vi /etc/sysconfig/iptables + +Add the line as shown in red color: + + # Firewall configuration written by system-config-firewall + # Manual customization of this file is not recommended. + *filter + :INPUT ACCEPT [0:0] + :FORWARD ACCEPT [0:0] + :OUTPUT ACCEPT [0:0] + -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + -A INPUT -p icmp -j ACCEPT + -A INPUT -i lo -j ACCEPT + -A INPUT -p tcp -m state --state NEW --dport 23 -j ACCEPT + -A INPUT -m state --state NEW -m tcp -p tcp --dport 22 -j ACCEPT + -A INPUT -j REJECT --reject-with icmp-host-prohibited + -A FORWARD -j REJECT --reject-with icmp-host-prohibited + COMMIT + +Save and exit the file. Restart iptables service: + + service iptables restart + +On CentOS 7, run the following commands to enable telnet service through firewall. + + firewall-cmd --permanent --add-port=23/tcp + firewall-cmd --reload + +Thats it. Now telnet server is ready to use. + +#### Creating users #### + +Create a test user, for example “**sk**” with password “**centos**“: + + useradd sk + passwd sk + +#### Client Side Configuration #### + +Install telnet package: + + yum install telnet + +On DEB based systems: + + sudo apt-get install telnet + +Now, open Terminal, and try to access your server(remote host). + +If your client is Linux system, open the terminal and type the following command to connect to telnet server. + + telnet 192.168.1.150 + +Enter username and password which we have created in the server: + +Sample output: + + Trying 192.168.1.150... + Connected to 192.168.1.150. + Escape character is '^]'. + + Kernel 3.10.0-123.13.2.el7.x86_64 on an x86_64 + server1 login: sk + Password: + [sk@server1 ~]$ + +As you see in the above output, the remote system has been successfully accessed from the local machine. + +If your client is windows system, then go to **Start -> Run -> Command Prompt**. + +In the command prompt, type the command: + + telnet 192.168.1.150 + +Where **192.168.1.150** is remote host IP address. + +Now you will be able to connect to your server. + +That’s it. + +Cheers! + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/installing-telnet-centosrhelscientific-linux-6-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/ +[1]:http://en.wikipedia.org/wiki/Telnet \ No newline at end of file From 84a61c70ff887e54906d84e1d57833d53cc28c98 Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 14 Jan 2015 22:34:33 +0800 Subject: [PATCH 034/215] PUB:20141115 What are some obscure but useful Vim commands MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @wangjiezhe 译者注加的非常棒！ --- ...are some obscure but useful Vim commands.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename {translated/tech => published}/20141115 What are some obscure but useful Vim commands.md (90%) diff --git a/translated/tech/20141115 What are some obscure but useful Vim commands.md b/published/20141115 What are some obscure but useful Vim commands.md similarity index 90% rename from translated/tech/20141115 What are some obscure but useful Vim commands.md rename to published/20141115 What are some obscure but useful Vim commands.md index 6bbbcd29bb..dae288ad25 100644 --- a/translated/tech/20141115 What are some obscure but useful Vim commands.md +++ b/published/20141115 What are some obscure but useful Vim commands.md @@ -24,11 +24,11 @@ ![](https://farm8.staticflickr.com/7486/15543918097_fbcf33ee6b.jpg) -然后 4 会被插入到文件中。 +然后计算结果“4 ”会被插入到文件中。 ### 查找重复的连续的单词 ### -当你很快地打字时，很有可能会连续输入同一个单词两次，就像 this this。这种错误可能骗过任何一个人，即使是你自己重新阅读一边也不可避免。幸运的是，有一个简单的正则表达式可以用来预防这个错误。使用搜索命令（默认时 `/`）然后输入： +当你很快地打字时，很有可能会连续输入同一个单词两次，就像 this this。这种错误可能骗过任何一个人，即使是你自己重新阅读一遍也不可避免。幸运的是，有一个简单的正则表达式可以用来预防这个错误。使用搜索命令（默认时 `/`）然后输入： \(\<\w\+\>\)\_s*\1 @@ -72,7 +72,7 @@ `gg` 把光标移动到 Vim 缓冲区的第一行，`V` 进入可视模式，`G` 把光标移动到缓冲区的最后一行。因此，`ggVG` 使可视模式覆盖这个当前缓冲区。最后 `g?` 使用 ROT13 对整个区域进行编码。 -注意它应该被映射到一个最长使用的键。它对字母符号也可以很好地工作。要对它进行撤销，最好的方法就是使用撤销命令：`u`。 +注意它可以被映射到一个最常使用的键。它对字母符号也可以很好地工作。要对它进行撤销，最好的方法就是使用撤销命令：`u`。 ###自动补全 ### @@ -110,7 +110,7 @@ ### 按时间回退文件 ### -Vim 会记录文件的更改，你很容易可以回退到之前某个时间。该命令时相当直观的。比如： +Vim 会记录文件的更改，你很容易可以回退到之前某个时间。该命令是相当直观的。比如： :earlier 1m @@ -122,7 +122,7 @@ Vim 会记录文件的更改，你很容易可以回退到之前某个时间。 ### 删除标记内部的文字 ### -当我开始使用 Vim 时一件我总是想很方便做的事情是如何轻松的删除方括号或圆括号里的内容。转到开始的标记，然后使用下面的语法： +当我开始使用 Vim 时，一件我总是想很方便做的事情是如何轻松的删除方括号或圆括号里的内容。转到开始的标记，然后使用下面的语法： di[标记] @@ -164,11 +164,11 @@ Vim 会记录文件的更改，你很容易可以回退到之前某个时间。 ### 把光标下的文字置于屏幕中央 ### -所有要做的事情都包含在标题中。如果你想强制滚动屏幕来把光标下的文字置于屏幕的中央，在可视模式中使用命令（译者注：在普通模式中也可以）： +我们所要做的事情如标题所示。如果你想强制滚动屏幕来把光标下的文字置于屏幕的中央，在可视模式中使用命令（译者注：在普通模式中也可以）： zz -### 跳到上一个／下一个 位置 ### +### 跳到上一个／下一个位置 ### 当你编辑一个很大的文件时，经常要做的事是在某处进行修改，然后跳到另外一处。如果你想跳回之前修改的地方，使用命令： @@ -196,7 +196,7 @@ Vim 会记录文件的更改，你很容易可以回退到之前某个时间。 总的来说，这一系列命令是在我读了许多论坛主题和 [Vim Tips wiki][3]（如果你想学习更多关于编辑器的知识，我非常推荐这篇文章） 之后收集起来的。 -如果你还知道哪些非常有用但你认为大多数人并不知道的命令，可以随意在评论中分享出来。就像引言中所说的，一个“鲜为人知但很有用的”命令是很主观的，但分享出来总是好的。 +如果你还知道哪些非常有用但你认为大多数人并不知道的命令，可以随意在评论中分享出来。就像引言中所说的，一个“鲜为人知但很有用的”命令也许只是你自己的看法，但分享出来总是好的。 -------------------------------------------------------------------------------- @@ -204,7 +204,7 @@ via: http://xmodulo.com/useful-vim-commands.html 作者：[Adrien Brochard][a] 译者：[wangjiezhe](https://github.com/wangjiezhe) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From dcbacad5cf47dcdb36e252a509d6c6c2be4048f9 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 14 Jan 2015 22:34:53 +0800 Subject: [PATCH 035/215] =?UTF-8?q?20150114-2=20=E9=80=89=E9=A2=98?= 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 | 81 ++++++++ ...ows 7 And Delete Ubuntu In 3 Easy Steps.md | 180 ++++++++++++++++++ 2 files changed, 261 insertions(+) create mode 100644 sources/talk/20150114 Why Mac users don't switch to Linux.md create mode 100644 sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.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 new file mode 100644 index 0000000000..f0094f14d9 --- /dev/null +++ b/sources/talk/20150114 Why Mac users don't switch to Linux.md @@ -0,0 +1,81 @@ +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/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md b/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md new file mode 100644 index 0000000000..901dcd951c --- /dev/null +++ b/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md @@ -0,0 +1,180 @@ +How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps +================================================================================ +### Introduction ### + +This is a strange article for me to write as I am normally in a position where I would advocate installing Ubuntu and getting rid of Windows. + +What makes writing this article today doubly strange is that I am choosing to write it on the day that Windows 7 mainstream support comes to an end. + +So why am I writing this now? + +I have been asked on so many occasions now how to remove Ubuntu from a dual booting Windows 7 or a dual booting Windows 8 system and it just makes sense to write the article. + +I spent the Christmas period looking through the comments that people have left on articles and it is time to write the posts that are missing and update some of those that have become old and need attention. + +I am going to spend the rest of January doing just that. This is the first step. If you have Windows 7 dual booting with Ubuntu and you want Windows 7 back without restoring to factory settings follow this guide. (Note there is a separate guide required for Windows 8) + +### The Steps Required To Remove Ubuntu ### + +1. Remove Grub By Fixing The Windows Boot Record +1. Delete The Ubuntu Partitions +1. Expand The Windows Partition + +### Back Up Your System ### + +Before you begin I recommend taking a backup of your system. + +I also recommend not leaving this to chance nor Microsoft's own tools. + +[Click here for a guide showing how to backup your drive using Macrium Reflect.][1] + +If you have any data you wish to save within Ubuntu log into it now and back up the data to external hard drives, USB drives or DVDs. + +### Step 1 - Remove The Grub Boot Menu ### + +![](http://1.bp.blogspot.com/-arVqwMLpJRQ/VLWbHWkqYsI/AAAAAAAAHmw/kn3jDPOltX4/s1600/grubmenu.jpg) + +When you boot your system you will see a menu similar to the one in the image. + +To remove this menu and boot straight into Windows you have to fix the master boot record. + +To do this I am going to show you how to create a system recovery disk, how to boot to the recovery disk and how to fix the master boot record. + +![](http://2.bp.blogspot.com/-ML2JnNc8OWY/VLWcAovwGNI/AAAAAAAAHm4/KH778_MkU7U/s1600/recoverywindow1.PNG) + +Press the "Start" button and search for "backup and restore". Click the icon that appears. + +A window should open as shown in the image above. + +Click on "Create a system repair disc". + +You will need a [blank DVD][2]. + +![](http://2.bp.blogspot.com/-r0GUDZ4AAMI/VLWfJ0nuJLI/AAAAAAAAHnE/RloNqdXLLcY/s1600/recoverywindow2.PNG) + +Insert the blank DVD in the drive and select your DVD drive from the dropdown list. + +Click "Create Disc". + +Restart your computer leaving the disk in and when the message appears to boot from CD press "Enter" on the keyboard. + +![](http://2.bp.blogspot.com/-VPSD50bmk2E/VLWftBg7HxI/AAAAAAAAHnM/APVzvPg4rC0/s1600/recoveryoptionschooselanguage.jpg) + +A set of "Systems Recovery Options" screens will appear. + +You will be asked to choose your keyboard layout. + +Choose the appropriate options from the lists provided and click "Next". + +![](http://2.bp.blogspot.com/-klK4SihPv0E/VLWgLiPO1mI/AAAAAAAAHnU/DUgxH6N2SFE/s1600/RecoveryOptions.jpg) + +The next screen lets you choose an operating system to attempt to fix. + +Alternatively you can restore your computer using a system image saved earlier. + +Leave the top option checked and click "Next". + +![](http://2.bp.blogspot.com/-WOk-Unm6cCQ/VLWgvzoBgzI/AAAAAAAAHng/vfxm1jhW1Ms/s1600/RecoveryOptions2.jpg) + +You will now see a screen with options to repair your disk and restore your system etc. + +All you need to do is fix the master boot record and this can be done from the command prompt. + +Click "Command Prompt". + +![](http://4.bp.blogspot.com/-duT-EUC0yuo/VLWhHygCApI/AAAAAAAAHno/bO7UlouyR9M/s1600/FixMBR.jpg) + +Now simply type the following command into the command prompt: + + bootrec.exe /fixmbr + +A message will appear stating that the operation has completed successfully. + +You can now close the command prompt window. + +Click the "Restart" button and remove the DVD. + +Your computer should boot straight into Windows 7. + +### Step 2 - Delete The Ubuntu Partitions ### + +![](http://4.bp.blogspot.com/-1OM0b3qBeHk/VLWh89gtgVI/AAAAAAAAHn0/ECHIARNCRp8/s1600/diskmanagement1.PNG) + +To delete Ubuntu you need to use the "Disk Management" tool from within Windows. + +Press "Start" and type "Create and format hard disk partitions" into the search box. A window will appear similar to the image above. + +Now my screen above isn't going to be quite the same as yours but it won't be much different. If you look at disk 0 there is 101 MB of unallocated space and then 4 partitions. + +The 101 MB of space is a mistake I made when installing Windows 7 in the first place. The C: drive is Windows 7, the next partition (46.57 GB) is Ubuntu's root partition. The 287 GB partition is the /HOME partition and the 8 GB partition is the SWAP space. + +The only one we really need for Windows is the C: drive so the rest can be deleted. + +**Note: Be careful. You may have recovery partitions on the disk. Do not delete the recovery partitions. They should be labelled and will have file systems set to NTFS or FAT32** + +![](http://3.bp.blogspot.com/-8YUE2p5Fj8Q/VLWlHXst6JI/AAAAAAAAHoQ/BJC57d9Nilg/s1600/deletevolume.png) + +Right click on one of the partitions you wish to delete (i.e. the root, home and swap partitions) and from the menu click "Delete Volume". + +**(Do not delete any partitions that have a file system of NTFS or FAT32)** + +Repeat this process for the other two partitions. + +![](http://3.bp.blogspot.com/-IGbJLkc_soY/VLWk1Vh0XAI/AAAAAAAAHoA/v7TVFT0rC0E/s1600/diskmanagement2.PNG) + +After the partitions have been deleted you will have a large area of free space. Right click the free space and choose delete. + +![](http://4.bp.blogspot.com/-2xUBkWHpnC4/VLWk9cYXGZI/AAAAAAAAHoI/8F2ANkorGeM/s1600/diskmanagement3.PNG) + +Your disk will now contain your C drive and a large amount of unallocated space. + +### Step 3 - Expand The Windows Partition ### + +![](http://4.bp.blogspot.com/-pLV5L3CvQ1Y/VLWmh-5SKTI/AAAAAAAAHoc/7sJzITyvduo/s1600/diskmanagement4.png) + +The final step is to expand Windows so that it is one large partition again. + +To do this right click on the Windows partition (C: drive) and choose "Extend Volume". + +![](http://1.bp.blogspot.com/-vgmw_N2WZWw/VLWm7i5oSxI/AAAAAAAAHok/k0q_gnIik9A/s1600/extendvolume1.PNG) + +When the Window to the left appears click "Next", + +![](http://3.bp.blogspot.com/-WLA86V-Au8g/VLWnTq5RpAI/AAAAAAAAHos/6vzjLNkrwRQ/s1600/extendvolume2.PNG) + +The next screen shows a wizard whereby you can select the disks to expand to and change the size to expand to. + +By default the wizard shows the maximum amount of disk space it can claim from unallocated space. + +Accept the defaults and click "Next". + +![](http://4.bp.blogspot.com/-1rhTJvwem0k/VLWnvx7fWFI/AAAAAAAAHo0/D-4HA8E8y2c/s1600/extendvolume3.PNG) + +The final screen shows the settings that you chose from the previous screen. + +Click "Finish" to expand the disk. + +![](http://2.bp.blogspot.com/-CpuLXSYyPKY/VLWoEGU3sCI/AAAAAAAAHo8/7o5G4W4b7zU/s1600/diskmanagement5.PNG) + +As you can see from the image above my Windows partition now takes up the entire disk (except for the 101 MB that I accidentally created before installing Windows in the first place). + +### Summary ### + +![](http://1.bp.blogspot.com/-h1Flo2aGFcI/VLWogr2zfMI/AAAAAAAAHpE/2ypTSgR8_iM/s1600/fullwindowsscreen.PNG) + +That is all folks. A site dedicated to Linux has just shown you how to remove Linux and replace it with Windows 7. + +Any questions? Use the comments section below. + +-------------------------------------------------------------------------------- + +via: http://www.everydaylinuxuser.com/2015/01/how-to-recover-windows-7-and-delete.html + +作者：Gary Newell +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://linux.about.com/od/LinuxNewbieDesktopGuide/ss/Create-A-Recovery-Drive-For-All-Versions-Of-Windows.htm +[2]:http://www.amazon.co.uk/gp/product/B0006L2HTK/ref=as_li_qf_sp_asin_il_tl?ie=UTF8&camp=1634&creative=6738&creativeASIN=B0006L2HTK&linkCode=as2&tag=evelinuse-21&linkId=3R363EA63XB4Z3IL \ No newline at end of file From 1f234cad69e1c1afb009c6a0a7b72e3e7e4eaf46 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 14 Jan 2015 22:43:16 +0800 Subject: [PATCH 036/215] =?UTF-8?q?20150114-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hat is a good IDE for C or C++ on Linux.md | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 sources/share/20150114 What is a good IDE for C or C++ on Linux.md diff --git a/sources/share/20150114 What is a good IDE for C or C++ on Linux.md b/sources/share/20150114 What is a good IDE for C or C++ on Linux.md new file mode 100644 index 0000000000..9560ce6ee1 --- /dev/null +++ b/sources/share/20150114 What is a good IDE for C or C++ on Linux.md @@ -0,0 +1,83 @@ +What is a good IDE for C/C++ on Linux +================================================================================ +"A real coder doesn't use an IDE, a real coder uses [insert a text editor name here] with such and such plugins." We all heard that somewhere. Yet, as much as one can agree with that statement, an IDE remains quite useful. An IDE is easy to set up and use out of the box. Hence there is no better way to start coding a project from scratch. So for this post, let me present you with my list of good IDEs for C/C++ on Linux. Why is C/C++ specifically? Because C is my favorite language, and we need to start somewhere. Also note that there are in general a lot of ways to code in C, so in order to trim down the list, I only selected "real out-of-the-box IDE", not text editors like Gedit or Vim pumped with [plugins][1]. Not that this alternative is bad in any way, just that the list will go on forever if I include text editors. + +### 1. Code::Blocks ### + +![](https://farm8.staticflickr.com/7520/16089880989_10173db27b_c.jpg) + +Starting all out with my personal favorite, [Code::Blocks][2] is a simple and fast IDE for C/C++ exclusively. Like any respectable IDE, it integrates syntax highlighting, bookmarking, word completion, project management, and a debugger. Where it shines is via its simple plugin system which adds indispensable tools like Valgrind and CppCheck, and less indispensable like a Tetris mini-game. But my reason for liking it particularly is for its coherent set of handy shortcuts, and the large number of options that never feel too overwhelming. + +### 2. Eclipse ### + +![](https://farm8.staticflickr.com/7522/16276001255_66235a0a69_c.jpg) + +I know that I said only "real out-of-the-box IDE" and not a text editor pumped with plugins, but [Eclipse][3] is a "real out-of-the-box IDE." It's just that Eclipse needs a little [plugin][4] (or a variant) to code in C. So I technically did not contradict myself. And it would have been impossible to make an IDE list without mentioning the behemoth that is Eclipse. Like it or not, Eclipse remains a great tool to code in Java. And thanks to the [CDT Project][5], it is possible to program in C/C++ too. You will benefit from all the power of Eclipse and its traditional features like word completion, code outline, code generator, and advanced refactoring. What it lacks in my opinion is the lightness of Code::Blocks. It is still very heavy and takes time to load. But if your machine can take it, or if you are a hardcore Eclipse fan, it is a very safe option. + +### 3. Geany ### + +![](https://farm9.staticflickr.com/8573/16088461968_c6a6c9e49a_c.jpg) + +With a lot less features but a lot more flexibility, [Geany][6] is at the opposite of Eclipse. But what it lacks (like a debugger for example), Geany makes it up with nice little features: a space for note taking, creation from template, code outline, customizable shortcuts, and plugins management. Geany is still closer to an extensive text editor than an IDE here. However I keep it in the list for its lightness and its well designed interface. + +### 4. MonoDevelop ### + +![](https://farm8.staticflickr.com/7515/16275175052_61487480ce_c.jpg) + +Another monster to add to the list, [MonoDevelop][7] has a very unique feel derived from its look and interface. I personally love its project management and its integrated version control system. The plugin system is also pretty amazing. But for some reason, all the options and the support for all kind of programming languages make it feel a bit overwhelming to me. It remains a great tool that I used many times in the past, but just not my number one when dealing with "simplistic" C. + +### 5. Anjuta ### + +![](https://farm8.staticflickr.com/7514/16088462018_7ee6e5b433_c.jpg) + +With a very strong "GNOME feeling" attached to it, [Anjuta][8]'s appearance is a hit or miss. I tend to see it as an advanced version of Geany with a debugger included, but the interface is actually a lot more elaborate. I do enjoy the tab system to switch between the project, folders, and code outline view. I would have liked maybe a bit more shortcuts to move around in a file. However, it is a good tool, and offers outstanding compilation and build options, which can support the most specific needs. + +### 6. Komodo Edit ### + +![](https://farm8.staticflickr.com/7502/16088462028_81d1114c84_c.jpg) + +I was not very familiar with [Komodo Edit][9], but after trying it a few days, it surprised me with many many good things. First, the tab-based navigation is always appreciable. Then the fancy looking code outline reminds me a lot of Sublime Text. Furthermore, the macro system and the file comparator make Komodo Edit very practical. Its plugin library makes it almost perfect. "Almost" because I do not find the shortcuts as nice as in other IDEs. Also, I would enjoy more specific C/C++ tools, and this is typically the flaw of general IDEs. Yet, very enjoyable software. + +### 7. NetBeans ### + +![](https://farm8.staticflickr.com/7569/16089881229_98beb0fce3_c.jpg) + +Just like Eclipse, impossible to avoid this beast. With navigation via tabs, project management, code outline, change history tracking, and a plethora of tools, [NetBeans][10] might be the most complete IDE out there. I could list for half a page all of its amazing features. But that will tip you off too easily about its main disadvantage, it might be too big. As great as it is, I prefer plugin based software because I doubt that anyone will need both Git and Mercurial integration for the same project. Call me crazy. But if you have the patience to master all of its options, you will be pretty much become the master of IDEs everywhere. + +### 8. KDevelop ### + +![](https://farm8.staticflickr.com/7519/15653583824_e412f2ab1f_c.jpg) + +For all KDE fans out there, [KDevelop][11] might be the answer to your prayers. With a lot of configuration options, KDevelop is yours if you manage to seize it. Call me superficial but I never really got past the interface. But it's too bad for me as the editor itself packs quite a punch with a lot of navigation options and customizable shortcuts. The debugger is also very advanced and will take a bit of practice to master. However, this patience will be rewarded with this very flexible IDE's full power. And it gets special credits for its amazing embedded documentation. + +### 9. CodeLite ### + +![](https://farm9.staticflickr.com/8594/16250066446_b5f654e63f_c.jpg) + +Finally, last for not least, [CodeLite][12] shows that you can take a traditional formula and still get something with its own feeling attached to it. If the interface really reminded me of Code::Blocks and Anjuta at first, I was just blown away by the extensive plugin library. Whether you want to diff a file, insert a copyright block, define an abbreviation, or push your work on Git, there is a plugin for you. If I had to nitpick, I would say that it lacks a few navigation shortcuts for my taste, but that's really it. + +To conclude, I hope that this list had you discover new IDEs for coding in your favorite language. While Code::Blocks remains my favorite, it has some serious challengers. Also we are far from covering all the ways to code in C/C++ using an IDE on Linux. So if you have another one to propose, let us know in the comments. Also if you would like me to cover IDEs for a different language next, also let us know in the comment section. + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/good-ide-for-c-cpp-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://xmodulo.com/turn-vim-full-fledged-ide.html +[2]:http://www.codeblocks.org/ +[3]:https://eclipse.org/ +[4]:http://xmodulo.com/how-to-set-up-c-cpp-development-environment-in-eclipse.html +[5]:https://eclipse.org/cdt/ +[6]:http://www.geany.org/ +[7]:http://www.monodevelop.com/ +[8]:http://anjuta.org/ +[9]:http://komodoide.com/komodo-edit/ +[10]:https://netbeans.org/ +[11]:https://www.kdevelop.org/ +[12]:http://codelite.org/ \ No newline at end of file From e0b61b555a77eb137f776b2af3a18d5d76a1cc2f Mon Sep 17 00:00:00 2001 From: wxy Date: Wed, 14 Jan 2015 22:57:42 +0800 Subject: [PATCH 037/215] PUB:20141112 How to Debug CPU Regressions Using Flame Graphs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @coloka 好专业的文章·~ --- ... Debug CPU Regressions Using Flame Graphs.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) rename {translated/tech => published}/20141112 How to Debug CPU Regressions Using Flame Graphs.md (94%) diff --git a/translated/tech/20141112 How to Debug CPU Regressions Using Flame Graphs.md b/published/20141112 How to Debug CPU Regressions Using Flame Graphs.md similarity index 94% rename from translated/tech/20141112 How to Debug CPU Regressions Using Flame Graphs.md rename to published/20141112 How to Debug CPU Regressions Using Flame Graphs.md index 6be6bb8e8b..aad7cb5e0b 100644 --- a/translated/tech/20141112 How to Debug CPU Regressions Using Flame Graphs.md +++ b/published/20141112 How to Debug CPU Regressions Using Flame Graphs.md @@ -2,7 +2,7 @@ ================================================================================ 你能快速定位CPU性能回退的问题么？ 如果你的工作环境非常复杂且变化快速，那么使用现有的工具是来定位这类问题是很具有挑战性的。当你花掉数周时间把根因找到时，代码已经又变更了好几轮，新的性能问题又冒了出来。 -辛亏有了[CPU火焰图][1]（flame graphs）,CPU使用率的问题一般都比较好定位。但要处理性能回退问题，就要在修改前后的火焰图间，不断切换对比，来找出问题所在，这感觉就是像在太阳系中搜寻冥王星。虽然，这种方法可以解决问题，但我觉得应该会有更好的办法。 +幸亏有了[CPU火焰图][1]（flame graphs），CPU使用率的问题一般都比较好定位。但要处理性能回退问题，就要在修改前后的火焰图之间，不断切换对比，来找出问题所在，这感觉就是像在太阳系中搜寻冥王星。虽然，这种方法可以解决问题，但我觉得应该会有更好的办法。 所以，下面就隆重介绍**红/蓝差分火焰图（red/blue differential flame graphs）**： @@ -14,7 +14,7 @@ 这张火焰图中各火焰的形状和大小都是和第二次抓取的profile文件对应的CPU火焰图是相同的。（其中，y轴表示栈的深度，x轴表示样本的总数，栈帧的宽度表示了profile文件中该函数出现的比例，最顶层表示正在运行的函数，再往下就是调用它的栈） -在下面这个案例展示了，在系统升级后，一个工作负载的CPU使用率上升了。 下面是对应的CPU火焰图（[SVG格式][4]） +在下面这个案例展示了，在系统升级后，一个工作载荷的CPU使用率上升了。 下面是对应的CPU火焰图（[SVG格式][4]）

@@ -22,7 +22,7 @@ 通常，在标准的火焰图中栈帧和栈塔的颜色是随机选择的。 而在红/蓝差分火焰图中，使用不同的颜色来表示两个profile文件中的差异部分。 -在第二个profile中deflate_slow()函数以及它后续调用的函数运行的次数要比前一次更多，所以在上图中这个栈帧被标为了红色。可以看出问题的原因是ZFS的压缩功能被使能了，而在系统升级前这项功能是关闭的。 +在第二个profile中deflate_slow()函数以及它后续调用的函数运行的次数要比前一次更多，所以在上图中这个栈帧被标为了红色。可以看出问题的原因是ZFS的压缩功能被启用了，而在系统升级前这项功能是关闭的。 这个例子过于简单，我甚至可以不用差分火焰图也能分析出来。但想象一下，如果是在分析一个微小的性能下降，比如说小于5%，而且代码也更加复杂的时候，问题就为那么好处理了。 @@ -69,7 +69,9 @@ difffolded.p只能对“折叠”过的堆栈profile文件进行操作，折叠 在上面的例子中"func_a()->func_b()->func_c()" 代表调用栈，这个调用栈在profile1文件中共出现了31次，在profile2文件中共出现了33次。然后，使用flamegraph.pl脚本处理这3列数据，会自动生成一张红/蓝差分火焰图。 ### 其他选项 ### + 再介绍一些有用的选项： + **difffolded.pl -n**：这个选项会把两个profile文件中的数据规范化，使其能相互匹配上。如果你不这样做，抓取到所有栈的统计值肯定会不相同，因为抓取的时间和CPU负载都不同。这样的话，看上去要么就是一片红（负载增加），要么就是一片蓝（负载下降）。-n选项对第一个profile文件进行了平衡，这样你就可以得到完整红/蓝图谱。 **difffolded.pl -x**: 这个选项会把16进制的地址删掉。 profiler时常会无法将地址转换为符号，这样的话栈里就会有16进制地址。如果这个地址在两个profile文件中不同，这两个栈就会认为是不同的栈，而实际上它们是相同的。遇到这样的问题就用-x选项搞定。 @@ -77,6 +79,7 @@ difffolded.p只能对“折叠”过的堆栈profile文件进行操作，折叠 **flamegraph.pl --negate**: 用于颠倒红/蓝配色。 在下面的章节中，会用到这个功能。 ### 不足之处 ### + 虽然我的红/蓝差分火焰图很有用，但实际上还是有一个问题：如果一个代码执行路径完全消失了，那么在火焰图中就找不到地方来标注蓝色。你只能看到当前的CPU使用情况，而不知道为什么会变成这样。 一个办法是，将对比顺序颠倒，画一个相反的差分火焰图。例如： @@ -95,12 +98,13 @@ difffolded.p只能对“折叠”过的堆栈profile文件进行操作，折叠 这样，把前面生成diff2.svg一并使用，我们就能得到： -- **diff1.svg**: 宽度是以修改前profile文件为基准, 颜色表明将要发生的情况 -- **diff2.svg**: 宽度以修改后的profile文件为基准，颜色表明已经发生的情况 +- **diff1.svg**: 宽度是以修改前profile文件为基准，颜色表明将要发生的情况 +- **diff2.svg**: 宽度是以修改后profile文件为基准，颜色表明已经发生的情况 如果是在做功能验证测试，我会同时生成这两张图。 ### CPI 火焰图 ### + 这些脚本开始是被使用在[CPI火焰图][8]的分析上。与比较修改前后的profile文件不同，在分析CPI火焰图时，可以分析CPU工作周期与停顿周期的差异变化，这样可以凸显出CPU的工作状态来。 ### 其他的差分火焰图 ### @@ -110,6 +114,7 @@ difffolded.p只能对“折叠”过的堆栈profile文件进行操作，折叠 也有其他人做过类似的工作。[Robert Mustacchi][10]在不久前也做了一些尝试，他使用的方法类似于代码检视时的标色风格：只显示了差异的部分，红色表示新增（上升）的代码路径，蓝色表示删除（下降）的代码路径。一个关键的差别是栈帧的宽度只体现了差异的样本数。右边是一个例子。这个是个很好的主意，但在实际使用中会感觉有点奇怪，因为缺失了完整profile文件的上下文作为背景，这张图显得有些难以理解。 [![](http://www.brendangregg.com/blog/images/2014/corpaul-flamegraph-diff.png)][12] + Cor-Paul Bezemer也制作了一种差分显示方法[flamegraphdiff][13]，他同时将3张火焰图放在同一张图中，修改前后的标准火焰图各一张，下面再补充了一张差分火焰图，但栈帧宽度也是差异的样本数。 上图是一个[例子][14]。在差分图中将鼠标移到栈帧上，3张图中同一栈帧都会被高亮显示。这种方法中补充了两张标准的火焰图，因此解决了上下文的问题。 我们3人的差分火焰图，都各有所长。三者可以结合起来使用：Cor-Paul方法中上方的两张图，可以用我的diff1.svg 和 diff2.svg。下方的火焰图可以用Robert的方式。为保持一致性，下方的火焰图可以用我的着色方式：蓝->白->红。 @@ -128,7 +133,7 @@ via: http://www.brendangregg.com/blog/2014-11-09/differential-flame-graphs.html 作者：[Brendan Gregg][a] 译者：[coloka](https://github.com/coloka) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From d3de17c1c683c527eebdaa0f3e711efddb55dc38 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Thu, 15 Jan 2015 09:07:36 +0800 Subject: [PATCH 038/215] translating --- .../20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md b/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md index 2a23ca74fa..14281f327a 100644 --- a/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md +++ b/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md @@ -1,3 +1,5 @@ +Translating-----geekpi + Install Gitblit On Ubuntu / Fedora / CentOS ================================================================================ **Git** is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed by Linus Torvalds for Linux kernel development in 2005, and has since become the most widely adopted version control system for software development. From 13b29eddae52e3ab264fc4cf8b015beb17c7e899 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Thu, 15 Jan 2015 09:27:25 +0800 Subject: [PATCH 039/215] translated --- ...l Gitblit On Ubuntu or Fedora or CentOS.md | 151 ------------------ 1 file changed, 151 deletions(-) delete mode 100644 sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md diff --git a/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md b/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md deleted file mode 100644 index 14281f327a..0000000000 --- a/sources/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md +++ /dev/null @@ -1,151 +0,0 @@ -Translating-----geekpi - -Install Gitblit On Ubuntu / Fedora / CentOS -================================================================================ -**Git** is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed by Linus Torvalds for Linux kernel development in 2005, and has since become the most widely adopted version control system for software development. - -As with most other distributed revision control systems, and unlike most client–server systems, every Git working directory is a full-fledged repository with complete history and full version-tracking capabilities, independent of network access or a central server. Like the Linux kernel, Git is free software distributed under the terms of the GNU General Public License version 2. - -In this tutorial let me show you how to install gitblit server. The recent stable release of gitblit is 1.6.2. [Gitblit][1] is an open-source, pure Java stack for managing, viewing, and serving [Git][2] repositories. It’s designed primarily as a tool for small workgroups who want to host centralized repositories. - - mkdir -p /opt/gitblit; cd /opt/gitblit; wget http://dl.bintray.com/gitblit/releases/gitblit-1.6.2.tar.gz - -### List the directory: ### - - root@vps124229 [/opt/gitblit]# ls - ./ docs/ gitblit-stop.sh* LICENSE service-ubuntu.sh* - ../ ext/ install-service-centos.sh* migrate-tickets.sh* - add-indexed-branch.sh* gitblit-1.6.2.tar.gz install-service-fedora.sh* NOTICE - authority.sh* gitblit.jar install-service-ubuntu.sh* reindex-tickets.sh* - data/ gitblit.sh* java-proxy-config.sh* service-centos.sh* - -The default configurations in this file data/gitblit.properties you can change it to your need. - -### Start gitblit server with: ### - -### Via service: ### - - root@vps124229 [/opt/gitblit]# cp service-centos.sh /etc/init.d/gitblit - root@vps124229 [/opt/gitblit]# chkconfig --add gitblit - root@vps124229 [/opt/gitblit]# service gitblit start - Starting gitblit server - . - -### Start it manually: ### - - root@vps124229 [/opt/gitblit]# java -jar gitblit.jar --baseFolder data - 2015-01-10 09:16:53 [INFO ] ***************************************************************** - 2015-01-10 09:16:53 [INFO ] _____ _ _ _ _ _ _ - 2015-01-10 09:16:53 [INFO ] | __ \(_)| | | | | |(_)| | - 2015-01-10 09:16:53 [INFO ] | | \/ _ | |_ | |__ | | _ | |_ - 2015-01-10 09:16:53 [INFO ] | | __ | || __|| '_ \ | || || __| - 2015-01-10 09:16:53 [INFO ] | |_\ \| || |_ | |_) || || || |_ - 2015-01-10 09:16:53 [INFO ] \____/|_| \__||_.__/ |_||_| \__| - 2015-01-10 09:16:53 [INFO ] Gitblit v1.6.2 - 2015-01-10 09:16:53 [INFO ] - 2015-01-10 09:16:53 [INFO ] ***************************************************************** - 2015-01-10 09:16:53 [INFO ] Running on Linux (3.8.13-xxxx-grs-ipv6-64-vps) - 2015-01-10 09:16:53 [INFO ] Logging initialized @842ms - 2015-01-10 09:16:54 [INFO ] Using JCE Unlimited Strength Jurisdiction Policy files - 2015-01-10 09:16:54 [INFO ] Setting up HTTPS transport on port 8443 - 2015-01-10 09:16:54 [INFO ] certificate alias = localhost - 2015-01-10 09:16:54 [INFO ] keyStorePath = /opt/gitblit/data/serverKeyStore.jks - 2015-01-10 09:16:54 [INFO ] trustStorePath = /opt/gitblit/data/serverTrustStore.jks - 2015-01-10 09:16:54 [INFO ] crlPath = /opt/gitblit/data/certs/caRevocationList.crl - 2015-01-10 09:16:54 [INFO ] Shutdown Monitor listening on port 8081 - 2015-01-10 09:16:54 [INFO ] jetty-9.2.3.v20140905 - 2015-01-10 09:16:55 [INFO ] NO JSP Support for /, did not find org.apache.jasper.servlet.JspServlet - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IRuntimeManager]---- - 2015-01-10 09:16:55 [INFO ] Basefolder : /opt/gitblit/data - 2015-01-10 09:16:55 [INFO ] Settings : /opt/gitblit/data/gitblit.properties - 2015-01-10 09:16:55 [INFO ] JVM timezone: America/Montreal (EST -0500) - 2015-01-10 09:16:55 [INFO ] App timezone: America/Montreal (EST -0500) - 2015-01-10 09:16:55 [INFO ] JVM locale : en_US - 2015-01-10 09:16:55 [INFO ] App locale : - 2015-01-10 09:16:55 [INFO ] PF4J runtime mode is 'deployment' - 2015-01-10 09:16:55 [INFO ] Enabled plugins: [] - 2015-01-10 09:16:55 [INFO ] Disabled plugins: [] - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.INotificationManager]---- - 2015-01-10 09:16:55 [WARN ] Mail service disabled. - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IUserManager]---- - 2015-01-10 09:16:55 [INFO ] ConfigUserService(/opt/gitblit/data/users.conf) - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IAuthenticationManager]---- - 2015-01-10 09:16:55 [INFO ] External authentication disabled. - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ---- [com.gitblit.transport.ssh.IPublicKeyManager]---- - 2015-01-10 09:16:55 [INFO ] FileKeyManager (/opt/gitblit/data/ssh) - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IRepositoryManager]---- - 2015-01-10 09:16:55 [INFO ] Repositories folder : /opt/gitblit/data/git - 2015-01-10 09:16:55 [INFO ] Identifying repositories... - 2015-01-10 09:16:55 [INFO ] 0 repositories identified with calculated folder sizes in 11 msecs - 2015-01-10 09:16:55 [INFO ] Lucene will process indexed branches every 2 minutes. - 2015-01-10 09:16:55 [INFO ] Garbage Collector (GC) is disabled. - 2015-01-10 09:16:55 [INFO ] Mirror service is disabled. - 2015-01-10 09:16:55 [INFO ] Alias UTF-9 & UTF-18 encodings as UTF-8 in JGit - 2015-01-10 09:16:55 [INFO ] Preparing 14 day commit cache. please wait... - 2015-01-10 09:16:55 [INFO ] 0 repositories identified with calculated folder sizes in 0 msecs - 2015-01-10 09:16:55 [INFO ] built 14 day commit cache of 0 commits across 0 repositories in 2 msecs - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IProjectManager]---- - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IFederationManager]---- - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IGitblit]---- - 2015-01-10 09:16:55 [INFO ] Starting services manager... - 2015-01-10 09:16:55 [INFO ] Federation passphrase is blank! This server can not be PULLED from. - 2015-01-10 09:16:55 [INFO ] Fanout PubSub service is disabled. - 2015-01-10 09:16:55 [INFO ] Git Daemon is listening on 0.0.0.0:9418 - 2015-01-10 09:16:55 [INFO ] SSH Daemon (NIO2) is listening on 0.0.0.0:29418 - 2015-01-10 09:16:55 [WARN ] No ticket service configured. - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IPluginManager]---- - 2015-01-10 09:16:55 [INFO ] No plugins - 2015-01-10 09:16:55 [INFO ] - 2015-01-10 09:16:55 [INFO ] All managers started. - -Open your browser to **http://localhost:8080** or **https://localhost:8443** depending on your chosen configuration. Enter the default administrator credentials: **admin / admin** and click the **Login** button. - -![snapshot2](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot2.png) - -### Add user: ### - -![snapshot1](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot1.png) - -Add repo: - -![snapshot3](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot3.png) - -### Create a new repository on the command-line: ### - - touch README.md - git init - git add README.md - git commit -m "first commit" - git remote add origin ssh://admin@142.4.202.70:29418/Programming.git - git push -u origin master - -### Push an existing repository from the command-line: ### - - git remote add origin ssh://admin@142.4.202.70:29418/Programming.git - git push -u origin master - -Done! - --------------------------------------------------------------------------------- - -via: http://www.unixmen.com/install-gitblit-ubuntu-fedora-centos/ - -作者：[M.el Khamlichi][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/pirat9/ -[1]:http://gitblit.com/ -[2]:http://git-scm.com/ \ No newline at end of file From 63d09acaf0aecae25cb9746fa010aaa757c77e29 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Thu, 15 Jan 2015 09:28:29 +0800 Subject: [PATCH 040/215] translated --- ...l Gitblit On Ubuntu or Fedora or CentOS.md | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 translated/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md diff --git a/translated/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md b/translated/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md new file mode 100644 index 0000000000..84232f87a1 --- /dev/null +++ b/translated/tech/20150114 Install Gitblit On Ubuntu or Fedora or CentOS.md @@ -0,0 +1,149 @@ +在Ubuntu/Fedora/CentOS中安装Gitblit +================================================================================ +**Git**是一款注重速度、数据完整性、分布式支持和非线性工作流的分布式版本控制工具。Git最初由Linus Torvalds在2005年为Linux内核开发而设计，如今已经成为被广泛接受的版本控制系统。 + +和其他大多数分布式版本控制系统比起来，不像大多数客户端-服务端的系统，每个Git工作目录是一个完整的仓库，带有完整的历史记录和完整的版本跟踪能力，不需要依赖网络或者中心服务器。像Linux内核一样，Git意识在GPLv2许可证下的免费软件。 + +本篇教程我会演示如何安装gitlit服务器。gitlit的最新稳定版是1.6.2。[Gitblit][1]是一款开源、纯Java开发的用于管理浏览和服务的[Git][2]仓库。它被设计成一款为希望托管中心仓库的小工作组服务的工具。 + + mkdir -p /opt/gitblit; cd /opt/gitblit; wget http://dl.bintray.com/gitblit/releases/gitblit-1.6.2.tar.gz + +### 列出目录： ### + + root@vps124229 [/opt/gitblit]# ls + ./ docs/ gitblit-stop.sh* LICENSE service-ubuntu.sh* + ../ ext/ install-service-centos.sh* migrate-tickets.sh* + add-indexed-branch.sh* gitblit-1.6.2.tar.gz install-service-fedora.sh* NOTICE + authority.sh* gitblit.jar install-service-ubuntu.sh* reindex-tickets.sh* + data/ gitblit.sh* java-proxy-config.sh* service-centos.sh* + +默认配置文件在data/gitblit.properties，你可以根据需要自己修改。 + +### 启动gitlit服务： ### + +### 通过service命令： ### + + root@vps124229 [/opt/gitblit]# cp service-centos.sh /etc/init.d/gitblit + root@vps124229 [/opt/gitblit]# chkconfig --add gitblit + root@vps124229 [/opt/gitblit]# service gitblit start + Starting gitblit server + . + +### 手动启动： ### + + root@vps124229 [/opt/gitblit]# java -jar gitblit.jar --baseFolder data + 2015-01-10 09:16:53 [INFO ] ***************************************************************** + 2015-01-10 09:16:53 [INFO ] _____ _ _ _ _ _ _ + 2015-01-10 09:16:53 [INFO ] | __ \(_)| | | | | |(_)| | + 2015-01-10 09:16:53 [INFO ] | | \/ _ | |_ | |__ | | _ | |_ + 2015-01-10 09:16:53 [INFO ] | | __ | || __|| '_ \ | || || __| + 2015-01-10 09:16:53 [INFO ] | |_\ \| || |_ | |_) || || || |_ + 2015-01-10 09:16:53 [INFO ] \____/|_| \__||_.__/ |_||_| \__| + 2015-01-10 09:16:53 [INFO ] Gitblit v1.6.2 + 2015-01-10 09:16:53 [INFO ] + 2015-01-10 09:16:53 [INFO ] ***************************************************************** + 2015-01-10 09:16:53 [INFO ] Running on Linux (3.8.13-xxxx-grs-ipv6-64-vps) + 2015-01-10 09:16:53 [INFO ] Logging initialized @842ms + 2015-01-10 09:16:54 [INFO ] Using JCE Unlimited Strength Jurisdiction Policy files + 2015-01-10 09:16:54 [INFO ] Setting up HTTPS transport on port 8443 + 2015-01-10 09:16:54 [INFO ] certificate alias = localhost + 2015-01-10 09:16:54 [INFO ] keyStorePath = /opt/gitblit/data/serverKeyStore.jks + 2015-01-10 09:16:54 [INFO ] trustStorePath = /opt/gitblit/data/serverTrustStore.jks + 2015-01-10 09:16:54 [INFO ] crlPath = /opt/gitblit/data/certs/caRevocationList.crl + 2015-01-10 09:16:54 [INFO ] Shutdown Monitor listening on port 8081 + 2015-01-10 09:16:54 [INFO ] jetty-9.2.3.v20140905 + 2015-01-10 09:16:55 [INFO ] NO JSP Support for /, did not find org.apache.jasper.servlet.JspServlet + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IRuntimeManager]---- + 2015-01-10 09:16:55 [INFO ] Basefolder : /opt/gitblit/data + 2015-01-10 09:16:55 [INFO ] Settings : /opt/gitblit/data/gitblit.properties + 2015-01-10 09:16:55 [INFO ] JVM timezone: America/Montreal (EST -0500) + 2015-01-10 09:16:55 [INFO ] App timezone: America/Montreal (EST -0500) + 2015-01-10 09:16:55 [INFO ] JVM locale : en_US + 2015-01-10 09:16:55 [INFO ] App locale : + 2015-01-10 09:16:55 [INFO ] PF4J runtime mode is 'deployment' + 2015-01-10 09:16:55 [INFO ] Enabled plugins: [] + 2015-01-10 09:16:55 [INFO ] Disabled plugins: [] + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.INotificationManager]---- + 2015-01-10 09:16:55 [WARN ] Mail service disabled. + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IUserManager]---- + 2015-01-10 09:16:55 [INFO ] ConfigUserService(/opt/gitblit/data/users.conf) + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IAuthenticationManager]---- + 2015-01-10 09:16:55 [INFO ] External authentication disabled. + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ---- [com.gitblit.transport.ssh.IPublicKeyManager]---- + 2015-01-10 09:16:55 [INFO ] FileKeyManager (/opt/gitblit/data/ssh) + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IRepositoryManager]---- + 2015-01-10 09:16:55 [INFO ] Repositories folder : /opt/gitblit/data/git + 2015-01-10 09:16:55 [INFO ] Identifying repositories... + 2015-01-10 09:16:55 [INFO ] 0 repositories identified with calculated folder sizes in 11 msecs + 2015-01-10 09:16:55 [INFO ] Lucene will process indexed branches every 2 minutes. + 2015-01-10 09:16:55 [INFO ] Garbage Collector (GC) is disabled. + 2015-01-10 09:16:55 [INFO ] Mirror service is disabled. + 2015-01-10 09:16:55 [INFO ] Alias UTF-9 & UTF-18 encodings as UTF-8 in JGit + 2015-01-10 09:16:55 [INFO ] Preparing 14 day commit cache. please wait... + 2015-01-10 09:16:55 [INFO ] 0 repositories identified with calculated folder sizes in 0 msecs + 2015-01-10 09:16:55 [INFO ] built 14 day commit cache of 0 commits across 0 repositories in 2 msecs + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IProjectManager]---- + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IFederationManager]---- + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IGitblit]---- + 2015-01-10 09:16:55 [INFO ] Starting services manager... + 2015-01-10 09:16:55 [INFO ] Federation passphrase is blank! This server can not be PULLED from. + 2015-01-10 09:16:55 [INFO ] Fanout PubSub service is disabled. + 2015-01-10 09:16:55 [INFO ] Git Daemon is listening on 0.0.0.0:9418 + 2015-01-10 09:16:55 [INFO ] SSH Daemon (NIO2) is listening on 0.0.0.0:29418 + 2015-01-10 09:16:55 [WARN ] No ticket service configured. + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] ----[com.gitblit.manager.IPluginManager]---- + 2015-01-10 09:16:55 [INFO ] No plugins + 2015-01-10 09:16:55 [INFO ] + 2015-01-10 09:16:55 [INFO ] All managers started. + +打开浏览器，依据你的配置进入**http://localhost:8080** 或者 **https://localhost:8443**。 输入默认的管理员授权：**admin / admin** 并点击**Login** 按钮 + +![snapshot2](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot2.png) + +### 添加用户： ### + +![snapshot1](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot1.png) + +添加仓库： + +![snapshot3](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/snapshot3.png) + +### 用命令行创建新的仓库： ### + + touch README.md + git init + git add README.md + git commit -m "first commit" + git remote add origin ssh://admin@142.4.202.70:29418/Programming.git + git push -u origin master + +### 从命令行推送已有的仓库： ### + + git remote add origin ssh://admin@142.4.202.70:29418/Programming.git + git push -u origin master + +完成！ + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/install-gitblit-ubuntu-fedora-centos/ + +作者：[M.el Khamlichi][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/pirat9/ +[1]:http://gitblit.com/ +[2]:http://git-scm.com/ \ No newline at end of file From 449e095f1a9e3d83dd0680cf27bda51db1733e28 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Thu, 15 Jan 2015 09:31:29 +0800 Subject: [PATCH 041/215] translating --- ... How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md b/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md index 0e23ec3eae..2936e51627 100644 --- a/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md +++ b/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md @@ -1,3 +1,5 @@ +Translating-----geekpi + How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty) ================================================================================ Today, we will install Ghost, a blogging platform in an Ubuntu Server 14.04 LTS (Trusty). From fe4a3f1b052d4424982c012f33e709fbe03602f3 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Thu, 15 Jan 2015 09:44:59 +0800 Subject: [PATCH 042/215] translated --- ...ost on Ubuntu Server 14.04 LTS (Trusty).md | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) rename {sources => translated}/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md (50%) diff --git a/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md b/translated/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md similarity index 50% rename from sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md rename to translated/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md index 2936e51627..95dca20588 100644 --- a/sources/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md +++ b/translated/tech/20150114 How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty).md @@ -1,34 +1,32 @@ -Translating-----geekpi - -How to Install Ghost on Ubuntu Server 14.04 LTS (Trusty) +如何在Ubuntu Server 14.04 LTS(Trusty) 上安装Ghost ================================================================================ -Today, we will install Ghost, a blogging platform in an Ubuntu Server 14.04 LTS (Trusty). +今天我们将会在Ubuntu Server 14.04 LTS (Trusty)上安装一个博客平台Ghost。 -Ghost is the most amazing publishing platform which is beautifully designed, easy to use, and free for everyone. It is Free and Open Source Software (FOSS), its source code is available in github. The interface is intended to be simple, and an analytics dashboard is planned, as of January 2014. Editing is facilitated using a split screen display. +Ghost是一款设计优美的发布平台，很容易使用且对任何人都免费。它是免费的开源软件（FOSS），它的源码在Github上。截至2014年1月，它的界面很简单还有分析面板。编辑使用的是分屏显示。 -So, here are the steps-wise tutorial below on how to setup Ghost on Ubuntu Server: +因此有了这篇步骤明确的在Ubuntu Server上安装Ghost的教程： -### 1. Updating Ubuntu ### +### 1. 升级Ubuntu ### -The first step will be to run through the Ubuntu software updates and install a couple of extra packages that will be needed. +第一步是运行Ubuntu软件升级并安装一系列需要的额外包。 sudo apt-get update sudo apt-get upgrade -y sudo aptitude install -y build-essential zip vim wget -### 2. Download and Install the Node.js Source Code ### +### 2. 下载并安装 Node.js 源码 ### wget http://nodejs.org/dist/node-latest.tar.gz tar -xzf node-latest.tar.gz cd node-v* -Now, we'll install Node.js by the following commands: +现在，我们使用下面的命令安装Node.js： ./configure make sudo make install -### 3. Download and Install Ghost ### +### 3. 下载并安装Ghost ### sudo mkdir -p /var/www/ cd /var/www/ @@ -37,29 +35,29 @@ Now, we'll install Node.js by the following commands: cd ghost/ sudo npm install --production -### 4.Configuring Ghost ### +### 4. 配置Ghost ### sudo nano config.example.js -In the "Production" section, change the following: +在“Production”字段，将： host: '127.0.0.1', -to +修改成 host: '0.0.0.0', -### Create Ghost User ### +### 创建Ghost用户 ### sudo adduser --shell /bin/bash --gecos 'Ghost application' ghost sudo chown -R ghost:ghost /var/www/ghost/ -Now to start Ghost, you will need to log into your "ghost" user. +现在启动Ghost，你需要以“ghsot”用户登录。 su - ghost cd /var/www/ghost/ -Now that you are logged in with your "ghost" user you can start Ghost: +现在，你已经以“ghsot”用户登录，并可启动Ghost： npm start --production @@ -68,7 +66,7 @@ Now that you are logged in with your "ghost" user you can start Ghost: via: http://linoxide.com/ubuntu-how-to/install-ghost-ubuntu-server-14-04/ 作者：[Arun Pyasi][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 24ce934e9e8266b0c7fc232cf15095078eccdd8b Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Thu, 15 Jan 2015 09:47:00 +0800 Subject: [PATCH 043/215] translating --- ...alling Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md b/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md index 1c16f35b63..42c481f232 100644 --- a/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md +++ b/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md @@ -1,3 +1,5 @@ +Translating-----geekpi + Installing Telnet In CentOS/RHEL/Scientific Linux 6 & 7 ================================================================================ #### Disclaimer: #### From 3b0362d7042c4b18b7459f72afb5b7897c1fa331 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Thu, 15 Jan 2015 10:07:42 +0800 Subject: [PATCH 044/215] translated --- ...entOS or RHEL or Scientific Linux 6 & 7.md | 160 ------------------ ...entOS or RHEL or Scientific Linux 6 & 7.md | 159 +++++++++++++++++ 2 files changed, 159 insertions(+), 160 deletions(-) delete mode 100644 sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md create mode 100644 translated/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md diff --git a/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md b/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md deleted file mode 100644 index 42c481f232..0000000000 --- a/sources/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md +++ /dev/null @@ -1,160 +0,0 @@ -Translating-----geekpi - -Installing Telnet In CentOS/RHEL/Scientific Linux 6 & 7 -================================================================================ -#### Disclaimer: #### - -Before installing and using Telnet, keep the following in mind. - -- Using Telnet in public network(WAN) is very very bad idea. It transmits login data in the clear format. Everything will be sent in plain text. -- If you still need Telnet, It is highly recommended use it in the local area network only. -- Alternatively, you can use **SSH**. But make sure you’ve disabled root login in SSH. - -### What Is Telnet? ### - -[Telnet][1] is a network protocol which is used to connect to remote computers over TCP/IP network. Once you establish a connection to the remote computer, it becomes a virtual terminal and will allow you to communicate with the remote host from your local system. - -In this brief tutorial, let us see how to install Telnet, and how to access remote systems via Telnet. - -### Installation ### - -Open your terminal and type the following command to install telnet: - - yum install telnet telnet-server -y - -Now, the telnet has been installed in your server. Next, edit the telnet configuration file **/etc/xinetd.d/telnet**; - - vi /etc/xinetd.d/telnet - -Set **disable = no**: - - # default: on - # description: The telnet server serves telnet sessions; it uses \ - # unencrypted username/password pairs for authentication. - service telnet - { - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/in.telnetd - log_on_failure += USERID - disable = no - } - -Save and quit the file. Be mindful that you don’t have do this step in CentOS 7. - -Now restart the telnet service using the following command: - -On CentOS 6.x systems: - - service xinetd start - -Make this service to start automatically on every reboot: - -On CentOS 6: - - chkconfig telnet on - chkconfig xinetd on - -On CentOS 7: - - systemctl start telnet.socket - systemctl enable telnet.socket - -Allow the telnet default port **23** through your firewall and Router. To allow the telnet port through firewall, Edit file **/etc/sysconfig/iptables** on CentOS 6.x systems: - - vi /etc/sysconfig/iptables - -Add the line as shown in red color: - - # Firewall configuration written by system-config-firewall - # Manual customization of this file is not recommended. - *filter - :INPUT ACCEPT [0:0] - :FORWARD ACCEPT [0:0] - :OUTPUT ACCEPT [0:0] - -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT - -A INPUT -p icmp -j ACCEPT - -A INPUT -i lo -j ACCEPT - -A INPUT -p tcp -m state --state NEW --dport 23 -j ACCEPT - -A INPUT -m state --state NEW -m tcp -p tcp --dport 22 -j ACCEPT - -A INPUT -j REJECT --reject-with icmp-host-prohibited - -A FORWARD -j REJECT --reject-with icmp-host-prohibited - COMMIT - -Save and exit the file. Restart iptables service: - - service iptables restart - -On CentOS 7, run the following commands to enable telnet service through firewall. - - firewall-cmd --permanent --add-port=23/tcp - firewall-cmd --reload - -Thats it. Now telnet server is ready to use. - -#### Creating users #### - -Create a test user, for example “**sk**” with password “**centos**“: - - useradd sk - passwd sk - -#### Client Side Configuration #### - -Install telnet package: - - yum install telnet - -On DEB based systems: - - sudo apt-get install telnet - -Now, open Terminal, and try to access your server(remote host). - -If your client is Linux system, open the terminal and type the following command to connect to telnet server. - - telnet 192.168.1.150 - -Enter username and password which we have created in the server: - -Sample output: - - Trying 192.168.1.150... - Connected to 192.168.1.150. - Escape character is '^]'. - - Kernel 3.10.0-123.13.2.el7.x86_64 on an x86_64 - server1 login: sk - Password: - [sk@server1 ~]$ - -As you see in the above output, the remote system has been successfully accessed from the local machine. - -If your client is windows system, then go to **Start -> Run -> Command Prompt**. - -In the command prompt, type the command: - - telnet 192.168.1.150 - -Where **192.168.1.150** is remote host IP address. - -Now you will be able to connect to your server. - -That’s it. - -Cheers! - --------------------------------------------------------------------------------- - -via: http://www.unixmen.com/installing-telnet-centosrhelscientific-linux-6-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/ -[1]:http://en.wikipedia.org/wiki/Telnet \ No newline at end of file diff --git a/translated/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md b/translated/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md new file mode 100644 index 0000000000..901ce4380f --- /dev/null +++ b/translated/tech/20150114 Installing Telnet In CentOS or RHEL or Scientific Linux 6 & 7.md @@ -0,0 +1,159 @@ +在CentOS/RHEL/Scientific Linux 6 & 7 上安装Telnet +================================================================================ + +#### 声明： #### + +在安装和使用Telnet之前，需要记住以下几点。 + +- 在公网(WAN)中使用Telnet是非常不好的想法。它会以明文的格式传输登入数据。每个人都可以看到明文。 +- 如果你还是需要Telnet，强烈建议你只在局域网内部使用。 +- 你可以使用**SSH**作为替代方法。但是确保不要用root用户登录。 + +### Telnet是什么？ ### + +[Telnet][1] 是用于通过TCP/IP网络远程登录计算机的协议。一旦与远程计算机建立了连接，它就会成为一个虚拟终端且允许你与远程计算机通信。 + +在本篇教程中，我们会展示如何安装Telnet并且如何通过Telnet访问远程系统。 + +### 安装 ### + +打开终端并输入下面的命令来安装telnet： + + yum install telnet telnet-server -y + +现在telnet已经安装在你的服务器上了。接下来编辑文件**/etc/xinetd.d/telnet**： + + vi /etc/xinetd.d/telnet + +设置 **disable = no**: + + # default: on + # description: The telnet server serves telnet sessions; it uses \ + # unencrypted username/password pairs for authentication. + service telnet + { + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/in.telnetd + log_on_failure += USERID + disable = no + } + +保存并退出文件。记住我们不必在CentOS 7做这步。 + +接下来使用下面的命令重启telnet服务： + +在CentOS 6.x 系统中： + + service xinetd start + +让这个服务在每次重启时都会启动： + +在CentOS 6上： + + chkconfig telnet on + chkconfig xinetd on + +在CentOS 7上： + + systemctl start telnet.socket + systemctl enable telnet.socket + +让telnet的默认端口**23**可以通过防火墙和路由器。要让telnet端口可以通过防火墙，在CentOS 6.x系统中编辑下面的文件： + + vi /etc/sysconfig/iptables + +加入红色显示的行： + + # Firewall configuration written by system-config-firewall + # Manual customization of this file is not recommended. + *filter + :INPUT ACCEPT [0:0] + :FORWARD ACCEPT [0:0] + :OUTPUT ACCEPT [0:0] + -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + -A INPUT -p icmp -j ACCEPT + -A INPUT -i lo -j ACCEPT + -A INPUT -p tcp -m state --state NEW --dport 23 -j ACCEPT + -A INPUT -m state --state NEW -m tcp -p tcp --dport 22 -j ACCEPT + -A INPUT -j REJECT --reject-with icmp-host-prohibited + -A FORWARD -j REJECT --reject-with icmp-host-prohibited + COMMIT + +保存并退出文件。重启iptables服务： + + service iptables restart + +在CentOS 7中，运行下面的命令让telnet服务可以通过防火墙。 + + firewall-cmd --permanent --add-port=23/tcp + firewall-cmd --reload + +就是这样。现在telnet服务就可以使用了。 + +#### 创建用户 #### + +创建一个测试用户，比如用户名是“**sk**”，密码是“**centos**“: + + useradd sk + passwd sk + +#### 客户端配置 #### + +安装telnet包： + + yum install telnet + +在基于DEB的系统中： + + sudo apt-get install telnet + +现在，打开终端，尝试访问你的服务器（远程主机）。 + +如果你的客户端是Linux系统，打开终端并输入下面的命令来连接到telnet服务器上。 + + telnet 192.168.1.150 + +输入服务器上已经创建的用户名和密码： + +示例输出: + + Trying 192.168.1.150... + Connected to 192.168.1.150. + Escape character is '^]'. + + Kernel 3.10.0-123.13.2.el7.x86_64 on an x86_64 + server1 login: sk + Password: + [sk@server1 ~]$ + +如你所见，已经成功从本地访问远程主机了。 + +如果你的系统是windows，进入**开始 -> 运行 -> 命令提示符**。 + +在命令提示符中，输入命令： + + telnet 192.168.1.150 + +**192.168.1.150**是远程主机IP地址。 + +现在你就可以连接到你的服务器上了。 + +就是这样。 + +干杯！ + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/installing-telnet-centosrhelscientific-linux-6-7/ + +作者：[SK][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.unixmen.com/author/sk/ +[1]:http://en.wikipedia.org/wiki/Telnet \ No newline at end of file From 47b4c22a570d836cd1393f3212018ad5d6dd9fde Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Thu, 15 Jan 2015 15:42:04 +0800 Subject: [PATCH 045/215] =?UTF-8?q?=E9=80=89=E9=A2=98=2020150115=20How=20T?= =?UTF-8?q?o=20Run=20Linux=20Programs=20From=20The=20Terminal=20In=20Backg?= =?UTF-8?q?round=20Mode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ns From The Terminal In Background Mode.md | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 sources/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md diff --git a/sources/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md b/sources/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md new file mode 100644 index 0000000000..cab2676152 --- /dev/null +++ b/sources/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md @@ -0,0 +1,85 @@ +How To Run Linux Programs From The Terminal In Background Mode +======================================================================== + +![Linux Terminal Window.](http://f.tqn.com/y/linux/1/W/r/G/1/terminal.JPG) + +This is a short but useful guide to show how to run Linux applications from the terminal whilst allowing the terminal to retain control. + +There are various ways of opening a terminal window in Linux and it largely depends on your choice of distribution and the desktop environment. + +Using Ubuntu you can open a terminal by using the CTRL + ALT + T key combination. You can also open a terminal window by pressing the super key (Windows Key), on the keyboard, to [bring up the Dash][1] and search for "TERM". Clicking on the "Term" icon will open a terminal window. + +For other desktop environments such as XFCE, KDE, LXDE, Cinnamon and MATE you will find the terminal within the menu. Some distributions will have a terminal icon in a dock or as a launcher on a panel. + +You can generally start an application from the terminal by simply entering the name of the program. For instance you can start Firefox by typing "firefox". + +The benefit of running an application from the terminal is that you can include additional options. + +For instance if you type the following a new Firefox browser window will open and the default search engine will be used to search for the term between quotes: + + firefox -search "Linux.About.Com" + +You will notice that if you run Firefox, the application will open and the control will be returned to the terminal which means you can continue working within the terminal. + +Generally if you run an application from within the terminal, the application will open and you won't regain control of the terminal until the application is closed. This is because you opened the program in the foreground. + +To be able to open a program in the Linux terminal and return control to the terminal you need to open the application as a background process, + +In order to open a program as a background process simply add the ampersand (&) symbol to the command as shown below: + + libreoffice & + +An application might not run just by providing the program's name in the terminal. If the program doesn't reside in one of the folders set within the PATH variable then you will need to specify the whole path name in order to run the program. + + /path/to/yourprogram & + +If you aren't sure where a program resides within the Linux folder structure use the [find][2] or [locate][3] command to find the application. + +The syntax for finding a file is as follows: + + find /path/to/start/from -name programname + +For instance if you wanted to find the location of Firefox use the following command: + + find / -name firefox + +The output will whizz past quite quickly and so you will want to pipe the output to either [less][4] or [more][5] as follows: + + find / -name firefox | more + + find / -name firefox | less + +The find command will return a number of permission denied errors for folders that you don't have permissions to search. + +You can alway provide the [sudo command to elevate your permissions][6]. If sudo isn't installed you will need to switch to a user that has permissions. + + sudo find / -name firefox | more + +If you know that the file you are looking for is within the folder structure in which you are currently located then you can replace the forward slash with a period as follows: + + sudo find . -name firefox | more + +You may or may not need the elevated permissions provided by sudo. If you are looking for something within your home folder structure then it won't be required. + +Some applications require elevated permissions to run and you may get a lack of permissions error unless you use either a user with adequate permissions or elevate those permissions using sudo. + +Here is a neat trick. If you run an application and it requires elevated permissions to run, type the following: + + sudo !! + + +via : http://linux.about.com/od/commands/fl/How-To-Run-Linux-Programs-From-The-Terminal-In-Background-Mode.htm + +作者：[Gary Newell][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linux.about.com/bio/Gary-Newell-132058.htm +[1]:http://linux.about.com/od/howtos/fl/Learn-Ubuntu-The-Unity-Dash.htm +[2]:http://linux.about.com/od/commands/l/blcmdl1_find.htm +[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 From ebf0c22f67fe7cdd325b2ef0a37159b28470c0b9 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Thu, 15 Jan 2015 15:42:50 +0800 Subject: [PATCH 046/215] =?UTF-8?q?=E7=BF=BB=E8=AF=91=2020150115=20How=20T?= =?UTF-8?q?o=20Run=20Linux=20Applications=20From=20The=20Terminal=20In=20B?= =?UTF-8?q?ackground=20Mode.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ns From The Terminal In Background Mode.md | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 translated/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md 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 new file mode 100644 index 0000000000..500251b727 --- /dev/null +++ b/translated/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md @@ -0,0 +1,88 @@ +如何在终端使用后台运行模式启动一个Linux应用程序 +======================================================================== + +![Linux终端窗口](http://f.tqn.com/y/linux/1/W/r/G/1/terminal.JPG) + +这是一个篇幅不长但是十分有用的教程，可以帮助你在终端启动一个Linux应用程序，并且使终端窗口不会丢失焦点。 + +我们有很多方法可以在Linux系统中打开一个终端窗口，这取决与你的选择以及你的桌面环境。 + +如果是使用Ubuntu的话，你可以利用CTRL+ALT+T组合键打开终端。当然你也可以使用超级键（Windows键）[打开Dash][1]，搜索“TERM”，然后点击“Term”图标来打开终端窗口。 + +对于其他的桌面环境来说，例如XFCE、KDE、LXDE、Cinnamon以及MATE，你可以在菜单中找到终端。有些环境会在停靠栏或者面板上面包含终端图标。 + +通常情况下，你可以在终端里面直接输入应用程序名来启动一个应用程序。比如说，你可以通过输入“firefox”来启动Firefox。 + +在终端启动应用程序的好处是，你可以包含一些额外的参数。 + +例如，你可以通过下列命令来打开一个Firefox浏览窗口，然后利用默认的搜索引擎搜索相关信息： + + firefox -search "linux.cn" + +你可能会注意到，当你启动Firefox的时候，如果程序打开以后，焦点重新会到终端窗口的话，你就可以继续在终端进行工作。 + +通常情况下，如果你在终端启动了应用程序，焦点会切换到新启动的应用程序，只有程序被关闭以后焦点才会重新切换到终端。这是因为你在前台启动了这个程序。 + +如果要实现焦点仍然保持在终端窗口的目的，那么你需要将应用程序启动为后台进程。 + +向下面所列的命令一样，我们可以通过增加一个（&）符号，将应用程序在后台启动。 + + libreoffice & + +>译者注：如果需要加参数的话，记得把&符号放在最后。 +>译者注：一般情况下，关闭终端时，在这个终端启动的后台程序也会被终止，要使终端关闭以后，后台程序依然保持执行可以使用下列命令 +> nohup command [arg...] & + +如果应用程序目录没有安装在PATH变量包含的目录里面的话，我们就没有办法直接通过应用程序名来启动程序，必须输入应用程序的整个路径来启动它。 + + /path/to/yourprogram & + +如果你不确定程序输入哪个Linux目录结构的话，可以使用[find][2]或者[location][3]命令来定位它。 + +可以输入下列符号来找到一个文件： + + find /path/to/start/from -name programname + +例如，你可以输入下列命令来找到Firefox： + + find / -name firefox + +命令运行的结果会嗖的一下输出一大堆，别担心，你也可以通过[less][4]或者[more][5]来进行分页查看。 + + find / -name firefox | more + + find / -name firefox | less + +当find命令查找到没有权限访问的文件夹时，会报出一条拒绝访问错误， + +你可以通过[sudo命令来提示权限][6]。当然，如果你没有安装sudo的话，就只能切换到一个拥有权限的用户了。 + + sudo find / -name firefox | more + +如果你知道你要查找的文件在你的当前目录及其子目录中，那么你可以使用点来代替斜杠： + + sudo find . -name firefox | more + +你可能需要sudo来提升权限，也可能根本就不需要，如果这个文件在你的跟目录里面，那么就不需要使用sudo。 + +有些应用程序则必须要提升权限才能运行，否则你就会得到一大堆拒绝访问错误，除非你使用一个具有权限的用户，或者使用sudo提升权限。 + +这里有个小窍门。如果你运行了一个程序，但是它报了权限错误以后，输入下面命令试试： + + sudo !! + +via : http://linux.about.com/od/commands/fl/How-To-Run-Linux-Programs-From-The-Terminal-In-Background-Mode.htm + +作者：[Gary Newell][a] +译者：[zhouj-sh](https://github.com/zhouj-sh) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linux.about.com/bio/Gary-Newell-132058.htm +[1]:http://linux.about.com/od/howtos/fl/Learn-Ubuntu-The-Unity-Dash.htm +[2]:http://linux.about.com/od/commands/l/blcmdl1_find.htm +[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 From 736eaa9596317e6ab526c07d46d9eb70cc0353ad Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Thu, 15 Jan 2015 15:46:39 +0800 Subject: [PATCH 047/215] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...n Linux Applications From The Terminal In Background Mode.md | 2 ++ 1 file changed, 2 insertions(+) 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 500251b727..b0f4731e18 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 @@ -30,7 +30,9 @@ libreoffice & >译者注：如果需要加参数的话，记得把&符号放在最后。 + >译者注：一般情况下，关闭终端时，在这个终端启动的后台程序也会被终止，要使终端关闭以后，后台程序依然保持执行可以使用下列命令 + > nohup command [arg...] & 如果应用程序目录没有安装在PATH变量包含的目录里面的话，我们就没有办法直接通过应用程序名来启动程序，必须输入应用程序的整个路径来启动它。 From 1c661ba3c22ed1b372f547c91990cf8f2dbb37d9 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Thu, 15 Jan 2015 16:05:12 +0800 Subject: [PATCH 048/215] =?UTF-8?q?=E5=B7=B2=E5=87=BA=E7=89=88=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=9F=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...er When Dual Booting Windows And Ubuntu.md | 104 ------------------ 1 file changed, 104 deletions(-) delete mode 100644 sources/share/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md diff --git a/sources/share/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md b/sources/share/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md deleted file mode 100644 index dc1cab30df..0000000000 --- a/sources/share/20141229 2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu.md +++ /dev/null @@ -1,104 +0,0 @@ -[zhouj-sh translating...] -2 Ways To Fix The UEFI Bootloader When Dual Booting Windows And Ubuntu -================================================================================ -The main problem that users experience after following my [tutorials for dual booting Ubuntu and Windows 8][1] is that their computer continues to boot directly into Windows 8 with no option for running Ubuntu. - -Here are two ways to fix the EFI boot loader to get the Ubuntu portion to boot correctly. - -![Set GRUB2 As The Bootloader.](http://0.tqn.com/y/linux/1/L/E/J/1/grub2.JPG) - -### 1. Make GRUB The Active Bootloader ### - -There are a few things that may have gone wrong during the installation. - -In theory if you have managed to install Ubuntu in the first place then you will have [turned off fast boot][2]. - -Hopefully you [followed this guide to create a bootable UEFI Ubuntu USB drive][3] as this installs the correct UEFI boot loader. - -If you have done both of these things as part of the installation, the bit that may have gone wrong is the part where you set GRUB2 as the boot manager. - -To set GRUB2 as the default bootloader follow these steps: - -1.Login to Windows 8 -2.Go to the desktop -3.Right click on the start button and choose administrator command prompt -4.Type mountvol g: /s (This maps your EFI folder structure to the G drive). -5.Type cd g:\EFI -6.When you do a directory listing you will see a folder for Ubuntu. Type dir. -7.There should be options for grubx64.efi and shimx64.efi -8.Run the following command to set grubx64.efi as the bootloader: - -bcdedit /set {bootmgr} path \EFI\ubuntu\grubx64.efi - -9:Reboot your computer -10:You should now have a GRUB menu appear with options for Ubuntu and Windows. -11:If your computer still boots straight to Windows repeat steps 1 through 7 again but this time type: - -bcdedit /set {bootmgr} path \EFI\ubuntu\shimx64.efi - -12:Reboot your computer - -What you are doing here is logging into the Windows administration command prompt, mapping a drive to the EFI partition so that you can see where the Ubuntu bootloaders are installed and then either choosing grubx64.efi or shimx64.efi as the bootloader. - -So [what is the difference between grubx64.efi and shimx64.efi][4]? You should choose grubx64.efi if secureboot is turned off. If secureboot is turned on you should choose shimx64.efi. - -In my steps above I have suggested trying one and then trying another. The other option is to install one and then turn secure boot on or off within the UEFI firmware for your computer depending on the bootloader you chose. - -### 2. Use rEFInd To Dual Boot Windows 8 And Ubuntu ### -The [rEFInd boot loader][5] works by listing all of your operating systems as icons. You will therefore be able to boot Windows, Ubuntu and operating systems from USB drives simply by clicking the appropriate icon. - -To download rEFInd for Windows 8 [click here][6]. - -After you have downloaded the file extract the zip file. - -Now follow these steps to install rEFInd. - -1.Go to the desktop -2.Right click on the start button and choose administrator command prompt -3.Type mountvol g: /s (This maps your EFI folder structure to the G drive) -4.Navigate to the extracted rEFInd folder. For example: - -cd c:\users\gary\downloads\refind-bin-0.8.4\refind-bin-0.8.4 - -When you type dir you should see a folder for refind -5.Type the following to copy refind to the EFI partition: - -xcopy /E refind g:\EFI\refind\ - -6.Type the following to navigate to the refind folder - -cd g:\EFI\refind - -7.Rename the sample configuration file: - -rename refind.conf-sample refind.conf -8.Run the following command to set rEFInd as the bootloader - -bcdedit /set {bootmgr} path \EFI\refind\refind_x64.efi - -9.Reboot your computer -10.You should now have a menu similar to the image above with options to boot Windows and Ubuntu -​ -This process is fairly similar to choosing the GRUB bootloader. - -Basically it involves downloading rEFInd, extracting the files. copying the files to the EFI partition, renaming the configuration file and then setting rEFInd as the boot loader. - -### Summary ### - -Hopefully this guide has solved the issues that some of you have been having with dual booting Ubuntu and Windows 8.1. If you are still having issues feel free to get back in touch using the email link above. - - -作者：[Gary Newell][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -via:http://linux.about.com/od/LinuxNewbieDesktopGuide/tp/3-Ways-To-Fix-The-UEFI-Bootloader-When-Dual-Booting-Windows-And-Ubuntu.htm -[a]:http://linux.about.com/bio/Gary-Newell-132058.htm -[1]:http://linux.about.com/od/LinuxNewbieDesktopGuide/ss/The-Ultimate-Windows-81-And-Ubuntu- -[2]:http://linux.about.com/od/howtos/ss/How-To-Create-A-UEFI-Bootable-Ubuntu-USB-Drive-Using-Windows_3.htm#step-heading -[3]:http://linux.about.com/od/howtos/ss/How-To-Create-A-UEFI-Bootable-Ubuntu-USB-Drive-Using-Windows.htm -[4]:https://wiki.ubuntu.com/SecurityTeam/SecureBoot -[5]:http://www.rodsbooks.com/refind/installing.html#windows -[6]:http://sourceforge.net/projects/refind/files/0.8.4/refind-bin-0.8.4.zip/download \ No newline at end of file From d7d9009a1a9b3aab54573b7b09408c766a072a3c Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 15 Jan 2015 22:08:23 +0800 Subject: [PATCH 049/215] =?UTF-8?q?20150115-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Configure Mate Desktop With Mate Tweak.md | 33 +++++++ ...k using nmcli Tool in RedHat or CentOS 7.x | 92 +++++++++++++++++++ ...gration From 2.2 to 2.4 on Ubuntu 14.04.md | 56 +++++++++++ 3 files changed, 181 insertions(+) create mode 100644 sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md create mode 100644 sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x create mode 100644 sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md diff --git a/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md b/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md new file mode 100644 index 0000000000..4c21f3f02c --- /dev/null +++ b/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md @@ -0,0 +1,33 @@ +Configure Mate Desktop With Mate Tweak +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Mate_Tweak.jpeg) + +[Installing Mate Desktop in Ubuntu][1] is one thing but you might be wondering about how to **configure Mate Desktop**? Most of the desktop environments have their own tweaking tools. For example Unity has Unity Tweak Tool, GNOME has Gnome Tweak Tool, Elementary OS has Elementary Tweak Tool. Good news is that Mate Desktop too has its own configuration tweak tool, named [Mate Tweak][2]. + +Mate Tweak is a fork of [mintDesktop][3], a configuration tool for Linux Mint. + +### Install Mate Tweak to configure Mate Desktop ### + +Mate Tweak can be easily installed in Ubuntu and Ubuntu based system via its official PPA. Open a terminal and use the following commands: + + sudo add-apt-repository ppa:ubuntu-mate-dev/ppa + sudo apt-get update + sudo apt-get install mate-tweak + +You can control what shows on the desktop, buttons layout and other interface tweaks and windows behavior. Compare to Unity and Gnome tweak tools, Mate Tweak doesn’t have much to offer in terms of tweaking. For example you can still not [change themes][4] with it but at least it provides an easier way to change some configuration. I hope that it will have more features in near future. + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/configure-mate-desktop-mate-tweak/ + +作者：[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/install-mate-desktop-ubuntu-14-04/ +[2]:https://bitbucket.org/flexiondotorg/mate-tweak +[3]:https://github.com/linuxmint/mintdesktop +[4]:http://itsfoss.com/how-to-install-themes-in-ubuntu-13-10/ \ No newline at end of file diff --git a/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x b/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x new file mode 100644 index 0000000000..be02ea9e9d --- /dev/null +++ b/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x @@ -0,0 +1,92 @@ +How to Manage Network using nmcli Tool in RedHat / CentOS 7.x +================================================================================ +A new feature of [**Red Hat Enterprise Linux 7**][1] and **CentOS 7** is that the default networking service is provided by **NetworkManager**, a dynamic network control and configuration daemon that attempts to keep network devices and connections up and active when they are available while still supporting the traditional ifcfg type configuration files. NetworkManager can be used with the following types of connections: Ethernet, VLANs, Bridges, Bonds, Teams, Wi-Fi, mobile broadband (such as cellular 3G), and IP-over-InfiniBand. For these connection types, NetworkManager can configure network aliases, IP addresses, static routes, DNS information, and VPN connections, as well as many connection-specific parameters. + +The NetworkManager can be controlled with the command-line tool, nmcli. + +### General nmcli usage ### + +The general syntax for nmcli is: + + # nmcli [ OPTIONS ] OBJECT { COMMAND | help } + +One cool thing is that you can use the TAB key to complete actions when you write the command so if at any time you forget the syntax you can just press TAB to see a list of available options. + +![nmcli tab](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-tab.jpg) + +Some examples of general nmcli usage: + + # nmcli general status + +Will display the overall status of NetworkManager. + + # nmcli connection show + +Will display all connections. + + # nmcli connection show -a + +Will display only the active connections. + + # nmcli device status + +Will display a list of devices recognized by NetworkManager and their current state. + +![nmcli general](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-gneral.jpg) + +### Starting / stopping network interfaces ### + +You can use the nmcli tool to start or stop network interfaces from the command line, this is the equivalent of up/down in ifconfig. +To stop an interface use the following syntax: + + # nmcli device disconnect eno16777736 + +To start it you can use this syntax: + + # nmcli device connect eno16777736 + +### Adding an ethernet connection with static IP ### + +To add a new ethernet connection with a static IP address you can use the following command: + + # nmcli connection add type ethernet con-name NAME_OF_CONNECTION ifname interface-name ip4 IP_ADDRESS gw4 GW_ADDRESS + +replacing the NAME_OF_CONNECTION with the name you wish to apply to the new connection, the IP_ADDRESS with the IP address you wish to use and the GW_ADDRESS with the gateway address you use (if you don't use a gateway you can omit this last part). + + # nmcli connection add type ethernet con-name NEW ifname eno16777736 ip4 192.168.1.141 gw4 192.168.1.1 + +To set the DNS servers for this connection you can use the following command: + + # nmcli connection modify NEW ipv4.dns "8.8.8.8 8.8.4.4" + +To bring up the new Ethernet connection, issue a command as follows: + + # nmcli connection up NEW ifname eno16777736 + +To view detailed information about the newly configured connection, issue a command as follows: + + # nmcli -p connection show NEW + +![nmcli add static](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-add-static.jpg) + +Adding a connection that will use DHCP + +If you wish to add a new connection that will use DHCP to configure the interface IP address, gateway address and dns servers, all you have to do is omit the ip/gw address part of the command and Network Manager will use DHCP to get the configuration details. + +For example, to create a DHCP configured connection profile named NEW_DHCP, on device +eno16777736 you can use the following command: + + # nmcli connection add type ethernet con-name NEW_DHCP ifname eno16777736 + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-command/nmcli-tool-red-hat-centos-7/ + +作者：[Adrian Dinu][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/adriand/ +[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ \ No newline at end of file diff --git a/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md b/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md new file mode 100644 index 0000000000..3459775a94 --- /dev/null +++ b/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md @@ -0,0 +1,56 @@ +Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04 +================================================================================ +If you do a distribution upgrade from **Ubuntu** 12.04 to 14.04, the upgrade will bring among other things an important update to **Apache**, from [version 2.2][1] to version 2.4. The update brings many improvements but it may cause some errors when used with the old configuration file from 2.2. + +### Access control in Apache 2.4 Virtual Hosts ### + +Starting with **Apache 2.4** authorization is applied in a way that is much more flexible then just a single check against a single data store like it was in 2.2. In the past it was tricky to figure how and in what order authorization is applied but with the introduction of authorization container directives such as and , the configuration also has control over when the authorization methods are called and what criteria determines when access is granted. + +This is the point where most upgrades fail because of wrong configuration because in 2.2 access control based on IP address, hostname or other characteristic was done using the directives Order, Allow, Deny or Satisfy, but in 2.4 this is done with authorization checks using the new modules. + +To be clear let's see some virtual host examples, this can be found in your /etc/apache2/sites-enabled/default or /etc/apache2/sites-enabled/YOUR_WEBSITE_NAME: + +Old 2.2 virtual host configuration: + + Order allow,deny + Allow from all + +New 2.4 virtual host configuration: + + Require all granted + +![apache 2.4 config](http://blog.linoxide.com/wp-content/uploads/2014/12/apache-2.4-config.jpg) + +### .htaccess problems ### + +If after the upgrade some settings don't work or you get redirect errors, check if those settings are in a .htaccess file. If settings in the .htaccess file are not used by Apache it's because in 2.4 AllowOverride directive is set to None by default, thus ignoring the .htaccess files. All you have to do is to either change or add the AllowOverride All directive to your site configuration file. + +You also see the AllowOverride All directive set in the screenshot above. + +### Missing config file or module ### + +From my experience another problem during upgrades is that your configuration file includes an old module or configuration file that is no longer needed or supported in 2.4, you will get a clear warning that Apache can't include the respective file and all you have to do is go to your configuration file and remove the line that causes problem. Afterwards you can search or install a similar module. + +### Other small changes you shound know about ### + +There are a few other changes that you should consider, although they generally result in an warning and not an error: + +- MaxClients has been renamed to MaxRequestWorkers, which describes more accurately what it does. For async MPMs, like event, the maximum number of clients is not equivalent than the number of worker threads. The old name is still supported. +- The DefaultType directive no longer has any effect, other than to emit a warning if it's used with any value other than none. You need to use other configuration settings to replace it in 2.4. +- EnableSendfile now defaults to Off. +- FileETag now defaults to "MTime Size" (without INode). +- KeepAlive only accepts values of On or Off. Previously, any value other than "Off" or "0" was treated as "On". +- Directives AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex, and WatchdogMutexPath have been replaced with a single Mutex directive. You will need to evaluate any use of these removed directives in your 2.2 configuration to determine if they can just be deleted or will need to be replaced using Mutex. + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-how-to/apache-migration-2-2-to-2-4-ubuntu-14-04/ + +作者：[Adrian Dinu][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/adriand/ +[1]:http://httpd.apache.org/docs/2.4/ \ No newline at end of file From ff129b92f9be3eae1ba9bd71bcf84c7c15935d04 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 15 Jan 2015 22:26:14 +0800 Subject: [PATCH 050/215] =?UTF-8?q?20150115-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...115 20 Unix Command Line Tricks--Part I.md | 303 ++++++++++++++++++ ...rectory on a Linux or Unix-like Systems.md | 63 ++++ 2 files changed, 366 insertions(+) create mode 100644 sources/tech/20150115 20 Unix Command Line Tricks--Part I.md create mode 100644 sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md diff --git a/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md b/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md new file mode 100644 index 0000000000..af1218d6df --- /dev/null +++ b/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md @@ -0,0 +1,303 @@ +20 Unix Command Line Tricks – Part I +================================================================================ +Let us start new year with **these Unix command line tricks** to increase productivity at the Terminal. I have found them over the years and I'm now going to share with you. + +![](http://s0.cyberciti.org/uploads/cms/2015/01/unix-command-line-tricks.001.jpg) + +### Deleting a HUGE file ### + +I had a huge log file 200GB I need to delete on a production web server. My rm and ls command was crashed and I was afraid that the system to a crawl with huge disk I/O load. To remove a HUGE file, enter: + + > /path/to/file.log + # or use the following syntax + : > /path/to/file.log + + # finally delete it + rm /path/to/file.log + +### Want to cache console output? ### + +Try the script command line utility to create a typescript of everything printed on your terminal. + + script my.terminal.sessio + +Type commands: + + ls + date + sudo service foo stop + +To exit (to end script session) type *exit* or *logout* or press *control-D* + + exit + +To view type: + + more my.terminal.session + less my.terminal.session + cat my.terminal.session + +### Restoring deleted /tmp folder ### + +As my journey continues with [Linux and Unix shell, I made a few mistakes][1]. I accidentally deleted /tmp folder. To restore it all you have to do is: + + mkdir /tmp + chmod 1777 /tmp + chown root:root /tmp + ls -ld /tmp + +### Locking a directory ### + +For privacy of my data I wanted to lock down /downloads on my file server. So I ran: + + chmod 0000 /downloads + +The root user can still has access and ls and cd commands will not work. To go back: + + chmod 0755 /downloads + +### Password protecting file in vim text editor ### + +Afraid that root user or someone may snoop into your personal text files? Try password protection to a file in vim, type: + + vim +X filename + +Or, before quitting in vim use :X vim command to encrypt your file and vim will prompt for a password. + +### Clear gibberish all over the screen ### + +Just type: + + reset + +### Becoming human ### + +Pass the *-h* or *-H* (and other options) command line option to GNU or BSD utilities to get output of command commands like ls, df, du, in human-understandable formats: + + ls -lh + # print sizes in human readable format (e.g., 1K 234M 2G) + df -h + df -k + # show output in bytes, KB, MB, or GB + free -b + free -k + free -m + free -g + # print sizes in human readable format (e.g., 1K 234M 2G) + du -h + # get file system perms in human readable format + stat -c %A /boot + # compare human readable numbers + sort -h -a file + # display the CPU information in human readable format on a Linux + lscpu + lscpu -e + lscpu -e=cpu,node + # Show the size of each file but in a more human readable way + tree -h + tree -h /boot + +### Show information about known users in the Linux based system ### + +Just type: + + ## linux version ## + lslogins + + ## BSD version ## + logins + +Sample outputs: + + UID USER PWD-LOCK PWD-DENY LAST-LOGIN GECOS + 0 root 0 0 22:37:59 root + 1 bin 0 1 bin + 2 daemon 0 1 daemon + 3 adm 0 1 adm + 4 lp 0 1 lp + 5 sync 0 1 sync + 6 shutdown 0 1 2014-Dec17 shutdown + 7 halt 0 1 halt + 8 mail 0 1 mail + 10 uucp 0 1 uucp + 11 operator 0 1 operator + 12 games 0 1 games + 13 gopher 0 1 gopher + 14 ftp 0 1 FTP User + 27 mysql 0 1 MySQL Server + 38 ntp 0 1 + 48 apache 0 1 Apache + 68 haldaemon 0 1 HAL daemon + 69 vcsa 0 1 virtual console memory owner + 72 tcpdump 0 1 + 74 sshd 0 1 Privilege-separated SSH + 81 dbus 0 1 System message bus + 89 postfix 0 1 + 99 nobody 0 1 Nobody + 173 abrt 0 1 + 497 vnstat 0 1 vnStat user + 498 nginx 0 1 nginx user + 499 saslauth 0 1 "Saslauthd user" + +### How do I fix mess created by accidentally untarred files in the current dir? ### + +So I accidentally untar a tarball in /var/www/html/ directory instead of /home/projects/www/current. It created mess in /var/www/html/. The easiest way to fix this mess: + + cd /var/www/html/ + /bin/rm -f "$(tar ztf /path/to/file.tar.gz)" + +### Confused on a top command output? ### + +Seriously, you need to try out htop instead of top: + + sudo htop + +### Want to run the same command again? ### + +Just type !!. For example: + + /myhome/dir/script/name arg1 arg2 + + # To run the same command again + !! + + ## To run the last command again as root user + sudo !! + +The !! repeats the most recent command. To run the most recent command beginning with "foo": + + !foo + # Run the most recent command beginning with "service" as root + sudo !service + +The !$ use to run command with the last argument of the most recent command: + + # Edit nginx.conf + sudo vi /etc/nginx/nginx.conf + + # Test nginx.conf for errors + /sbin/nginx -t -c /etc/nginx/nginx.conf + + # After testing a file with "/sbin/nginx -t -c /etc/nginx/nginx.conf", you + # can edit file again with vi + sudo vi !$ + +### ###Get a reminder you when you have to leave + +If you need a reminder to leave your terminal, type the following command: + + leave +hhmm + +Where, + +- **hhmm** - The time of day is in the form hhmm where hh is a time in hours (on a 12 or 24 hour clock), and mm are minutes. All times are converted to a 12 hour clock, and assumed to be in the next 12 hours. + +### Home sweet home ### + +Want to go the directory you were just in? Run: + + cd - + +Need to quickly return to your home directory? Enter: + + cd + +The variable *CDPATH* defines the search path for the directory containing directories: + + export CDPATH=/var/www:/nas10 + +Now, instead of typing cd */var/www/html/* I can simply type the following to cd into /var/www/html path: + + cd html + +### Editing a file being viewed with less pager ### + +To edit a file being viewed with less pager, press v. You will have the file for edit under $EDITOR: + + less *.c + less foo.html + ## Press v to edit file ## + ## Quit from editor and you would return to the less pager again ## + +### List all files or directories on your system ### + +To see all of the directories on your system, run: + + find / -type d | less + + # List all directories in your $HOME + find $HOME -type d -ls | less + +To see all of the files, run: + + find / -type f | less + + # List all files in your $HOME + find $HOME -type f -ls | less + +### Build directory trees in a single command ### + +You can create directory trees one at a time using mkdir command by passing the -p option: + + mkdir -p /jail/{dev,bin,sbin,etc,usr,lib,lib64} + ls -l /jail/ + +### Copy file into multiple directories ### + +Instead of running: + + cp /path/to/file /usr/dir1 + cp /path/to/file /var/dir2 + cp /path/to/file /nas/dir3 + +Run the following command to copy file into multiple dirs: + + echo /usr/dir1 /var/dir2 /nas/dir3 | xargs -n 1 cp -v /path/to/file + +[Creating a shell function][2] is left as an exercise for the reader + +### Quickly find differences between two directories ### + +The diff command compare files line by line. It can also compare two directories: + + ls -l /tmp/r + ls -l /tmp/s + # Compare two folders using diff ## + diff /tmp/r/ /tmp/s/ + +[![Fig. : Finding differences between folders](http://s0.cyberciti.org/uploads/cms/2015/01/differences-between-folders.jpg)][3] + +Fig. : Finding differences between folders + +### Text formatting ### + +You can reformat each paragraph with fmt command. In this example, I'm going to reformat file by wrapping overlong lines and filling short lines: + + fmt file.txt + +You can also split long lines, but do not refill i.e. wrap overlong lines, but do not fill short lines: + + fmt -s file.txt + +### See the output and write it to a file ### + +Use the tee command as follows to see the output on screen and also write to a log file named my.log: + + mycoolapp arg1 arg2 input.file | tee my.log + +The tee command ensures that you will see mycoolapp output on on the screen and to a file same time. + +-------------------------------------------------------------------------------- + +via: http://www.cyberciti.biz/open-source/command-line-hacks/20-unix-command-line-tricks-part-i/ + +作者：[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/tips/my-10-unix-command-line-mistakes.html +[2]:http://bash.cyberciti.biz/guide/Writing_your_first_shell_function +[3]:http://www.cyberciti.biz/open-source/command-line-hacks/20-unix-command-line-tricks-part-i/attachment/differences-between-folders/ \ No newline at end of file diff --git a/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md b/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md new file mode 100644 index 0000000000..bae3c66664 --- /dev/null +++ b/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md @@ -0,0 +1,63 @@ +How To Extract a Tar Files To a Different Directory on a Linux/Unix-like Systems +================================================================================ +I want to extract tar file to specific directory called /tmp/data. How can I extract a tar archive to a different directory using tar command on a Linux or Unix-like systems? + +You do not need to change the directory using cd command and extract files. Untarring a file can be done using the following syntax: + +### Syntax ### + +Typical Unix tar syntax: + + tar -xf file.name.tar -C /path/to/directory + +GNU/tar syntax: + + tar xf file.tar -C /path/to/directory + + tar xf file.tar --directory /path/to/directory + +### Example: Extract files to another directory ### + +In this example, I'm extracting $HOME/etc.backup.tar file to a directory called /tmp/data. First, you have to create the directory manually, enter: + + mkdir /tmp/data + +To extract a tar archive $HOME/etc.backup.tar into a /tmp/data, enter: + + tar -xf $HOME/etc.backup.tar -C /tmp/data + +To see a progress pass the -v option: + + tar -xvf $HOME/etc.backup.tar -C /tmp/data + +Sample outputs: + +![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 Command Extract Archive To Different Directory Command + +You can extract specific files too use: + + tar -xvf $HOME/etc.backup.tar file1 file2 file3 dir1 -C /tmp/data + +To extract a foo.tar.gz (.tgz extension file) tarball to /tmp/bar, enter: + + mkdir /tmp/bar + tar -zxvf foo.tar.gz -C /tmp/bar + +To extract a foo.tar.bz2 (.tbz, .tbz2 & .tb2 extension file) tarball to /tmp/bar, enter: + + mkdir /tmp/bar + tar -jxvf foo.tar.bz2 -C /tmp/bar + +-------------------------------------------------------------------------------- + +via: http://www.cyberciti.biz/faq/howto-extract-tar-file-to-specific-directory-on-unixlinux/ + +作者：[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 \ No newline at end of file From 7959c6367d4b491f5ebfa1c31654cc0ccae23a9f Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 15 Jan 2015 22:31:02 +0800 Subject: [PATCH 051/215] PUB:20141118 How to boot on an ISO image from Grub @GOLinux --- .../20141118 How to boot on an ISO image from Grub.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename {translated/tech => published}/20141118 How to boot on an ISO image from Grub.md (76%) diff --git a/translated/tech/20141118 How to boot on an ISO image from Grub.md b/published/20141118 How to boot on an ISO image from Grub.md similarity index 76% rename from translated/tech/20141118 How to boot on an ISO image from Grub.md rename to published/20141118 How to boot on an ISO image from Grub.md index 742a0ea773..84327f8d4f 100644 --- a/translated/tech/20141118 How to boot on an ISO image from Grub.md +++ b/published/20141118 How to boot on an ISO image from Grub.md @@ -1,7 +1,6 @@ 用Grub启动ISO镜像 ================================================================================ -如果你需要使用多个Linux发行版，你没有那么多的选项。你可以安装到你的物理机或虚拟机中，也可以以live模式从ISO文件启动。第二个选择，如果对硬盘空间需求更少，就有点麻烦，因为你需要将ISO文件写入到USB棒或CD来启动。但是，这里有另外一个可选的折中方案：把ISO镜像放在硬盘中，然后以live模式来启动。该方案比完全安装更省空间，但是功能完备，这对于缓慢的虚拟机而言是个不错的替代方案。下面我将介绍怎样使用流行的Grub启动加载器来实现该方案。 - +如果你想要使用多个Linux发行版，你没有那么多的选择。你要么安装到你的物理机或虚拟机中，要么以live模式从ISO文件启动。第二个选择，对硬盘空间需求较小，只是有点麻烦，因为你需要将ISO文件写入到U盘或CD/DVD中来启动。不过，这里还有另外一个可选的折中方案：把ISO镜像放在硬盘中，然后以live模式来启动。该方案比完全安装更省空间，而且功能也完备，这对于缓慢的虚拟机而言是个不错的替代方案。下面我将介绍怎样使用流行的Grub启动加载器来实现该方案。 很明显，你将需要使用到Grub，这是几乎所有现代Linux发行版都使用的。你也需要你所想用的Linux版本的ISO文件，将它下载到本地磁盘。最后，你需要知道启动分区在哪里，并怎样在Grub中描述。对于此，请使用以下命令： @@ -31,7 +30,7 @@ [some specific] arguments } -例如，如果你想要从ISO文件启动Ubuntu，那么你就是想要添加该行到40_custom文件： +例如，如果你想要从ISO文件启动Ubuntu，那么你就是想要添加如下行到40_custom文件： menuentry "Ubuntu 14.04 (LTS) Live Desktop amd64" { set isofile="/boot/ubuntu-14.04-desktop-amd64.iso" @@ -62,7 +61,7 @@ initrd (loop)/isolinux/initrd0.img } -注意，参数可根据发行版进行修改。有幸的是，有许多地方你可以查阅。我喜欢这一个，但是还有很多其它的。同时，请考虑你放置ISO文件的地方。如果你的家目录被加密或者无法被访问到，你可能更喜欢将这些文件放到像例子中的启动分区。但是，请首先确保有足够的空间。 +注意，参数可根据发行版进行修改。幸运的是，有许多地方你可以查阅到。我喜欢这个发行版，但是还有很多其它的发行版你可以启动。同时，请注意你放置ISO文件的地方。如果你的家目录被加密或者无法被访问到，你可能更喜欢将这些文件放到像例子中的启动分区。但是，请首先确保启动分区有足够的空间。 最后，不要忘了保存40_custom文件并使用以下命令来更新grub： @@ -92,7 +91,7 @@ 可以显示DBAN选项，让你选择清除驱动器。**当心，因为它仍然十分危险**。 -小结一下，对于ISO文件和Grub有很多事情可做：从快速live会话到用你的指尖来破坏一切，都可以满足你。下一步是启动一些关注隐私的发行版如[Tails][2]。 +小结一下，对于ISO文件和Grub有很多事情可做：从快速live会话到一键毁灭，都可以满足你。之后，你也可以试试启动一些针对隐私方面的发行版，如[Tails][2]。 你认为从Grub启动一个ISO这个主意怎样？这是不是你想要做的呢？为什么呢？请在下面留言。 @@ -102,7 +101,7 @@ via: http://xmodulo.com/boot-iso-image-from-grub.html 作者：[Adrien Brochard][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 476e61555682f5ae304239cdb351cbe8dd5bea36 Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 15 Jan 2015 22:31:18 +0800 Subject: [PATCH 052/215] PUB:20141224 Linux FAQs with Answers--How to install 7zip on Linux @runningwater --- ...s with Answers--How to install 7zip on Linux.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename {translated/tech => published}/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md (75%) diff --git a/translated/tech/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md b/published/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md similarity index 75% rename from translated/tech/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md rename to published/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md index 42b1e37768..3978ec0fc7 100644 --- a/translated/tech/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md +++ b/published/20141224 Linux FAQs with Answers--How to install 7zip on Linux.md @@ -1,8 +1,8 @@ -Linux 有问必答--Linux 中如何安装 7zip +Linux有问必答：Linux 中如何安装 7zip ================================================================================ > **问题**: 我需要要从 ISO 映像中获取某些文件，为此我想要使用 7zip 程序。那么我应该如何安装 7zip 软件呢，[在 Linux 发布版本上完全安装]? -7zip 是一款开源的归档应用程序，开始是为 Windows 系统而开发的。它能对多种格式的档案文件进行打包或解包处理，除了支持原生的 7z 格式的文档外，还支持包括 XZ、GZIP、TAR、ZIP 和 BZIP2 等这些格式。 一般地，7zip 也常用来解压 RAR、DEB、RPM 和 ISO 等格式的文件。除了简单的归档功能，7zip 还具有支持 AES-256 算法加密以及自解压和建立多卷存档功能。在以 POSIX 协议为标准的系统上（Linux、Unix、BSD），原生的 7zip 程序被移植过来并被命名为 p7zip（“POSIX 7zip” 的简称）。 +7zip 是一款开源的归档应用程序，开始是为 Windows 系统而开发的。它能对多种格式的档案文件进行打包或解包处理，除了支持其原生的 7z 格式的文档外，还支持包括 XZ、GZIP、TAR、ZIP 和 BZIP2 等这些格式。 通常，7zip 也用来解压 RAR、DEB、RPM 和 ISO 等格式的文件。除了简单的归档功能，7zip 还具有支持 AES-256 算法加密以及自解压和建立多卷存档功能。在支持 POSIX 标准的系统上（Linux、Unix、BSD），原生的 7zip 程序被移植过来并被命名为 p7zip（“POSIX 7zip” 的简称）。 下面介绍如何在 Linux 中安装 7zip （或 p7zip）。 @@ -23,7 +23,7 @@ Linux 有问必答--Linux 中如何安装 7zip 基于红帽的发布系统上提供了两个 7zip 的软件包。 - **p7zip**: 包含 7za 命令，支持 7z、ZIP、GZIP、CAB、ARJ、BZIP2、TAR、CPIO、RPM 和 DEB 格式。 -- **p7zip-plugins**: 包含 7z 命令，额外的插件，它扩展了 7za 命令（例如 支持 ISO 格式的抽取）。 +- **p7zip-plugins**: 包含 7z 命令，额外的插件，它扩展了 7za 命令（例如支持 ISO 格式的抽取）。 在 CentOS/RHEL 系统中，在运行下面命令前您需要确保 [EPEL 资源库][1] 可用，但在 Fedora 系统中就不需要额外的资源库了。 @@ -37,11 +37,11 @@ Linux 有问必答--Linux 中如何安装 7zip ![](https://farm8.staticflickr.com/7583/15874000610_878a85b06a_b.jpg) -使用 “a” 选项就可以创建一个归档文件，它可以创建 7z、XZ、GZIP、TAR、 ZIP 和 BZIP2 这几种格式的文件。如果指定的归档文件已经存在的话，它会把文件“添加”到存在的归档中，而不是覆盖原有归档文件。 +使用 “a” 选项就可以创建一个归档文件，它可以创建 7z、XZ、GZIP、TAR、 ZIP 和 BZIP2 这几种格式的文件。如果指定的归档文件已经存在的话，它会把文件“附加”到存在的归档中，而不是覆盖原有归档文件。 $ 7z a -使用 “e” 选项可以抽取出一个归档文件，抽取出的文件会放在当前目录。抽取支持的格式比创建时支持的格式要多的多，包括 7z、XZ、GZIP、TAR、ZIP、BZIP2、LZMA2、CAB、ARJ、CPIO、RPM、ISO 和 DEB 这些格式。 +使用 “e” 选项可以抽取一个归档文件，抽取出的文件会放在当前目录。抽取支持的格式比创建时支持的格式要多的多，包括 7z、XZ、GZIP、TAR、ZIP、BZIP2、LZMA2、CAB、ARJ、CPIO、RPM、ISO 和 DEB 这些格式。 $ 7z e @@ -67,8 +67,8 @@ Linux 有问必答--Linux 中如何安装 7zip via:http://ask.xmodulo.com/install-7zip-linux.html 译者：[runningwater](https://github.com/runningwater) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[1]:http://xmodulo.com/how-to-set-up-epel-repository-on-centos.html \ No newline at end of file +[1]:http://linux.cn/article-2324-1.html \ No newline at end of file From 85feb3e7d5facfa3bb3fb712274b5813678bcec6 Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 15 Jan 2015 22:47:39 +0800 Subject: [PATCH 053/215] PUB:20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x @ZTinoZ --- ...o Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) rename {translated/tech => published}/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md (92%) diff --git a/translated/tech/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md b/published/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md similarity index 92% rename from translated/tech/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md rename to published/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md index 5da648f06e..18a8d67678 100644 --- a/translated/tech/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md +++ b/published/20141229 How to Install Bugzilla 4.4 on Ubuntu or CentOS 6.x.md @@ -2,13 +2,13 @@ ================================================================================ 这里，我们将展示如何在一台Ubuntu 14.04或CentOS 6.5/7上安装Bugzilla。Bugzilla是一款基于web，用来记录跟踪缺陷数据库的bug跟踪软件，它同时是一款免费及开源软件(FOSS)，它的bug跟踪系统允许个人和开发团体有效地记录下他们产品的一些突出问题。尽管是"免费"的，Bugzilla依然有很多其它同类产品所没有的“珍贵”特性。因此，Bugzilla很快就变成了全球范围内数以千计的组织最喜欢的bug管理工具。 -Bugzilla对于不同状况的适应能力非常强。如今它们应用在各个不同的IT领域，系统管理员部署管理、芯片设计和部署问题跟踪(制作前后),还有为那些诸如Redhat，NASA，Linux-Mandrake和VA Systems这些名家提供软硬件bug跟踪。 +Bugzilla对于不同使用场景的适应能力非常强。如今它们应用在各个不同的IT领域，如系统管理中的部署管理、芯片设计及部署的问题跟踪(制造前期和后期)，还有为那些诸如Redhat，NASA，Linux-Mandrake和VA Systems这些著名公司提供软硬件bug跟踪。 ### 1. 安装依赖程序 ### 安装Bugzilla相当**简单**。这篇文章特别针对Ubuntu 14.04和CentOS 6.5两个版本(不过也适用于更老的版本)。 -为了获取并能在Ubuntu或CentOS系统中运行Bugzilla，我们要安装Apache网络服务器(允许SSL)，MySQL数据库服务器和一些需要来安装并配置Bugzilla的工具。 +为了获取并能在Ubuntu或CentOS系统中运行Bugzilla，我们要安装Apache网络服务器(启用SSL)，MySQL数据库服务器和一些需要来安装并配置Bugzilla的工具。 要在你的服务器上安装使用Bugzilla，你需要安装好以下程序： @@ -29,14 +29,13 @@ Bugzilla对于不同状况的适应能力非常强。如今它们应用在各个 **Ubuntu版本:** - $ sudo apt-get install apache2 mysql-server libapache2-mod-perl2 - libapache2-mod-perl2-dev libapache2-mod-perl2-doc perl postfix make gcc g++ + $ sudo apt-get install apache2 mysql-server libapache2-mod-perl2 libapache2-mod-perl2-dev libapache2-mod-perl2-doc perl postfix make gcc g++ **CentOS版本:** $ sudo yum install httpd mod_ssl mysql-server mysql php-mysql gcc perl* mod_perl-devel -**注意：请在shell或者终端下运行所有的命令并且确保你用root用户（sudo）连接机器。** +**注意：请在shell或者终端下运行所有的命令并且确保你用root用户（sudo）操作机器。** ### 2. 启动Apache服务 ### @@ -115,7 +114,6 @@ CentOS 6.5和Ubuntu 14.04 Trusty两个版本： # cd /var/www/html/ # mv -v bugzilla-4.5.2 bugzilla - **注意**：这里,**/var/www/html/bugzilla/**就是**Bugzilla主目录**. @@ -194,7 +192,7 @@ via: http://linoxide.com/tools/install-bugzilla-ubuntu-centos/ 作者：[Arun Pyasi][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 38178327ae8a2aa6705257358070d45999f4eb19 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 15 Jan 2015 23:11:41 +0800 Subject: [PATCH 054/215] =?UTF-8?q?20150115-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...your own cloud for you and your friends.md | 1113 +++++++++++++++++ 1 file changed, 1113 insertions(+) create mode 100644 sources/tech/20150115 Get back your privacy and control over your data in just a few hours--build your own cloud for you and your friends.md diff --git a/sources/tech/20150115 Get back your privacy and control over your data in just a few hours--build your own cloud for you and your friends.md b/sources/tech/20150115 Get back your privacy and control over your data in just a few hours--build your own cloud for you and your friends.md new file mode 100644 index 0000000000..348a159fc8 --- /dev/null +++ b/sources/tech/20150115 Get back your privacy and control over your data in just a few hours--build your own cloud for you and your friends.md @@ -0,0 +1,1113 @@ +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. + +### Some of the most personal pieces of your identity are stored on servers around the world beyond your control ### + +Let's say you've been a Gmail user between 2006 and 2013 like me, meaning you received 30'000+ emails and wrote about 5000 emails over that 7 year period. Some of the emails you sent or received are very personal, maybe so personal that you probably wouldn't like even some family members or close friends to go through them systematically. Maybe you also drafted a few emails that you never sent because you changed your mind at the last minute. But even if you never sent them, these emails are still stored somewhere on a server. As a result, it's fair to say that Google servers know more about your personal life than your closest friends or your family. + +Statistically, it's a safe bet to consider that you've got a smartphone. You can barely use the phone without using the contacts app which stores your contacts in Google Contact on Google servers by default. So not only does Google know about your emails, but also about your offline contacts: who you like to call, who calls you, whom you text, and what you text them about. You don't have to take my word for it, you can verify for yourself by taking a look at the permissions you gave apps such as the Google Play Service to read the list of people that called you and the SMS you got. Do you also use the calendar app that comes with your phone? Unless you explicitly opted out while setting up your calendar, this means that Google knows precisely what you're up to, at every time of the day, day after day, year after year. The same applies if you chose an iPhone over an Android phone, except Apple gets to know about your correspondance, contacts and schedule instead of Google. + +Do you also take great care to keep the contacts in your directory up-to-date, updating your friend's, colleagues's and and family's email addresses and phone numbers when they move to a new job or change carrier? That gives Google an extraordinarily accurate, up-to-date picture of your social network. And you love the GPS of your smartphone which you use a lot together with Google Maps. This means Google not only knows what you do from your calendar but also where you are, where you live, where you work. And by correlating GPS location data across users, Google can also tell with whom you may socializing with right now. + +### Your daily habit of handing out your most personal information will impact your life in a way that no one can even forsee ### + +To summarize, if you are an average internet user, Google has up-to-date, in-depth information about your interests, worries, passions, questions, over almost 10 years. It has a collection of some of your most personal messages (emails, SMS), an hour-by-hour detail of your daily activities and location, and a high-quality picture of your social network. Such an intimate knowledge of you likely goes beyond what your closest friends, family, or your sweetheart know of you. + +It wouldn't come to mind to give this mass of deeply personal information to complete strangers, for instance by putting it all on a USB key and leaving it on a table in a random cafe with a note saying 'Personal data of Olivier Martin, use as you please'. Who knows who might find it and what they would do with it? Yet, we have no problem handing in core pieces of your identity to strangers at IT companies with a strong interest in our data (that's how they make their bread) and [world-class experts in data analysis][2], perhaps just because it happens by default without us thinking about it when we hit that green 'Accept' button. + +With so much high-quality information, over the years, Google may well get to know you better than you can ever hope to know yourself: heck, crawling through my digital past right now, I can't remember having written half of the emails I sent five years ago. I am surprised and pleased to rediscover my interest in marxism back in 2005 and my joining [ATTAC][3] (an organization which strives to limit speculation and improve social justice by taxing financial transactions) the next year. And god knows why I was so much into dancing shoes back in 2007. These is pretty harmless information (you wouldn't have expected me to reveal something embarassing here, would you? ;-). But by connecting the dots between high-quality data over different aspects of your life (what, when, with whom, where, ...) over such time spans, one may extrapolate predictive statements about you. For instance, from the shopping habits of a 17-year-old girl, supermarkets can tell that she is pregnant before her dad even hears about it ([true story][4]). Who knows what will become possible with high-quality data the like Google has, which goes well beyond shopping habits? By connecting the dots, maybe one can predict how your tastes or political views will change in the coming years. Today, [companies you have never heard of claim to have 500 data points about you][5], including religion, sexual orientation and political views. Speaking of politics, what if you decide to go into politics in 10 years from now? Your life may change, your views too, and you may even forget, but Google won't. Will you have to worry that your opponent is in touch with someone who has access to your data at Google and can dig up something embarassing on you from those bottomless wells of personal data you gave away over the years? How long until Google or Facebook get hacked [just like Sony was recently hacked][6] and all your personal data end up in the public sphere forever? + +One of the reason most of us have entrusted our personal data to these companies is that they provide their services for free. But how free is it really? The value of the average Google account varies depending on the method used to estimate it: [1000 USD/year][7] accounts for the amount of time you invest in writing emails, while the value of your account for the advertisement industry is somewhere between [220 USD/year][8] and [500 USD/year][9]. So the service is not exactly free: you pay for it through advertisement and the yet unknown uses that our data may find in the future. + +I've been writing about Google mostly because that's the company I've entrusted most of my digital identify to so far and hence the one I know best. But I may well have written Apple or Facebook. These companies truly changed the world with their fantastic advances in design, engineering and services we love(d) to use, every day. But it doesn't mean we should stack up all our most personal data in their servers and entrust them with our digital lives: the potential for harm is just too large. + +### Claim back your privacy and that of people you care for in just 5h ### + +It does not have to be this way. You can live in the 21st century, have a smartphone, use email and GPS on daily basis, and still retain your privacy. All you need to do is get back control over your personal data: emails, calendar, contacts, files, etc.. The [Prism-Break.org][10] website lists software that help controlling the fate of your personal data. Beyond these options, the safest and most powerful way to get back control over your personal data is to host your cloud yourself, by building your own server. But you may just not have the time and energy to research how exactly to do that and make it work smoothly. + +That's where the present article fits in. In just 5 hours, we will set up a server to host your emails, contacts, calendars and files for you, your friends and your family. The server is designed to act as a hub or cloud for your personal data, so that you always retain full control over it. The data will automatically be synchronized between your PC/laptop, your phone and your tablet. Essentially, **we will set up a system that replaces Gmail, Google Drive / Dropbox, Google Contacts, Google Calendar and Picasa**. + +Just doing this for yourself will already be a big step. But then, a significant fraction of your personal information will still leak out and end up on some servers in the silicon valley, just because so many of the people you interact with every day use Gmail and have smartphones. So it's a good idea to have some of the people you are closest to join the adventure. + +We will build a system that + +- **supports an arbitrary number of domains and users**. This makes it easy to share your server with family and friends, so that they get control over their personal data too and can share the cost of the server with you. The people sharing your server can use their own domain name or share yours. +- **lets you send and receive your emails from any network** upon successfully logging in onto the server. This way, you can send your emails from any of your email addresses, from any device (PC, phone, tablet), and any network (at home, at work, from a public network, ...) +- **encrypts network traffic** when sending and receiving emails so people you don't trust won't fish out your password and won't be able to read your private emails. +- **offers state-of-the-art antispam**, combining black lists of known spammers, automatic greylisting, and adaptative spam filtering. Re-training the adaptative spam filter if an email is misclassified is simply done by moving spam in or out of the Junk/Spam folder. Also, the server will contribute to community-based spam fighting efforts. +- **requires just a few minutes of maintenance once in a while**, basically to install security updates and briefly check the server logs. Adding a new email address boils down to adding one record to a database. Apart from that, you can just forget about it and live your life. I set up the system described in this article 14 months ago and the thing has just been running smoothly since then. So I completely forgot about it, until I recently smiled at the thought that casually pressing the 'Check email' button of my phone caused electrons to travel all the way to Iceland (where my server sits) and back. + +To go through this article, you'll need a minimum of technical capabilities. If you know what is the difference between SMTP and IMAP, what is a DNS, and have a basic understanding of TCP/IP, you know enough to follow through. You will also need a basic working knowledge of Unix (working with files from the command line, basic system administration). And you'll need a total of 5 hours of time to set it up. + +Here's an overview what we will do: + +- [Get a Virtual Private Server, a domain name, and set them up][11] +- [Set up postfix and dovecot to send and receive email][12] +- [Prevent SPAM from reaching your INBOX][13] +- [Make sure the emails you send get through spam filters][14] +- [Host calendars, contacts, files with Owncloud and set up webmail][15] +- [Sync your devices to the cloud][16] + +### This article was inspired by and builds upon previous work ### + +This article draws heavily from two other articles, namely [Xavier Claude][17]'s and [Drew Crawford][18]'s introduction to email self-hosting. + +The article includes all the features of Xavier's and Draw's articles, except from three features that Drew had and which I didn't need, namely push support for email (I like to check email only when I decide to, otherwise I get distracted all the time), fulltext search in email (which I don't have a use for), and storing emails in an encrypted form (my emails and data are not critical to the point that I have to encrypt them locally on the server). If you need any of these features, feel free to just add them by following to the respective section of Drew's article, which is compatible with the present one. + +Compared to Xavier's and Drew's work, the present article improves on several aspects: + +- it fixes bugs and typos based on my experience with Drew's article and the numerous comments on his original article. I also went through the present article, setting up the server from scratch several times to replicate it and make sure it would work right out of the box. +- low maintenance: compared to Xavier's work, the present article adds support for multiple email domains on the server. It does so by requiring the minimum amount of server maintenance possible: basically, to add a domain or a user, just add one row to a mysql table and that's it (no need to add sieve scripts, ...). +- I added webmail. +- I added a section on setting up a cloud, to host not just your emails but also your files, your addressbook / contacts (emails, phone numbers, birthdays, ...), calendars and pictures for use across your devices. + +### Get a Virtual Private Server, a domain name, and set them up ### + +Let's start by setting the basic infrastructure: our virtual private server and our domain name. + +I've had an excellent experience with the Virtual Private Servers (VPS) of [1984.is][19] and [Linode][20]. In this article, we will use **Debian Wheezy**, for which both 1984 and Linode provide ready-made images to deploy on your VPS. I like 1984 because the servers are hosted in Iceland which run exclusively on renewable energy (geothermical and hydropower) and hence does not contribute to the climate change, unlike [the coal power plants on which most US-based datacenters currently run on][21]. Also, they put emphasis on [civil liberties, transparency, freedom][22] and [Free Software][23]. + +It could be a good idea to start a file to store the various passwords we will need to set on the server (user accounts, mail accounts, cloud accounts, database accounts). It's definitely a good idea to encrypt this file (maybe with [GnuPG][24]), so that it won't be too easy to attack your server even if the computer you use to set up your server gets stolen or compromised. + +For registering a domain name, I've been using the services of [gandi][25] for over 10 years now, also with satisfaction. For this article, we will set up a zone with the name **jhausse.net**. We then add a host named **cloud.jhausse.net** to it, set the MX record to that host. While you're at it, set short Time To Lives (TTL) to your records like 300 seconds so that you'll be able to make changes to your zone and test the result rapidly while you're setting up the server. + +Finally, set the PTR record (reverse DNS) so that the IP address of the host maps back to its name. If you don't understand the previous sentence, read [this article][26] to get the background. If you use Linode, you can set the PTR record in the control panel in the Remote Access section. With 1984, contact the tech support who will help you with it. + +On the server, we will start by adding a non-privledged user, so that we don't end up working as root all the time. Also, to log in as root will require an extra layer of security. + + adduser roudy + +Then, in **/etc/ssh/sshd_config**, we set + + PermitRootLogin no + +and reload the ssh server + + service ssh reload + +Then, we'll need to change the hostname of the server. Edit **/etc/hostname** so that it has just a single line with your hostname, in our case + + cloud + +Then, edit the ssh server's public key files **/etc/ssh/ssh_host_rsa_key.pub, /etc/ssh/ssh_host_dsa_key.pub, /etc/ssh/ssh_host_ecdsa_key.pub** so that the end of the file reflects your hostname, or instance **root@cloud**. Then restart the system to make sure the hostname is fixed wherever is should be + + reboot + +We will update the system and remove services we don't need to reduce the risk of remote attacks. + + apt-get update + apt-get dist-upgrade + service exim4 stop + apt-get remove exim4 rpcbind + apt-get autoremove + apt-get install vim + +I like to use vim for editing config files remotely. For this, it helps to automatically turn on syntax highlighting. We do so by adding + + syn on + +to **~/.vimrc**. + +### Set up postfix and dovecot to send and receive email ### + + apt-get install postfix postfix-mysql dovecot-core dovecot-imapd dovecot-mysql mysql-server dovecot-lmtpd postgrey + +In the [Postfix][27] configuration menu, we select **Internet Site**, and set the system mail name to **jhausse.net**. + +We will now set up a database to store the list of domains hosted on our server, the list of users for each of these domains (together with their password), and a list of mail aliases (to forward email from a given address to another one). + + mysqladmin -p create mailserver + mysql -p mailserver + mysql> GRANT SELECT ON mailserver.* TO 'mailuser'@'localhost' IDENTIFIED BY 'mailuserpass'; + mysql> FLUSH PRIVILEGES; + mysql> CREATE TABLE `virtual_domains` ( + `id` int(11) NOT NULL auto_increment, + `name` varchar(50) NOT NULL, + PRIMARY KEY (`id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + mysql> CREATE TABLE `virtual_users` ( + `id` int(11) NOT NULL auto_increment, + `domain_id` int(11) NOT NULL, + `password` varchar(106) NOT NULL, + `email` varchar(100) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `email` (`email`), + FOREIGN KEY (domain_id) REFERENCES virtual_domains(id) ON DELETE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + mysql> CREATE TABLE `virtual_aliases` ( + `id` int(11) NOT NULL auto_increment, + `domain_id` int(11) NOT NULL, + `source` varchar(100) NOT NULL, + `destination` varchar(100) NOT NULL, + PRIMARY KEY (`id`), + FOREIGN KEY (domain_id) REFERENCES virtual_domains(id) ON DELETE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +We will host the **jhausse.net** domain. If there are other domains you'd like to host, you can also add them. We also set up a postmaster address for each domain, which forwards to **roudy@jhausse.net**. + + mysql> INSERT INTO virtual_domains (`name`) VALUES ('jhausse.net'); + mysql> INSERT INTO virtual_domains (`name`) VALUES ('otherdomain.net'); + mysql> INSERT INTO virtual_aliases (`domain_id`, `source`, `destination`) VALUES ('1', 'postmaster', 'roudy@jhausse.net'); + mysql> INSERT INTO virtual_aliases (`domain_id`, `source`, `destination`) VALUES ('2', 'postmaster', 'roudy@jhausse.net'); + +We now add a locally hosted email account **roudy@jhausse.net**. First, we generate a password hash for it: + + doveadm pw -s SHA512-CRYPT + +and then add the hash to the database + + mysql> INSERT INTO `mailserver`.`virtual_users` (`domain_id`, `password`, `email`) VALUES ('1', '$6$YOURPASSWORDHASH', 'roudy@jhausse.net'); + +Now that our list of domains, aliases and users are in place, we will set up postfix (SMTP server, for outgoing mail). Replace the contents of **/etc/postfix/main.cf** with the following: + + myhostname = cloud.jhausse.net + myorigin = /etc/mailname + mydestination = localhost.localdomain, localhost + mynetworks_style = host + + # We disable relaying in the general case + smtpd_recipient_restrictions = permit_mynetworks, reject_unauth_destination + # Requirements on servers that contact us: we verify the client is not a + # known spammer (reject_rbl_client) and use a graylist mechanism + # (postgrey) to help reducing spam (check_policy_service) + smtpd_client_restrictions = permit_mynetworks, reject_rbl_client zen.spamhaus.org, check_policy_service inet:127.0.0.1:10023 + disable_vrfy_command = yes + inet_interfaces = all + smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) + biff = no + append_dot_mydomain = no + readme_directory = no + + # TLS parameters + smtpd_tls_cert_file=/etc/ssl/certs/cloud.crt + smtpd_tls_key_file=/etc/ssl/private/cloud.key + smtpd_use_tls=yes + smtpd_tls_auth_only = yes + smtp_tls_security_level=may + smtp_tls_loglevel = 1 + smtpd_tls_loglevel = 1 + smtpd_tls_received_header = yes + smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache + smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache + + # Delivery + alias_maps = hash:/etc/aliases + alias_database = hash:/etc/aliases + message_size_limit = 50000000 + recipient_delimiter = + + + # The next lines are useful to set up a backup MX for myfriendsdomain.org + # relay_domains = myfriendsdomain.org + # relay_recipient_maps = + + # Virtual domains + virtual_transport = lmtp:unix:private/dovecot-lmtp + virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual-mailbox-domains.cf + virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual-mailbox-maps.cf + virtual_alias_maps = mysql:/etc/postfix/mysql-virtual-alias-maps.cf + local_recipient_maps = $virtual_mailbox_maps + +Now we need to teach postfix to figure out which domains we would like him to accept emails for using the database we just set up. Create a new file **/etc/postfix/mysql-virtual-mailbox-domains.cf** and add the following: + + user = mailuser + password = mailuserpass + hosts = 127.0.0.1 + dbname = mailserver + query = SELECT 1 FROM virtual_domains WHERE name='%s' + +We teach postfix to find out whether a given email account exists by creating **/etc/postfix/mysql-virtual-mailbox-maps.cf** with the following content + + user = mailuser + password = mailuserpass + hosts = 127.0.0.1 + dbname = mailserver + query = SELECT 1 FROM virtual_users WHERE email='%s' + +Finally, postfix will use **/etc/postfix/mysql-virtual-alias-maps.cf** to look up mail aliases + + user = mailuser + password = mailuserpass + hosts = 127.0.0.1 + dbname = mailserver + query = SELECT virtual_aliases.destination as destination FROM virtual_aliases, virtual_domains WHERE virtual_aliases.source='%u' AND virtual_aliases.domain_id = virtual_domains.id AND virtual_domains.name='%d' + +With all this in place, it is now time to test if postfix can query our database properly. We can do this using **postmap**: + + postmap -q jhausse.net mysql:/etc/postfix/mysql-virtual-mailbox-domains.cf + postmap -q roudy@jhausse.net mysql:/etc/postfix/mysql-virtual-mailbox-maps.cf + postmap -q postmaster@jhausse.net mysql:/etc/postfix/mysql-virtual-alias-maps.cf + postmap -q bob@jhausse.net mysql:/etc/postfix/mysql-virtual-alias-maps.cf + +If you set up everything properly, the first two queries should return 1, the third query should return **roudy@jhausse.net** and the last one should return nothing at all. + +Now, let's set up dovecot (the IMAP server, to fetch incoming mail on the server from our devices). Edit **/etc/dovecot/dovecot.conf** to set the following parameters: + + # Enable installed protocol + # !include_try /usr/share/dovecot/protocols.d/*.protocol + protocols = imap lmtp + +which will only enable imap (to let us fetch emails) and lmtp (which postfix will use to pass incoming emails to dovecot). Edit **/etc/dovecot/conf.d/10-mail.conf** to set the following parameters: + + mail_location = maildir:/var/mail/%d/%n + [...] + mail_privileged_group = mail + [...] + first_valid_uid = 0 + +which will store emails in /var/mail/domainname/username. Note that these settings are spread at different locations in the file, and are sometimes already there for us to set: we just need to comment them out. The other settings which are already in the file, you can leave as is. We will have to do the same to update settings in many more files in the remaining of this article. In **/etc/dovecot/conf.d/10-auth.conf**, set the parameters: + + disable_plaintext_auth = yes + auth_mechanisms = plain + #!include auth-system.conf.ext + !include auth-sql.conf.ext + +In **/etc/dovecot/conf.d/auth-sql.conf.ext**, set the following parameters: + + passdb { + driver = sql + args = /etc/dovecot/dovecot-sql.conf.ext + } + userdb { + driver = static + args = uid=mail gid=mail home=/var/mail/%d/%n + } + +where we just taught dovecot that users have their emails in /var/mail/domainname/username and to look up passwords from the database we just created. Now we still need to teach dovecot how exactly to use the database. To do so, put the following into **/etc/dovecot/dovecot-sql.conf.ext**: + + driver = mysql + connect = host=localhost dbname=mailserver user=mailuser password=mailuserpass + default_pass_scheme = SHA512-CRYPT + password_query = SELECT email as user, password FROM virtual_users WHERE email='%u'; + +We now fix permissions on config files + + chown -R mail:dovecot /etc/dovecot + chmod -R o-rwx /etc/dovecot + +Almost there! We just need to edit a couple files more. In **/etc/dovecot/conf.d/10-master.conf**, set the following parameters: + + service imap-login { + inet_listener imap { + #port = 143 + port = 0 + } + inet_listener imaps { + port = 993 + ssl = yes + } + } + + service pop3-login { + inet_listener pop3 { + #port = 110 + port = 0 + } + inet_listener pop3s { + #port = 995 + #ssl = yes + port = 0 + } + } + + service lmtp { + unix_listener /var/spool/postfix/private/dovecot-lmtp { + mode = 0666 + group = postfix + user = postfix + } + user = mail + } + + service auth { + unix_listener auth-userdb { + mode = 0600 + user = mail + #group = + } + + # Postfix smtp-auth + unix_listener /var/spool/postfix/private/auth { + mode = 0666 + user = postfix + group = postfix + } + + # Auth process is run as this user. + #user = $default_internal_user + user = dovecot + } + + service auth-worker { + user = mail + } + +Note that we set ports for all services but imaps to 0, which effectively disables them. Then, in **/etc/dovecot/conf.d/15-lda.conf**, specify an email address for the postmaster: + + postmaster_address = postmaster@jhausse.net + +Last but not least, we need to generate a pair of public and private key for the server, which we will use both in dovecot and postfix: + + openssl req -new -newkey rsa:4096 -x509 -days 365 -nodes -out "/etc/ssl/certs/cloud.crt" -keyout "/etc/ssl/private/cloud.key" + +Make sure that you specify your the Fully Qualified Domain Name (FQDN) of the server, in our case: + + Common Name (e.g. server FQDN or YOUR name) []:cloud.jhausse.net + +If you don't, our clients may complain that the server name in the SSL certificate does not match the name of the server they are connecting to. We tell dovecot to use these keys by setting the following parameters in **/etc/dovecot/conf.d/10-ssl.conf**: + + ssl = required + ssl_cert = : Relay access denied + +That's good: had the server accepted the mail, it would have meant that we set up postfix as an open relay for all the spammers of the world and beyhond to use. Instead of the 'Relay access denied' message, you may instead get the message + + 554 5.7.1 Service unavailable; Client host [87.68.61.119] blocked using zen.spamhaus.org; http://www.spamhaus.org/query/bl?ip=87.68.61.119 + +This means that you are trying to contact the server from an IP address that is considered as a spammer's address. I got this message while trying to connect to the server through my regular Internet Service Provider (ISP). To fix this issue, you can try to connect from another host, maybe another server you have access to through SSH. Alternatively, you can reconfigure Postfix's **main.cf** not to use Spamhaus's RBL, reload postfix, and verify that the above test works. In both cases, it's important that you find a solution that works for you because we'll test other things in a minute. If you chose to reconfigure Postfix not to use RBLs, don't forget to put the RBLs back in and to reload postfix after finishing the article to avoid getting more spam than necessary. + +Now let's try to send a valid email by SMTP on port 25, which regular mail servers use to talk to each other: + + openssl s_client -connect cloud.jhausse.net:25 -starttls smtp + EHLO cloud.jhausse.net + MAIL FROM:youremail@domain.com + rcpt to:roudy@jhausse.net + +to which the server should respond + + Client host rejected: Greylisted, see http://postgrey.schweikert.ch/help/jhausse.net.html + +which shows that [postgrey][28] is working as it should. What postgrey does it to reject emails with a temporary error if the sender has never been seen before. The technical rules of email require email servers to try to deliver the email again. After five minutes, postgrey will accept the email. Legit email servers around the world will try repeatidly to redeliver the email to us, but most spammers won't. So, wait for 5 minutes, try to send the email again using the command above, and verify that postfix now accepts the email. + +Afterwards, we'll check that we can fetch the two emails that we just sent ourselves by talking IMAP to dovecot: + + openssl s_client -crlf -connect cloud.jhausse.net:993 + 1 login roudy@jhausse.net "mypassword" + 2 LIST "" "*" + 3 SELECT INBOX + 4 UID fetch 1:1 (UID RFC822.SIZE FLAGS BODY.PEEK[]) + 5 LOGOUT + +where you should replace mypassword with the password you set for this email account. If that works, we basically have a functional email server which can receive our incoming emails, and from which we get retreive these emails from our devices (PC/laptop, tablets, phones, ...). But we can't give it our emails to send unless we send them from the server itself. We'll now allow postfix to forward our emails, but only upon successful authentification, that is after it could make sure that the email comes from someone who has a valid account on the server. To do so, we'll open a special, SSL-only, SASL-authentified email submission service. Set the following parameters in **/etc/postfix/master.cf**: + + submission inet n - - - - smtpd + -o syslog_name=postfix/submission + -o smtpd_tls_security_level=encrypt + -o smtpd_sasl_auth_enable=yes + -o smtpd_client_restrictions=permit_sasl_authenticated,reject + -o smtpd_sasl_type=dovecot + -o smtpd_sasl_path=private/auth + -o smtpd_sasl_security_options=noanonymous + -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject_non_fqdn_recipient,reject_unauth_destination + +and reload postfix + + service postfix reload + +Now, let's try to use this service from a different machine than than the server, to verify postfix will now relay our emails and nobody else's: + + openssl s_client -connect cloud.jhausse.net:587 -starttls smtp + EHLO cloud.jhausse.net + +Notice the '250-AUTH PLAIN' capabilities advertized by server, which doesn't appear when we connect to port 25. + + MAIL FROM:asdf@jkl.net + rcpt to:bob@gmail.com + 554 5.7.1 : Relay access denied + QUIT + +That's good, postfix won't relay our emails if he doesn't know us. So let's authentify ourselves first. To do so, we first need to generate an authentification string: + + echo -ne '\000roudy@jhausse.net\000mypassword'|base64 + +and let's try to send emails through the server again: + + openssl s_client -connect cloud.jhausse.net:587 -starttls smtp + EHLO cloud.jhausse.net + AUTH PLAIN DGplYW5AMTk4NGNsb3VQLm5ldAA4bmFmNGNvNG5jOA== + MAIL FROM:asdf@jkl.net + rcpt to:bob@gmail.com + +which postfix should now accept. To complete the test, let's verify that our virtual aliases work by sending an email to postmaster@jhausse.net and making sure it goes to roudy@jhausse.net: + + telnet cloud.jhausse.net 25 + EHLO cloud.jhausse.net + MAIL FROM:youremail@domain.com + rcpt to:postmaster@jhausse.net + data + Subject: Virtual alias test + + Dear postmaster, + Long time no hear! I hope your MX is working smoothly and securely. + Yours sincerely, Roudy + . + QUIT + +Let's check the mail made it all the way to the right inbox: + + openssl s_client -crlf -connect cloud.jhausse.net:993 + 1 login roudy@jhausse.net "mypassword" + 2 LIST "" "*" + 3 SELECT INBOX + * 2 EXISTS + * 2 RECENT + 4 LOGOUT + +At this point, we have a functional email server, both for incoming and outgoing mails. We can set up our devices to use it. + +PS: did you remember to [try sending an email to an account hosted by the server through port 25][29] again, to verify that you are not longer blocked by postgrey? + +### Prevent SPAM from reaching your INBOX ### + +For the sake of SPAM filtering, we already have Realtime BlackLists (RBLs) and greylisting (postgrey) in place. We'll now take our spam fighting capabilities up a notch by adding adaptative spam filtering. This means we'll add artificial intelligence to our email server, so that it can learn from experience what is spam and what is not. We will use [dspam][30] for that. + + apt-get install dspam dovecot-antispam postfix-pcre dovecot-sieve + +dovecot-antispam is a package that allows dovecot to retrain the spam filter if we find an email that is misclassified by dspam. Basically, all we need to do is to move emails in or out of the Junk/Spam folder. dovecot-antispam will then take care of calling dspam to retrain the filter. As for postfix-pcre and dovecot-sieve, we will use them respectively to pass incoming emails through the spam filter and to automatically move spam to the user's Junk/Spam folder. + +In **/etc/dspam/dspam.conf**, set the following parameters to these values: + + TrustedDeliveryAgent "/usr/sbin/sendmail" + UntrustedDeliveryAgent "/usr/lib/dovecot/deliver -d %u" + Tokenizer osb + IgnoreHeader X-Spam-Status + IgnoreHeader X-Spam-Scanned + IgnoreHeader X-Virus-Scanner-Result + IgnoreHeader X-Virus-Scanned + IgnoreHeader X-DKIM + IgnoreHeader DKIM-Signature + IgnoreHeader DomainKey-Signature + IgnoreHeader X-Google-Dkim-Signature + ParseToHeaders on + ChangeModeOnParse off + ChangeUserOnParse full + ServerPID /var/run/dspam/dspam.pid + ServerDomainSocketPath "/var/run/dspam/dspam.sock" + ClientHost /var/run/dspam/dspam.sock + +Then, in **/etc/dspam/default.prefs**, change the following parameters to: + + spamAction=deliver # { quarantine | tag | deliver } -> default:quarantine + signatureLocation=headers # { message | headers } -> default:message + showFactors=on + +Now we need to connect dspam to postfix and dovecot by adding these two lines at the end of **/etc/postfix/master.cf**: + + dspam unix - n n - 10 pipe + flags=Ru user=dspam argv=/usr/bin/dspam --deliver=innocent,spam --user $recipient -i -f $sender -- $recipient + dovecot unix - n n - - pipe + flags=DRhu user=mail:mail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient} + +Now we will tell postfix to filter every new email that gets submitted to the server on port 25 (normal SMTP traffic) through dspam, except if the email is submitted from the server itself (permit_mynetworks). Note that the emails we submit to postfix with SASL authentication won't be filtered through dspam either, as we set up a separate submission service for those in the previous section. Edit **/etc/postfix/main.cf** to change the **smtpd_client_restrictions** to the following: + + smtpd_client_restrictions = permit_mynetworks, reject_rbl_client zen.spamhaus.org, check_policy_service inet:127.0.0.1:10023, check_client_access pcre:/etc/postfix/dspam_filter_access + +At the end of the file, also also add: + + # For DSPAM, only scan one mail at a time + dspam_destination_recipient_limit = 1 + +We now need to specify the filter we defined. Basically, we will tell postfix to send all emails (/./) to dspam through a unix socket. Create a new file **/etc/postfix/dspam_filter_access** and put the following line into it: + + /./ FILTER dspam:unix:/run/dspam/dspam.sock + +That's it for the postfix part. Now let's set up dovecot for spam filtering. In **/etc/dovecot/conf.d/20-imap.conf**, edit the **imap mail_plugins** plugins parameter such that: + + mail_plugins = $mail_plugins antispam + +and add a section for lmtp: + + protocol lmtp { + # Space separated list of plugins to load (default is global mail_plugins). + mail_plugins = $mail_plugins sieve + } + +We now configure the dovecot-antispam plugin. Edit **/etc/dovecot/conf.d/90-plugin.conf** to add the following content to the plugin section: + + plugin { + ... + # Antispam (DSPAM) + antispam_backend = dspam + antispam_allow_append_to_spam = YES + antispam_spam = Junk;Spam + antispam_trash = Trash;trash + antispam_signature = X-DSPAM-Signature + antispam_signature_missing = error + antispam_dspam_binary = /usr/bin/dspam + antispam_dspam_args = --user;%u;--deliver=;--source=error + antispam_dspam_spam = --class=spam + antispam_dspam_notspam = --class=innocent + antispam_dspam_result_header = X-DSPAM-Result + } + +and in **/etc/dovecot/conf.d/90-sieve.conf**, specify a default sieve script which will apply to all users of the server: + + sieve_default = /etc/dovecot/default.sieve + +What is sieve and why do we need a default script for all users? Sieve lets us automatize tasks on the IMAP server. In our case, we won't all emails identified as spam to be put in the Junk folder instead of in the Inbox. We would like this to be the default behavior for all users on the server; that's why we just set this script as default script. Let's create this script now, by creating a new file **/etc/dovecot/default.sieve** with the following content: + + require ["regex", "fileinto", "imap4flags"]; + # Catch mail tagged as Spam, except Spam retrained and delivered to the mailbox + if allof (header :regex "X-DSPAM-Result" "^(Spam|Virus|Bl[ao]cklisted)$", + not header :contains "X-DSPAM-Reclassified" "Innocent") { + # Mark as read + # setflag "\\Seen"; + # Move into the Junk folder + fileinto "Junk"; + # Stop processing here + stop; + } + +Now we need to compile this script so that dovecot can run it. We also need to give it appropriate permissions. + + cd /etc/dovecot + sievec . + chown mail.dovecot default.siev* + chmod 0640 default.sieve + chmod 0750 default.svbin + +Finally, we need to fix permissions on two postfix config files that dspam needs to read from: + + chmod 0644 /etc/postfix/dynamicmaps.cf /etc/postfix/main.cf + +That's it! Let's restart dovecot and postfix + + service dovecot restart + service postfix restart + +and test the antispam, by contacting the server from a remote host (e.g. the computer we are using to set the server): + + openssl s_client -connect cloud.jhausse.net:25 -starttls smtp + EHLO cloud.jhausse.net + MAIL FROM:youremail@domain.com + rcpt to:roudy@jhausse.net + DATA + Subject: DSPAM test + + Hi Roudy, how'd you like to eat some ham tonight? Yours, J + . + QUIT + +Let's check if the mail arrived: + + openssl s_client -crlf -connect cloud.jhausse.net:993 + 1 login roudy@jhausse.net "mypassword" + 2 LIST "" "*" + 3 SELECT INBOX + 4 UID fetch 3:3 (UID RFC822.SIZE FLAGS BODY.PEEK[]) + +Which should return something the email with a collection of flag set by SPAM which look like this: + + X-DSPAM-Result: Innocent + X-DSPAM-Processed: Sun Oct 5 16:25:48 2014 + X-DSPAM-Confidence: 1.0000 + X-DSPAM-Probability: 0.0023 + X-DSPAM-Signature: 5431710c178911166011737 + X-DSPAM-Factors: 27, + Received*Postfix+with, 0.40000, + Received*with+#+id, 0.40000, + like+#+#+#+ham, 0.40000, + some+#+tonight, 0.40000, + Received*certificate+requested, 0.40000, + Received*client+certificate, 0.40000, + Received*for+roudy, 0.40000, + Received*Sun+#+#+#+16, 0.40000, + Received*Sun+#+Oct, 0.40000, + Received*roudy+#+#+#+Oct, 0.40000, + eat+some, 0.40000, + Received*5+#+#+16, 0.40000, + Received*cloud.jhausse.net+#+#+#+id, 0.40000, + Roudy+#+#+#+to, 0.40000, + Received*Oct+#+16, 0.40000, + to+#+#+ham, 0.40000, + Received*No+#+#+requested, 0.40000, + Received*jhausse.net+#+#+Oct, 0.40000, + Received*256+256, 0.40000, + like+#+#+some, 0.40000, + Received*ESMTPS+id, 0.40000, + how'd+#+#+to, 0.40000, + tonight+Yours, 0.40000, + Received*with+cipher, 0.40000 + 5 LOGOUT + +Good! You now have adaptive spam filtering set up for the users of your server. Of course, each user will need to train the filter in the first few weeks. To train a message as spam, just move it to a folder called "Spam" or "Junk" using any of your devices (PC, tablet, phone). Otherwise it'll be trained as ham. + +### Make sure the emails you send get through spam filters ### + +Our goal in this section will be to make our mail server appear as clean as possible to the world and to make it harder for spammers to send emails in our name. As a side-effect, this will help us get our emails through the spam filters of other mail servers. + +#### Sender Policy Framework #### + +Sender Policy Framework (SPF) is a record that your add to your zone which declares which mail servers on the whole internet can send emails for your domain name. Setting it up is very easy, use the SPF wizard at [microsoft.com][31] to generate your SPF record, and then add it to your zone as a TXT record. It will look like this: + + jhausse.net. 300 IN TXT v=spf1 mx mx:cloud.jhausse.net -all + +#### Reverse PTR #### + +We discussed this point [earlier][32] in this article, it's a good idea that you set up the reverse DNS for your server correctly, so that doing a reverse lookup on the IP address of your server returns the actual name of your server. + +#### OpenDKIM #### + +When we activate [OpenDKIM][33], postfix will sign every outgoing email using a cryptographic key. We will then deposit that key in our zone, on the DNS. That way, every mail server in the world will be able to verify if the email actually came from us, or if it was forged by a spammer. Let's install opendkim: + + apt-get install opendkim opendkim-tools + +And set it up by editing **/etc/opendkim.conf** so that it looks like this: + + ## + ## opendkim.conf -- configuration file for OpenDKIM filter + ## + Canonicalization relaxed/relaxed + ExternalIgnoreList refile:/etc/opendkim/TrustedHosts + InternalHosts refile:/etc/opendkim/TrustedHosts + KeyTable refile:/etc/opendkim/KeyTable + LogWhy Yes + MinimumKeyBits 1024 + Mode sv + PidFile /var/run/opendkim/opendkim.pid + SigningTable refile:/etc/opendkim/SigningTable + Socket inet:8891@localhost + Syslog Yes + SyslogSuccess Yes + TemporaryDirectory /var/tmp + UMask 022 + UserID opendkim:opendkim + +We'll need a couple of additional files which we will store in **/etc/opendkim**: + + mkdir -pv /etc/opendkim/ + cd /etc/opendkim/ + +Let's create a new file **/etc/opendkim/TrustedHosts** with the following content + + 127.0.0.1 + +and a new file called **/etc/opendkim/KeyTable** with the following content + + cloudkey jhausse.net:mail:/etc/opendkim/mail.private + +This tells OpenDKIM that we want to use an encryption key named 'cloudkey' whose contents can be found in /etc/opendkim/mail.private. We will create another file named **/etc/opendkim/SigningTable** and add the following line: + + *@jhausse.net cloudkey + +which tells OpenDKIM that every emails of the jhausse.net domain should be signed using the key 'cloudkey'. If we have other domains which we want to sign, we can add them here too. + +The next step is to generate that key and fix permissions on OpenDKIM's config files. + + opendkim-genkey -r -s mail [-t] + chown -Rv opendkim:opendkim /etc/opendkim + chmod 0600 /etc/opendkim/* + chmod 0700 /etc/opendkim + +At first, it's a good idea to use the -t which will signal to other mail servers that you are just in testing mode, and that they shouldn't discard emails based on your OpenDKIM signature (yet). You can get your OpenDKIM key from the mail.txt file: + + cat mail.txt + +and then add it to your zone file as TXT record, which should look like this + + mail._domainkey.cloud1984.net. 300 IN TXT v=DKIM1; k=rsa; p=MIGfMA0GCSqG... + +Finally, we need to tell postfix to sign outgoing emails. At the end of /etc/postfix/main.cf, add: + + # Now for OpenDKIM: we'll sign all outgoing emails + smtpd_milters = inet:127.0.0.1:8891 + non_smtpd_milters = $smtpd_milters + milter_default_action = accept + +And reload the corresponding services + + service postfix reload + service opendkim restart + +Now let's test if our OpenDKIM public key can be found and matches the private key: + + opendkim-testkey -d jhausse.net -s mail -k mail.private -vvv + +which should return + + opendkim-testkey: key OK + +For this, you may need to wait a bit until the name server has reloaded the zone (on Linode, this happens every 15min). You can use **dig** to check if the zone was reloaded yet. + +If this works, let's test if other servers can validate our OpenDKIM signatures and SPF record. To do this, we can use [Brandon Checkett's email test][34]. To send an email to a test address given to us on [Brandon's webpage][34], we can run the following command on the server + + mail -s CloudCheck ihAdmTBmUH@www.brandonchecketts.com + +On Brandon's webpage, you should then see **result = pass** in the 'DKIM Signature' section, and **Result: pass** in the 'SPF Information' section. If our emails pass this test, just regenerate an OpenDKIM key without the -t switch, upload the new key to the zone file, and retest to still if it still passes the tests. If so, congrats! You just successfully set up OpenDKIM and SPF on your server! + +### Host calendars, contacts, files with Owncloud and set up a webmail with Roundcube ### + +Now that we have a top-notch email server, let's add to it the possibility to store your contacts, calendars, and files in the cloud. These are services that the [Owncloud][35] provides out of the box. While we're at it, we'll also set up a webmail, so you can check email even if you're travelling without electronics, or in case your phone and laptop run out of battery. + +Installing Owncloud is straighforward and is well described [here][36]. On Debian, it boils down to adding the owncloud repository to your apt sources, downloading owncloud's release key and adding it to your apt keyring, and then installing owncloud itself using apt-get: + + echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/community/Debian_7.0/ /' >> /etc/apt/sources.list.d/owncloud.list + wget http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_6.0/Release.key + apt-key add - < Release.key + apt-get update + apt-get install apache2 owncloud roundcube + +When prompted for it, choose **dbconfig** and then say you want **roundcube** to use **mysql**. Then, provide the mysql root password and set a good password for the roundcube mysql user. Then, edit the roundcube config file **/etc/roundcube/main.inc.php** so that logging in on roundcube will default to using your IMAP server: + + $rcmail_config['default_host'] = 'ssl://localhost'; + $rcmail_config['default_port'] = 993; + +Now we will set up the apache2 webserver with SSL so that we can talk to Owncloud and Roundcube using encryption for our passwords and data. Let's turn on Apache's ssl module: + + a2enmod ssl + +and edit **/etc/apache2/ports.conf** to set the following parameters: + +NameVirtualHost *:80 +Listen 80 +ServerName www.jhausse.net + + + # If you add NameVirtualHost *:443 here, you will also have to change + # the VirtualHost statement in /etc/apache2/sites-available/default-ssl + # to + # Server Name Indication for SSL named virtual hosts is currently not + # supported by MSIE on Windows XP. + NameVirtualHost *:443 + Listen 443 + + + + Listen 443 + + +We'll set up a default website for encrypted connections to the webserver as **https://www.jhausse.net** under **/var/www**. Edit **/etc/apache2/sites-available/default-ssl**: + + + ServerAdmin webmaster@localhost + + DocumentRoot /var/www + ServerName www.jhausse.net + [...] + + Deny from all + + [...] + SSLCertificateFile /etc/ssl/certs/cloud.crt + SSLCertificateKeyFile /etc/ssl/private/cloud.key + [...] + + +and let's also set up a website for unencrypted connections to **http://www.jhausse.net** under **/var/www**. Edit **/etc/apache2/sites-available/default**: + + + DocumentRoot /var/www + ServerName www.jhausse.net + [...] + + Deny from all + + + +That way, we can serve pages for www.jhausse.net by putting them in /var/www. The 'Deny from all' directive prevents access to Owncloud through www.jhausse.net: we will set it up to access it through **https://cloud.jhausse.net** instead. + +We will now set up the webmail (roundcube) so that it will be accessed through **https://webmail.jhausse.net**. Edit **/etc/apache2/sites-available/roundcube** to have the following content: + + + + ServerAdmin webmaster@localhost + + DocumentRoot /var/lib/roundcube + # The host name under which you'd like to access the webmail + ServerName webmail.jhausse.net + + Options FollowSymLinks + AllowOverride None + + + ErrorLog ${APACHE_LOG_DIR}/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined + + # SSL Engine Switch: + # Enable/Disable SSL for this virtual host. + SSLEngine on + + # do not allow unsecured connections + # SSLRequireSSL + SSLCipherSuite HIGH:MEDIUM + + # A self-signed (snakeoil) certificate can be created by installing + # the ssl-cert package. See + # /usr/share/doc/apache2.2-common/README.Debian.gz for more info. + # If both key and certificate are stored in the same file, only the + # SSLCertificateFile directive is needed. + SSLCertificateFile /etc/ssl/certs/cloud.crt + SSLCertificateKeyFile /etc/ssl/private/cloud.key + + # Those aliases do not work properly with several hosts on your apache server + # Uncomment them to use it or adapt them to your configuration + Alias /program/js/tiny_mce/ /usr/share/tinymce/www/ + + # Access to tinymce files + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + allow from all + + + + Options +FollowSymLinks + # This is needed to parse /var/lib/roundcube/.htaccess. See its + # content before setting AllowOverride to None. + AllowOverride All + order allow,deny + allow from all + + + # Protecting basic directories: + + Options -FollowSymLinks + AllowOverride None + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + Options -FollowSymLinks + AllowOverride None + Order allow,deny + Deny from all + + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + # SSL Protocol Adjustments: + # The safe and default but still SSL/TLS standard compliant shutdown + # approach is that mod_ssl sends the close notify alert but doesn't wait for + # the close notify alert from client. When you need a different shutdown + # approach you can use one of the following variables: + # o ssl-unclean-shutdown: + # This forces an unclean shutdown when the connection is closed, i.e. no + # SSL close notify alert is send or allowed to received. This violates + # the SSL/TLS standard but is needed for some brain-dead browsers. Use + # this when you receive I/O errors because of the standard approach where + # mod_ssl sends the close notify alert. + # o ssl-accurate-shutdown: + # This forces an accurate shutdown when the connection is closed, i.e. a + # SSL close notify alert is send and mod_ssl waits for the close notify + # alert of the client. This is 100% SSL/TLS standard compliant, but in + # practice often causes hanging connections with brain-dead browsers. Use + # this only for browsers where you know that their SSL implementation + # works correctly. + # Notice: Most problems of broken clients are also related to the HTTP + # keep-alive facility, so you usually additionally want to disable + # keep-alive for those clients, too. Use variable "nokeepalive" for this. + # Similarly, one has to force some clients to use HTTP/1.0 to workaround + # their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and + # "force-response-1.0" for this. + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + + +and declare the server in your DNS, for instance: + + webmail.jhausse.net. 300 IN CNAME cloud.jhausse.net. + +Now let's enable these three websites + + a2ensite default default-ssl roundcube + service apache2 restart + +and the webmail, accessible under **https://webmail.jhausse.net**, should basically work. Log in using the full email (e.g. roudy@jhausse.net) and the password you set in mailserver DB at the beginning of this article. The first time you connect, the browser will warn you that the certificate was not signed by a certification authority. That's fine, just add an exception. + +Last but not least, we will create a virtual host for owncloud by putting the following content in **/etc/apache2/sites-available/owncloud**: + + + + ServerAdmin webmaster@localhost + + DocumentRoot /var/www/owncloud + ServerName cloud.jhausse.net + + Options FollowSymLinks + AllowOverride None + + + Options Indexes FollowSymLinks MultiViews + AllowOverride All + Order allow,deny + allow from all + + + ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ + + AllowOverride None + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + Order allow,deny + Allow from all + + + ErrorLog ${APACHE_LOG_DIR}/error.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined + + # SSL Engine Switch: + # Enable/Disable SSL for this virtual host. + SSLEngine on + + # do not allow unsecured connections + # SSLRequireSSL + SSLCipherSuite HIGH:MEDIUM + SSLCertificateFile /etc/ssl/certs/cloud.crt + SSLCertificateKeyFile /etc/ssl/private/cloud.key + + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + # MSIE 7 and newer should be able to use keepalive + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + + +and activate owncloud by running + + a2ensite owncloud + service apache2 reload + +Then go ahead an configure owncloud by connecting to **https://cloud.jhausse.net/** in a web browswer. + +That's it! Now you've got your own Google Drive, Calendar, Contacts, Dropbox, and Gmail! Enjoy your freshly recovered privacy! :-) + +### Sync your devices to the cloud ### + +To sync your emails, you can just use your favorite email client: the standard email program on Android or iOS, [k9mail][37], or Thunderbird on your PC. Or you can also use the webmail we set up. + +How to sync your calendar and contacts with the cloud is described in the doc of owncloud. On Android, I'm using the CalDAV-Sync and CardDAV-Sync apps which act as bridges between the Android calendar and contacts apps of the phone and the owncloud server. + +For files, there is an Android app called Owncloud to access your files from your phone and automatically upload pictures and videos you take to your cloud. Accessing your files on the your Mac/PC is easy and [well described in the Owncloud documentation][38]. + +### Last tips ### + +During the first few weeks, it's a good idea to monitor **/var/log/syslog** and **/var/log/mail.log** on a daily basis and make sure everything everything is running smoothly. It's important to do so before you invite others (friends, family, ...) to be hosted on your server; you might loose their trust in self-hosting for good if they trust you with their data and the server suddently becomes unavailable. + +To add another email user, just add a row to the **virtual_users** table of the **mailserver** DB. + +To add a domain, just add a row to the **virtual_domains** table. Then update **/etc/opendkim/SigningTable** to get outgoing emails signed, upload the OpenDKIM key to the zone, and reload OpenDKIM. + +Owncloud has its own user DB which can be managed by logging in in Owncloud as administrator. + +Finally, it's important to think in advance of a solution in case your server becomes temporarily unavailable. For instance, where would your mails go until your server returns? One solution would be to find a friend who can act as your backup MX, while you act as his backup MX (see the **relay_domains** and **relay_recipient_maps** setting in Postfix's **main.cf** file). Similarly, what if your server is compromised and a malicious individual erases all your files there? For that, it's important to think of a regular backup system. Linode offers backups as an option. On 1984.is, I set up a basic but sufficient automatic backup system using on crontabs and scp. + +-------------------------------------------------------------------------------- + +via: https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/ + +作者：[Roudy Jhausse ][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:aboutlinux@free.fr +[1]:https://history.google.com/history/ +[2]:http://research.google.com/workatgoogle.html +[3]:http://www.attac.org/ +[4]:http://www.nytimes.com/2012/02/19/magazine/shopping-habits.html?pagewanted=all +[5]:http://vimeo.com/ondemand/termsandconditions +[6]:http://www.techtimes.com/articles/21670/20141208/sony-pictures-hack-nightmare-week-celebs-data-leak-and-threatening-emails-to-employees.htm +[7]:http://blog.backupify.com/2012/07/25/what-is-my-gmail-account-really-worth/ +[8]:http://adage.com/article/digital/worth-facebook-google/293042/ +[9]:http://vimeo.com/ondemand/termsandconditions +[10]:https://prism-break.org/en/ +[11]:https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/#VPS +[12]:https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/#mail +[13]:https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/#dspam +[14]:https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/#SPF +[15]:https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/#owncloud +[16]:https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/#sync +[17]:http://linuxfr.org/news/heberger-son-courriel +[18]:http://sealedabstract.com/code/nsa-proof-your-e-mail-in-2-hours/ +[19]:http://www.1984.is/ +[20]:http://www.linode.com/ +[21]:http://www.greenpeace.org/international/Global/international/publications/climate/2012/iCoal/HowCleanisYourCloud.pdf +[22]:http://www.1984.is/about/ +[23]:http://www.fsf.org/ +[24]:https://www.gnupg.org/ +[25]:http://www.gandi.net/ +[26]:http://www.codinghorror.com/blog/2010/04/so-youd-like-to-send-some-email-through-code.html +[27]:http://www.postfix.org/ +[28]:http://postgrey.schweikert.ch/ +[29]:https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/#testPort25 +[30]:http://dspam.sourceforge.net/ +[31]:http://www.microsoft.com/mscorp/safety/content/technologies/senderid/wizard/ +[32]:https://www.howtoforge.com/tutorial/build-your-own-cloud-on-debian-wheezy/#PTR +[33]:http://opendkim.org/opendkim-README +[34]:http://www.brandonchecketts.com/emailtest.php +[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 From 0a1a2a86d11cc620cc88574c7ef8b8b400882610 Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 15 Jan 2015 23:14:01 +0800 Subject: [PATCH 055/215] PUB:Quick systemd-nspawn guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @SPccman 翻译的不错 --- .../Quick systemd-nspawn guide.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) rename {translated/tech => published}/Quick systemd-nspawn guide.md (81%) diff --git a/translated/tech/Quick systemd-nspawn guide.md b/published/Quick systemd-nspawn guide.md similarity index 81% rename from translated/tech/Quick systemd-nspawn guide.md rename to published/Quick systemd-nspawn guide.md index 82d8dc4b3c..8ddf729d15 100644 --- a/translated/tech/Quick systemd-nspawn guide.md +++ b/published/Quick systemd-nspawn guide.md @@ -1,4 +1,4 @@ -systemd-nspawn 指南 +systemd-nspawn 快速指南 =========================== 我目前已从 chroot（译者注：chroot可以构建类似沙盒的环境，建议各位同学先了解chroot） 迁移到 systemd-nspawn，同时我写了一篇快速指南。简单的说，我强烈建议正在使用 systemd 的用户从 chroot 转为 systemd-nspawn，因为只要你的内核配置正确的话，它几乎没有什么缺点。 @@ -6,11 +6,11 @@ systemd-nspawn 指南 ###chroot 面临的挑战 -大多数交互环境下，仅运行chroot还不够。通常还要挂载 /proc， /sys，另外为了确保不会出现类似“丢失 ptys”之类的错误，我们还得 bind（译者注：bind 是 mount 的一个选项） 挂载 /dev。如果你使用 tmpfs，你可能想要以 tmpfs 类型挂载新的 tmp， var/tmp。接下来你可能还想将其他的挂载点 bind 到 chroot 中。这些都不是特别难，但是一般情况下要写一个脚本来管理它。 +大多数交互环境下，仅运行chroot还不够。通常还要挂载 /proc， /sys，另外为了确保不会出现类似“丢失 ptys”之类的错误，我们还得 bind（译者注：bind 是 mount 的一个选项） 挂载 /dev。如果你使用 tmpfs，你可能想要以 tmpfs 类型挂载新的 tmp、 var/tmp。接下来你可能还想将其他的挂载点 bind 到 chroot 中。这些都不是特别难，但是一般情况下要写一个脚本来管理它。 -现在我按照日常计划执行备份操作，当然有一些不必备份的数据如 tmp 目录，或任何 bind 挂载的内容。当我配置了一个新的 chroot 意味着我要更新我的备份配置了，但我经常忘记这点，因为大多数时间里 chroot 挂载点并没有运行。当这些挂载点任然存在的情况下执行备份的话，那么备份中会多出很多不需要的内容。 +现在我按照日常计划执行备份操作，当然有一些不必备份的数据如 tmp 目录，或任何 bind 挂载的内容。当我配置了一个新的 chroot 后就意味着我要更新我的备份配置了，但我经常忘记这点，因为大多数时间里 chroot 挂载点并没有运行。当这些挂载点仍然存在的情况下执行备份的话，那么备份中会多出很多不需要的内容。 -当 bind 挂载点包含其他挂载点时（比如挂载时使用 -rbind 选项），这种情况下 systemd 的默认处理方式略有不同。在 bind 挂载中卸载一些东西时，systemd 会将处于 bind 另一边的目录也卸载掉。想像一下，如果我卸载了 chroot 中以bind 挂载 /dev 的某个目录后发现主机上的 /dev/pts 与 /dev/shm 也不见了，我肯定会很吃惊。不过好像有其他方法可以避免，但是这不是我们此次讨论的重点。 +当 bind 挂载点包含其他挂载点时（比如挂载时使用 -rbind 选项），这种情况下 systemd 的默认处理方式略有不同。在 bind 挂载中卸载一些东西时，systemd 会将处于 bind 另一边的目录也卸载掉。想像一下，如果我卸载了 chroot 中以 bind 挂载 /dev 的某个目录后，发现主机上的 /dev/pts 与 /dev/shm 也不见了，我肯定会很吃惊。不过好像有其他方法可以避免，但是这不是我们此次讨论的重点。 ### Systemd-nspawn 优点 @@ -39,25 +39,25 @@ Systemd-nspawn 用于启动一个容器，并且它的最简模式就可以像 c 像 chroot 那样启动 namespace 是非常简单的： - systemd-nspawn -D . + systemd-nspawn -D . 也可以像 chroot 那样退出。在内部可以运行 mount 并且可以看到默认它已将 /dev 与 /tmp 准备好了。 ”.“就是 chroot 的路径，也就是当前路径。在它内部运行的是 bash。 如果要添加一些 bind 挂载点也非常简便： - systemd-nspawn -D . --bind /usr/portage + systemd-nspawn -D . --bind /usr/portage -现在，容器中的 /usr/portage 就与主机的对应目录绑定起来了，我们无需 sync /etc。如果想要绑定到指定的路径，只要在原路径后添加 ”：dest“，相当于 chroot 的 root（--bind foo 与 --bind foo:foo是一样的）。 +现在，容器中的 /usr/portage 就与主机的对应目录绑定起来了，我们无需 sync /etc。如果想要绑定到指定的路径，只要在原路径后添加 ”:dest“，相当于 chroot 的 root（--bind foo 与 --bind foo:foo是一样的）。 如果容器具有 init 功能并且可以在内部运行，可以通过添加 -b 选项启动它： - systemd-nspawn -D . --bind /usr/portage -b + systemd-nspawn -D . --bind /usr/portage -b 可以观察到 init 的运作。关闭容器会自动退出。 如果容器内运行了 systemd ，你可以使用 -h 选项将它的日志重定向到主机的systemd日志： - systemd-nspawn -D . --bind /usr/portage -j -b + systemd-nspawn -D . --bind /usr/portage -j -b 使用 nspawn 注册容器以便它能够在 machinectl 中显示。如此可以方便的在主机上对它进行操作，如启动新的 getty， ssh 连接，关机等。 @@ -68,8 +68,8 @@ Systemd-nspawn 用于启动一个容器，并且它的最简模式就可以像 c via: http://rich0gentoo.wordpress.com/2014/07/14/quick-systemd-nspawn-guide/ 作者：[rich0][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 585da02c61dcdb83345110ae2f181f1240536fb6 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 15 Jan 2015 23:21:52 +0800 Subject: [PATCH 056/215] =?UTF-8?q?20150115-4=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=89=8D=E9=9D=A2=E6=96=87=E4=BB=B6=E5=90=8D=E5=90=8E=E7=BC=80?= =?UTF-8?q?=E3=80=82=E4=B8=BA=E4=BD=95-3=E9=80=89=E9=A2=98=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E4=BA=86=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sources/tech/{20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x => 20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md} (100%) diff --git a/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x b/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md similarity index 100% rename from sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x rename to sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md From 0e2435557d47ab8d7449bf4b4a19afe02e2ccc8c Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 15 Jan 2015 23:24:02 +0800 Subject: [PATCH 057/215] =?UTF-8?q?20150115-5=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=89=8D=E9=9D=A2-3=E8=BF=87=E9=95=BF=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...r friends.md => 20150115 Get back your privacy and control.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sources/tech/{20150115 Get back your privacy and control over your data in just a few hours--build your own cloud for you and your friends.md => 20150115 Get back your privacy and control.md} (100%) diff --git a/sources/tech/20150115 Get back your privacy and control over your data in just a few hours--build your own cloud for you and your friends.md b/sources/tech/20150115 Get back your privacy and control.md similarity index 100% rename from sources/tech/20150115 Get back your privacy and control over your data in just a few hours--build your own cloud for you and your friends.md rename to sources/tech/20150115 Get back your privacy and control.md From a1d3bd813f5aedb9eab5e3f5427ebb0f38700358 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Fri, 16 Jan 2015 10:09:49 +0800 Subject: [PATCH 058/215] translating --- sources/tech/20150115 20 Unix Command Line Tricks--Part I.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md b/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md index af1218d6df..cbb8971497 100644 --- a/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md +++ b/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md @@ -1,3 +1,5 @@ +Translating----geekpi + 20 Unix Command Line Tricks – Part I ================================================================================ Let us start new year with **these Unix command line tricks** to increase productivity at the Terminal. I have found them over the years and I'm now going to share with you. From e84846cf7b1eef7028fb5330650bc94565b9382d Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Fri, 16 Jan 2015 11:45:10 +0800 Subject: [PATCH 059/215] translated --- ...115 20 Unix Command Line Tricks--Part I.md | 305 ------------------ ...115 20 Unix Command Line Tricks--Part I.md | 305 ++++++++++++++++++ 2 files changed, 305 insertions(+), 305 deletions(-) delete mode 100644 sources/tech/20150115 20 Unix Command Line Tricks--Part I.md create mode 100644 translated/tech/20150115 20 Unix Command Line Tricks--Part I.md diff --git a/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md b/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md deleted file mode 100644 index cbb8971497..0000000000 --- a/sources/tech/20150115 20 Unix Command Line Tricks--Part I.md +++ /dev/null @@ -1,305 +0,0 @@ -Translating----geekpi - -20 Unix Command Line Tricks – Part I -================================================================================ -Let us start new year with **these Unix command line tricks** to increase productivity at the Terminal. I have found them over the years and I'm now going to share with you. - -![](http://s0.cyberciti.org/uploads/cms/2015/01/unix-command-line-tricks.001.jpg) - -### Deleting a HUGE file ### - -I had a huge log file 200GB I need to delete on a production web server. My rm and ls command was crashed and I was afraid that the system to a crawl with huge disk I/O load. To remove a HUGE file, enter: - - > /path/to/file.log - # or use the following syntax - : > /path/to/file.log - - # finally delete it - rm /path/to/file.log - -### Want to cache console output? ### - -Try the script command line utility to create a typescript of everything printed on your terminal. - - script my.terminal.sessio - -Type commands: - - ls - date - sudo service foo stop - -To exit (to end script session) type *exit* or *logout* or press *control-D* - - exit - -To view type: - - more my.terminal.session - less my.terminal.session - cat my.terminal.session - -### Restoring deleted /tmp folder ### - -As my journey continues with [Linux and Unix shell, I made a few mistakes][1]. I accidentally deleted /tmp folder. To restore it all you have to do is: - - mkdir /tmp - chmod 1777 /tmp - chown root:root /tmp - ls -ld /tmp - -### Locking a directory ### - -For privacy of my data I wanted to lock down /downloads on my file server. So I ran: - - chmod 0000 /downloads - -The root user can still has access and ls and cd commands will not work. To go back: - - chmod 0755 /downloads - -### Password protecting file in vim text editor ### - -Afraid that root user or someone may snoop into your personal text files? Try password protection to a file in vim, type: - - vim +X filename - -Or, before quitting in vim use :X vim command to encrypt your file and vim will prompt for a password. - -### Clear gibberish all over the screen ### - -Just type: - - reset - -### Becoming human ### - -Pass the *-h* or *-H* (and other options) command line option to GNU or BSD utilities to get output of command commands like ls, df, du, in human-understandable formats: - - ls -lh - # print sizes in human readable format (e.g., 1K 234M 2G) - df -h - df -k - # show output in bytes, KB, MB, or GB - free -b - free -k - free -m - free -g - # print sizes in human readable format (e.g., 1K 234M 2G) - du -h - # get file system perms in human readable format - stat -c %A /boot - # compare human readable numbers - sort -h -a file - # display the CPU information in human readable format on a Linux - lscpu - lscpu -e - lscpu -e=cpu,node - # Show the size of each file but in a more human readable way - tree -h - tree -h /boot - -### Show information about known users in the Linux based system ### - -Just type: - - ## linux version ## - lslogins - - ## BSD version ## - logins - -Sample outputs: - - UID USER PWD-LOCK PWD-DENY LAST-LOGIN GECOS - 0 root 0 0 22:37:59 root - 1 bin 0 1 bin - 2 daemon 0 1 daemon - 3 adm 0 1 adm - 4 lp 0 1 lp - 5 sync 0 1 sync - 6 shutdown 0 1 2014-Dec17 shutdown - 7 halt 0 1 halt - 8 mail 0 1 mail - 10 uucp 0 1 uucp - 11 operator 0 1 operator - 12 games 0 1 games - 13 gopher 0 1 gopher - 14 ftp 0 1 FTP User - 27 mysql 0 1 MySQL Server - 38 ntp 0 1 - 48 apache 0 1 Apache - 68 haldaemon 0 1 HAL daemon - 69 vcsa 0 1 virtual console memory owner - 72 tcpdump 0 1 - 74 sshd 0 1 Privilege-separated SSH - 81 dbus 0 1 System message bus - 89 postfix 0 1 - 99 nobody 0 1 Nobody - 173 abrt 0 1 - 497 vnstat 0 1 vnStat user - 498 nginx 0 1 nginx user - 499 saslauth 0 1 "Saslauthd user" - -### How do I fix mess created by accidentally untarred files in the current dir? ### - -So I accidentally untar a tarball in /var/www/html/ directory instead of /home/projects/www/current. It created mess in /var/www/html/. The easiest way to fix this mess: - - cd /var/www/html/ - /bin/rm -f "$(tar ztf /path/to/file.tar.gz)" - -### Confused on a top command output? ### - -Seriously, you need to try out htop instead of top: - - sudo htop - -### Want to run the same command again? ### - -Just type !!. For example: - - /myhome/dir/script/name arg1 arg2 - - # To run the same command again - !! - - ## To run the last command again as root user - sudo !! - -The !! repeats the most recent command. To run the most recent command beginning with "foo": - - !foo - # Run the most recent command beginning with "service" as root - sudo !service - -The !$ use to run command with the last argument of the most recent command: - - # Edit nginx.conf - sudo vi /etc/nginx/nginx.conf - - # Test nginx.conf for errors - /sbin/nginx -t -c /etc/nginx/nginx.conf - - # After testing a file with "/sbin/nginx -t -c /etc/nginx/nginx.conf", you - # can edit file again with vi - sudo vi !$ - -### ###Get a reminder you when you have to leave - -If you need a reminder to leave your terminal, type the following command: - - leave +hhmm - -Where, - -- **hhmm** - The time of day is in the form hhmm where hh is a time in hours (on a 12 or 24 hour clock), and mm are minutes. All times are converted to a 12 hour clock, and assumed to be in the next 12 hours. - -### Home sweet home ### - -Want to go the directory you were just in? Run: - - cd - - -Need to quickly return to your home directory? Enter: - - cd - -The variable *CDPATH* defines the search path for the directory containing directories: - - export CDPATH=/var/www:/nas10 - -Now, instead of typing cd */var/www/html/* I can simply type the following to cd into /var/www/html path: - - cd html - -### Editing a file being viewed with less pager ### - -To edit a file being viewed with less pager, press v. You will have the file for edit under $EDITOR: - - less *.c - less foo.html - ## Press v to edit file ## - ## Quit from editor and you would return to the less pager again ## - -### List all files or directories on your system ### - -To see all of the directories on your system, run: - - find / -type d | less - - # List all directories in your $HOME - find $HOME -type d -ls | less - -To see all of the files, run: - - find / -type f | less - - # List all files in your $HOME - find $HOME -type f -ls | less - -### Build directory trees in a single command ### - -You can create directory trees one at a time using mkdir command by passing the -p option: - - mkdir -p /jail/{dev,bin,sbin,etc,usr,lib,lib64} - ls -l /jail/ - -### Copy file into multiple directories ### - -Instead of running: - - cp /path/to/file /usr/dir1 - cp /path/to/file /var/dir2 - cp /path/to/file /nas/dir3 - -Run the following command to copy file into multiple dirs: - - echo /usr/dir1 /var/dir2 /nas/dir3 | xargs -n 1 cp -v /path/to/file - -[Creating a shell function][2] is left as an exercise for the reader - -### Quickly find differences between two directories ### - -The diff command compare files line by line. It can also compare two directories: - - ls -l /tmp/r - ls -l /tmp/s - # Compare two folders using diff ## - diff /tmp/r/ /tmp/s/ - -[![Fig. : Finding differences between folders](http://s0.cyberciti.org/uploads/cms/2015/01/differences-between-folders.jpg)][3] - -Fig. : Finding differences between folders - -### Text formatting ### - -You can reformat each paragraph with fmt command. In this example, I'm going to reformat file by wrapping overlong lines and filling short lines: - - fmt file.txt - -You can also split long lines, but do not refill i.e. wrap overlong lines, but do not fill short lines: - - fmt -s file.txt - -### See the output and write it to a file ### - -Use the tee command as follows to see the output on screen and also write to a log file named my.log: - - mycoolapp arg1 arg2 input.file | tee my.log - -The tee command ensures that you will see mycoolapp output on on the screen and to a file same time. - --------------------------------------------------------------------------------- - -via: http://www.cyberciti.biz/open-source/command-line-hacks/20-unix-command-line-tricks-part-i/ - -作者：[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/tips/my-10-unix-command-line-mistakes.html -[2]:http://bash.cyberciti.biz/guide/Writing_your_first_shell_function -[3]:http://www.cyberciti.biz/open-source/command-line-hacks/20-unix-command-line-tricks-part-i/attachment/differences-between-folders/ \ No newline at end of file diff --git a/translated/tech/20150115 20 Unix Command Line Tricks--Part I.md b/translated/tech/20150115 20 Unix Command Line Tricks--Part I.md new file mode 100644 index 0000000000..b178a61db9 --- /dev/null +++ b/translated/tech/20150115 20 Unix Command Line Tricks--Part I.md @@ -0,0 +1,305 @@ +20个Unix命令技巧 - 第一部分 +================================================================================ +让我们用**这些Unix命令技巧**开启新的一年，提高在终端下的生产力。我已经找了很久了，现在就与你们分享。 + +![](http://s0.cyberciti.org/uploads/cms/2015/01/unix-command-line-tricks.001.jpg) + +### 删除一个大文件 ### + +我在生产服务器上有一个很大的200GB的日志文件需要删除。我的rm和ls命令已经崩溃，我担心这是由于巨大的磁盘IO造成的，要删除这个大文件，输入： + + > /path/to/file.log + # or use the following syntax + : > /path/to/file.log + + # finally delete it + rm /path/to/file.log + +### 如何缓存终端输出？ ### + +尝试使用script命令行工具来为你的终端输出创建typescript。 + + + script my.terminal.sessio + +输入命令： + + ls + date + sudo service foo stop + +要退出（结束script绘画），输入*exit* 或者 *logout* 或者按下 *control-D* + + exit + +要浏览输入： + + more my.terminal.session + less my.terminal.session + cat my.terminal.session + +### 还原删除的 /tmp 文件夹 ### + +我在文章[Linux和Unix shell，我犯了一些错误][1]。我意外地删除了/tmp文件夹。要还原它，我需要这么做： + + + mkdir /tmp + chmod 1777 /tmp + chown root:root /tmp + ls -ld /tmp + +### 锁定一个文件夹 ### + +为了我的数据隐私，我想要锁定我文件服务器下的/downloads文件夹。因此我运行： + + chmod 0000 /downloads + +root用户仍旧可以访问，但是ls和cd命令还不可用。要还原它用： + + chmod 0755 /downloads + +### 在vim中用密码保护文件 ### + +害怕root用户或者其他人偷窥你的个人文件么？尝试在vim中用密码保护，输入： + + vim +X filename + +或者，在退出vim之前使用:X 命令来加密你的文件，vim会提示你输入一个密码。 + +### 清除屏幕上的输出 ### + +只要输入： + + reset + +### 成为人类 ### + +传递*-h*或者*-H*（和其他选项）选项给GNU或者BSD工具来获取像ls、df、du等命令以人类可读的格式输出： + + ls -lh + # 以人类可读的格式 (比如： 1K 234M 2G) + df -h + df -k + # 已字节输出如： KB, MB, or GB + free -b + free -k + free -m + free -g + # 以人类可读的格式打印 (比如 1K 234M 2G) + du -h + # 以人类可读的格式获取系统perms + stat -c %A /boot + # 比较人类可读的数字 + sort -h -a file + # 在Linux上以人类可读的形式显示cpu信息 + lscpu + lscpu -e + lscpu -e=cpu,node + # 以人类可读的形式显示每个文件的大小 + tree -h + tree -h /boot + +### 在Linux系统中显示已知用户的信息 ### + +只要输入： + + ## linux 版本 ## + lslogins + + ## BSD 版本 ## + logins + +示例输出： + + UID USER PWD-LOCK PWD-DENY LAST-LOGIN GECOS + 0 root 0 0 22:37:59 root + 1 bin 0 1 bin + 2 daemon 0 1 daemon + 3 adm 0 1 adm + 4 lp 0 1 lp + 5 sync 0 1 sync + 6 shutdown 0 1 2014-Dec17 shutdown + 7 halt 0 1 halt + 8 mail 0 1 mail + 10 uucp 0 1 uucp + 11 operator 0 1 operator + 12 games 0 1 games + 13 gopher 0 1 gopher + 14 ftp 0 1 FTP User + 27 mysql 0 1 MySQL Server + 38 ntp 0 1 + 48 apache 0 1 Apache + 68 haldaemon 0 1 HAL daemon + 69 vcsa 0 1 virtual console memory owner + 72 tcpdump 0 1 + 74 sshd 0 1 Privilege-separated SSH + 81 dbus 0 1 System message bus + 89 postfix 0 1 + 99 nobody 0 1 Nobody + 173 abrt 0 1 + 497 vnstat 0 1 vnStat user + 498 nginx 0 1 nginx user + 499 saslauth 0 1 "Saslauthd user" + +### 我如何删除意外在当前文件夹下解压的文件？ ### + +我意外在/var/www/html/而不是/home/projects/www/current下解压了一个tarball。它混乱了/var/www/html下的文件。最简单修复这个问题的方法是： + + cd /var/www/html/ + /bin/rm -f "$(tar ztf /path/to/file.tar.gz)" + +### 对top命令的输出感到疑惑？ ### + +正经地说，你应该试一下用htop代替top： + + sudo htop + +### 想要再次运行相同的命令 ### + +只需要输入!!。比如： + + /myhome/dir/script/name arg1 arg2 + + # 要再次运行相同的命令 + !! + + ## 以root用户运行最后运行的命令 + sudo !! + +!!会运行最近使用的命令。要运行最近运行的“foo”命令： + + !foo + # 以root用户运行上一次以“service”开头的命令 + sudo !service + +!$用于运行带上最后一个参数的命令： + + # 编辑 nginx.conf + sudo vi /etc/nginx/nginx.conf + + # 测试 nginx.conf + /sbin/nginx -t -c /etc/nginx/nginx.conf + + # 测试完 "/sbin/nginx -t -c /etc/nginx/nginx.conf"你可以用vi编辑了 + sudo vi !$ + +### 在你要离开的时候留下一个提醒 ### + +If you need a reminder to leave your terminal, type the following command: +如果你需要提醒离开你的终端，输入下面的命令： + + leave +hhmm + +这里： + +- **hhmm** - 时间是以hhmm的形式，hh表示小时（12时制或者24小时制），mm代表分钟。所有的时间都转化成12时制，并且假定发生在接下来的12小时。 + +### 甜蜜的家 ### + +想要进入刚才进入的地方？运行： + + cd - + +需要快速地回到家目录？输入： + + cd + +变量*CDPATH*定义了含有这个目录的搜索目录路径： + + export CDPATH=/var/www:/nas10 + +现在，不用输入cd */var/www/html/ ，我可以直接输入下面的命令进入/var/www/html： + + cd html + +### 编辑一个用less浏览的文件 ### + +要编辑一个用less浏览的文件，按下v。你就可以用变量$EDITOR下的编辑器来编辑了： + + less *.c + less foo.html + ## 下载v编辑文件 ## + ## 退出编辑器，你可以继续用less浏览了 ## + +### 列出你系统中的所有文件和目录 ### + +要看到你系统中的所有目录，运行： + + find / -type d | less + + # 列出$HOME 所有目录 + find $HOME -type d -ls | less + +要看到所有的文件，运行： + + find / -type f | less + + # 列出 $HOME 中所有的文件 + find $HOME -type f -ls | less + +### 用一条命令构造命令树 ### + +你可以用mkdir加上-p选项一次创建目录树： + + mkdir -p /jail/{dev,bin,sbin,etc,usr,lib,lib64} + ls -l /jail/ + +### 复制文件到多个目录中 ### + +不必运行： + + cp /path/to/file /usr/dir1 + cp /path/to/file /var/dir2 + cp /path/to/file /nas/dir3 + +运行下面的命令来复制文件到多个目录中： + + echo /usr/dir1 /var/dir2 /nas/dir3 | xargs -n 1 cp -v /path/to/file + +留下[创建一个shell函数][2]作为读者的练习。 + +### 快速找出两个目录的不同 ### + +diff命令会按行比较文件。它也可以比较两个目录： + + ls -l /tmp/r + ls -l /tmp/s + # Compare two folders using diff ## + diff /tmp/r/ /tmp/s/ + +[![Fig. : Finding differences between folders](http://s0.cyberciti.org/uploads/cms/2015/01/differences-between-folders.jpg)][3] + +图片： 找出目录之间的不同 + +### 文本格式化 ### + +你可以用fmt命令重新格式化每个段落。在本例中，我要用分割超长的行并且填充短行： + + fmt file.txt + +你也可以分割长的行，但是不重新填充，也就是说分割长行，但是不填充短行： + + fmt -s file.txt + +### 看见输出并写入到一个文件中 ### + +如下使用tee命令在屏幕上看见输出并同样写入到日志文件my.log中： + + mycoolapp arg1 arg2 input.file | tee my.log + +tee可以保证你同时在屏幕上看到mycoolapp的输出和写入文件。 + +-------------------------------------------------------------------------------- + +via: http://www.cyberciti.biz/open-source/command-line-hacks/20-unix-command-line-tricks-part-i/ + +作者：[nixCraft][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者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/tips/my-10-unix-command-line-mistakes.html +[2]:http://bash.cyberciti.biz/guide/Writing_your_first_shell_function +[3]:http://www.cyberciti.biz/open-source/command-line-hacks/20-unix-command-line-tricks-part-i/attachment/differences-between-folders/ \ No newline at end of file From 8317c05e54f688d8eb1c6517506a69fbd99738ad Mon Sep 17 00:00:00 2001 From: wxy Date: Fri, 16 Jan 2015 15:28:06 +0800 Subject: [PATCH 060/215] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @ZhouJ-sh --- ...ns From The Terminal In Background Mode.md | 85 ------------------- 1 file changed, 85 deletions(-) delete mode 100644 sources/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md diff --git a/sources/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md b/sources/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md deleted file mode 100644 index cab2676152..0000000000 --- a/sources/share/20150115 How To Run Linux Applications From The Terminal In Background Mode.md +++ /dev/null @@ -1,85 +0,0 @@ -How To Run Linux Programs From The Terminal In Background Mode -======================================================================== - -![Linux Terminal Window.](http://f.tqn.com/y/linux/1/W/r/G/1/terminal.JPG) - -This is a short but useful guide to show how to run Linux applications from the terminal whilst allowing the terminal to retain control. - -There are various ways of opening a terminal window in Linux and it largely depends on your choice of distribution and the desktop environment. - -Using Ubuntu you can open a terminal by using the CTRL + ALT + T key combination. You can also open a terminal window by pressing the super key (Windows Key), on the keyboard, to [bring up the Dash][1] and search for "TERM". Clicking on the "Term" icon will open a terminal window. - -For other desktop environments such as XFCE, KDE, LXDE, Cinnamon and MATE you will find the terminal within the menu. Some distributions will have a terminal icon in a dock or as a launcher on a panel. - -You can generally start an application from the terminal by simply entering the name of the program. For instance you can start Firefox by typing "firefox". - -The benefit of running an application from the terminal is that you can include additional options. - -For instance if you type the following a new Firefox browser window will open and the default search engine will be used to search for the term between quotes: - - firefox -search "Linux.About.Com" - -You will notice that if you run Firefox, the application will open and the control will be returned to the terminal which means you can continue working within the terminal. - -Generally if you run an application from within the terminal, the application will open and you won't regain control of the terminal until the application is closed. This is because you opened the program in the foreground. - -To be able to open a program in the Linux terminal and return control to the terminal you need to open the application as a background process, - -In order to open a program as a background process simply add the ampersand (&) symbol to the command as shown below: - - libreoffice & - -An application might not run just by providing the program's name in the terminal. If the program doesn't reside in one of the folders set within the PATH variable then you will need to specify the whole path name in order to run the program. - - /path/to/yourprogram & - -If you aren't sure where a program resides within the Linux folder structure use the [find][2] or [locate][3] command to find the application. - -The syntax for finding a file is as follows: - - find /path/to/start/from -name programname - -For instance if you wanted to find the location of Firefox use the following command: - - find / -name firefox - -The output will whizz past quite quickly and so you will want to pipe the output to either [less][4] or [more][5] as follows: - - find / -name firefox | more - - find / -name firefox | less - -The find command will return a number of permission denied errors for folders that you don't have permissions to search. - -You can alway provide the [sudo command to elevate your permissions][6]. If sudo isn't installed you will need to switch to a user that has permissions. - - sudo find / -name firefox | more - -If you know that the file you are looking for is within the folder structure in which you are currently located then you can replace the forward slash with a period as follows: - - sudo find . -name firefox | more - -You may or may not need the elevated permissions provided by sudo. If you are looking for something within your home folder structure then it won't be required. - -Some applications require elevated permissions to run and you may get a lack of permissions error unless you use either a user with adequate permissions or elevate those permissions using sudo. - -Here is a neat trick. If you run an application and it requires elevated permissions to run, type the following: - - sudo !! - - -via : http://linux.about.com/od/commands/fl/How-To-Run-Linux-Programs-From-The-Terminal-In-Background-Mode.htm - -作者：[Gary Newell][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linux.about.com/bio/Gary-Newell-132058.htm -[1]:http://linux.about.com/od/howtos/fl/Learn-Ubuntu-The-Unity-Dash.htm -[2]:http://linux.about.com/od/commands/l/blcmdl1_find.htm -[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 From e5f83b245af974340cd1337043f2bfdf474735c3 Mon Sep 17 00:00:00 2001 From: wxy Date: Fri, 16 Jan 2015 16:22:30 +0800 Subject: [PATCH 061/215] PUB:20141119 Smartctl--Monitoring & Analysis tool for Hard drive @GOLinux --- ...nitoring & Analysis tool for Hard drive.md | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) rename {translated/tech => published}/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md (90%) diff --git a/translated/tech/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md b/published/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md similarity index 90% rename from translated/tech/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md rename to published/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md index ba6f6862bd..943d3349c6 100644 --- a/translated/tech/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md +++ b/published/20141119 Smartctl--Monitoring & Analysis tool for Hard drive.md @@ -1,30 +1,34 @@ -硬盘监控和分析神器——Smartctl +硬盘监控和分析工具——Smartctl ================================================================================ -**Smartctl**（自监控，分析和报告技术）是类Unix系统下实施SMART任务命令行套件或工具，它用于打印SMART**自检**和**错误日志**，启用并禁用SMRAT**自动检测**，以及初始化设备自检。 +**Smartctl**（S.M.A.R.T 自监控，分析和报告技术）是类Unix系统下实施SMART任务命令行套件或工具，它用于打印SMART**自检**和**错误日志**，启用并禁用SMRAT**自动检测**，以及初始化设备自检。 -Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以对智能磁盘进行错误检查，并将与**硬件RAID**上相关的磁盘信息摘录下来。 +Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以对智能磁盘进行错误检查，并将与**硬件RAID**相关的磁盘信息摘录下来。 在本帖中，我们将讨论smartctl命令的一些实用样例。如果你的Linux上海没有安装smartctl，请按以下步骤来安装。 -### Ubuntu中smartctl的安装 ### +### 安装 Smartctl ### + +**对于 Ubuntu** $ sudo apt-get install smartmontools -### Redhat / CentOS中smartctl的安装 ### +**对于 CentOS & RHEL** # yum install smartmontools -**启动Smartctl服务** +###启动Smartctl服务### -**对于Ubuntu** +**对于 Ubuntu** $ sudo /etc/init.d/smartmontools start -**对于CentOS & RHEL** +**对于 CentOS & RHEL** # service smartd start ; chkconfig smartd on -**样例：1 检查针对磁盘的Smart负载量** +### 样例 ### + +#### 样例：1 检查磁盘的 Smart 功能是否启用 root@linuxtechi:~# smartctl -i /dev/sdb smartctl 6.2 2013-07-26 r3841 [x86_64-linux-3.13.0-32-generic] (local build) @@ -46,9 +50,9 @@ Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以 SMART support is: Available - device has SMART capability. SMART support is: Enabled -这里‘/dev/sdb’是你的硬盘。上面输出中的最后两行显示了SMART负载量已启用。 +这里‘/dev/sdb’是你的硬盘。上面输出中的最后两行显示了SMART功能已启用。 -**样例：2 为磁盘启用Smart负载量** +#### 样例：2 启用磁盘的 Smart 功能 root@linuxtechi:~# smartctl -s on /dev/sdb smartctl 6.2 2013-07-26 r3841 [x86_64-linux-3.13.0-32-generic] (local build) @@ -57,7 +61,7 @@ Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以 === START OF ENABLE/DISABLE COMMANDS SECTION === SMART Enabled. -**样例：3 为磁盘禁用Smart负载量** +#### 样例：3 禁用磁盘的 Smart 功能 root@linuxtechi:~# smartctl -s off /dev/sdb smartctl 6.2 2013-07-26 r3841 [x86_64-linux-3.13.0-32-generic] (local build) @@ -66,12 +70,12 @@ Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以 === START OF ENABLE/DISABLE COMMANDS SECTION === SMART Disabled. Use option -s with argument 'on' to enable it. -**样例：4 为磁盘显示详细Smart信息** +#### 样例：4 显示磁盘的详细 Smart 信息 root@linuxtechi:~# smartctl -a /dev/sdb // For IDE drive root@linuxtechi:~# smartctl -a -d ata /dev/sdb // For SATA drive -**样例：5 显示磁盘总体健康状况** +#### 样例：5 显示磁盘总体健康状况 root@linuxtechi:~# smartctl -H /dev/sdb smartctl 6.2 2013-07-26 r3841 [x86_64-linux-3.13.0-32-generic] (local build) @@ -84,7 +88,7 @@ Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以 ID# ATTRIBUTE_NAME FLAG VALUE WORST THRESH TYPE UPDATED WHEN_FAILED RAW_VALUE 190 Airflow_Temperature_Cel 0x0022 067 045 045 Old_age Always In_the_past 33 (Min/Max 25/33) -**样例：6 使用long和short选项测试硬盘** +#### 样例：6 使用long和short选项测试硬盘 **Long测试** @@ -126,7 +130,7 @@ Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以 **注意**：short测试将花费最多2分钟，而在long测试中没有时间限制，因为它会读取并验证磁盘的每个段。 -**样例：7 查看驱动器的自检结果** +#### 样例：7 查看驱动器的自检结果 root@linuxtechi:~# smartctl -l selftest /dev/sdb smartctl 6.2 2013-07-26 r3841 [x86_64-linux-3.13.0-32-generic] (local build) @@ -138,7 +142,7 @@ Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以 # 1 Short offline Completed: read failure 90% 492 210841222 # 2 Extended offline Completed: read failure 90% 492 210841222 -**样例：8 计算测试时间估值** +#### 样例：8 计算测试时间估值 root@linuxtechi:~# smartctl -c /dev/sdb smartctl 6.2 2013-07-26 r3841 [x86_64-linux-3.13.0-32-generic] (local build) @@ -178,7 +182,7 @@ Smartctl对于Linux物理服务器十分有用，在这些服务器上，可以 SCT Feature Control supported. SCT Data Table supported. -**样例：9 显示磁盘错误日志** +#### 样例：9 显示磁盘错误日志 root@linuxtechi:~# smartctl -l error /dev/sdb @@ -219,7 +223,7 @@ via: http://www.linuxtechi.com/smartctl-monitoring-analysis-tool-hard-drive/ 作者：[Pradeep Kumar][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 125d5e4481d54242560df88db01e188fcdd700ba Mon Sep 17 00:00:00 2001 From: wxy Date: Fri, 16 Jan 2015 16:51:03 +0800 Subject: [PATCH 062/215] PUB:20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server @liaoishere --- ...Monitoring tool) on ubuntu 14.10 server.md | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) rename {translated/tech => published}/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md (72%) diff --git a/translated/tech/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md b/published/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md similarity index 72% rename from translated/tech/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md rename to published/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md index d307a63779..ec08a3822d 100644 --- a/translated/tech/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md +++ b/published/20141125 How to install Cacti (Monitoring tool) on ubuntu 14.10 server.md @@ -1,38 +1,39 @@ -How to install Cacti (Monitoring tool) on ubuntu 14.10 server -怎样在 Ubuntu 14.10 Server 上安装 Cacti（监控工具） +怎样在 Ubuntu 14.10 Server 上安装 Cacti ================================================================================ -Cacti 是一个网络绘图解决方案，它被设计用来管理 RRDTool （一个 Linux 数据存储和绘图工具）的数据存储和绘图的强大功能。Cacti 提供一个快速的轮询器，高级的绘图模版，多种数据获取方法和用户管理功能，并且可以开箱即用。所有的这些都被打包进一个直观，易用的界面，可用于监控简单的 LAN 网络，乃至包含成百上千设备的复杂网络。 + +Cacti 是一个完善的网络监控的图形化解决方案，它被设计用来发挥 RRDTool （一个 Linux 数据存储和绘图工具）的数据存储和绘图的强大功能。Cacti 提供一个快速的轮询器，高级的绘图模版，多种数据获取方法和用户管理功能，并且可以开箱即用。所有的这些都被打包进一个直观，易用的界面，可用于监控简单的 LAN 网络，乃至包含成百上千设备的复杂网络。 ### 功能 ### #### 绘图 #### -无上限的监控图条目（graph item），每个图形可以视情况使用 Cacti 中的 CDEFs （Calculation Define，可以对图形输出结果进行计算）或者数据源。 +没有数量限制的监控图条目（graph item），每个图形可以视情况使用 Cacti 中的 CDEFs （Calculation Define，可以对图形输出结果进行计算）或者数据源。 -自动将 GPRINT 条目分组至 AREA，STACK 和 LINE[1-3] 中，可以对图形进行快速重排序。 +自动将 GPRINT 条目分组至 AREA，STACK 和 LINE[1-3] 中，来对监控图条目进行快速重排序。 -自动填充功能使得图形的说明整齐排列。 +自动填充功能支持整齐排列图形内的说明项。 可以使用 RRDTool 中内置的 CDEF 数学函数对图形数据进行处理。这些 CDEF 函数可以定义在 Cacti 中，并且每一个图形都可以使用它们。 -支持所有的 RRDTool 图形类型包括 AREA，STACK，LINE[1-3]，GPRINT，COMMENT，VRULE 和 HRULE。 +支持所有的 RRDTool 图形类型，包括 AREA，STACK，LINE[1-3]，GPRINT，COMMENT，VRULE 和 HRULE。 #### 数据源 #### -数据源可以使用 RRDTool 的 "create" 和 "update" 功能创建。每一个数据源可以用来收集本地或者远程的数据，并将数据输出给图形。 +数据源可以使用 RRDTool 的 "create" 和 "update" 功能创建。每一个数据源可以用来收集本地或者远程的数据，并将数据输出成图形。 支持包含多个数据源的 RRD 文件，并可以使用存储在本地文件系统中任何位置的 RRD 文件。 -可以自定义轮询归档（RRA）设置，用户可以在存储数据时使用非标准的时间间隔（标准时间间隔是5分钟，30分钟，2小时 和 1天）。 + +可以自定义轮询归档（RRA）设置，用户可以在存储数据时使用非标准的时间间隔（标准时间间隔是5分钟，30分钟，2小时和 1天）。 #### 数据收集 #### -Cacti 包含一个 "data input" 机制，可以让用户定义自定义的脚本用来收集数据。每个脚本可以包含调用参数，每次创建调用此脚本的数据源时输入相应的调用参数（如 IP 地址）。 +Cacti 包含一个 "data input" 机制，可以让用户定义自定义的脚本用来收集数据。每个脚本可以包含调用参数，每次调用此脚本的创建数据源时必须输入相应的调用参数（如 IP 地址）。 支持 SNMP 功能，可以使用 php-snmp，ucd-snmp 或者 net-snmp。 -可以基于索引来使用 SNMP 或者脚本收集数据。例如，可以列出一个服务器上所有网卡接口或者已挂载分区的索引列表。集成的绘图模版可以用来一键为主机创建图形。 +可以基于索引来使用 SNMP 或者脚本收集数据。例如，可以列出一个服务器上所有网卡接口或者已挂载分区的索引列表。其集成的绘图模版可以用来为主机一键创建图形。 -提供一个基于 PHP 的轮询器用于执行脚本，收集 SNMP数据并更新数据至 RRD 文件中。 +提供了一个基于 PHP 的轮询器执行脚本，可以收集 SNMP数据并更新数据至 RRD 文件中。 #### 模版 #### @@ -44,7 +45,7 @@ Cacti 包含一个 "data input" 机制，可以让用户定义自定义的脚本 #### 图形展示 #### -图形树允许用户创建「图形层次结构」并将图形放至树中。这种方法可以方便的管理大量图形。 +图形树模式允许用户创建「图形层次结构」并将图形放至树中。这种方法可以方便的管理大量图形。 列表模式将所有图形的链接在一个大列表中展示出来，链接指向用户创建的图形。 @@ -55,7 +56,10 @@ Cacti 包含一个 "data input" 机制，可以让用户定义自定义的脚本 用户管理功能允许管理员创建用户并分配给用户访问 Cacti 接口的不同级别的权限。 权限可以为每个用户指定其对每个图形的权限，这适用于主机租用的场景。 + 每个用户可以保存他自己的图形显示模式。 + +### 安装 ### #### 系统准备 #### @@ -123,7 +127,7 @@ via: http://www.ubuntugeek.com/how-to-install-cacti-monitoring-tool-on-ubuntu-14 作者：[ruchi][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/) 荣誉推出 From efc83533565aef0b678a44f1cd5c64822567535e Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Fri, 16 Jan 2015 16:58:18 +0800 Subject: [PATCH 063/215] =?UTF-8?q?=E9=80=89=E9=A2=98=2020150116=20A=20Ste?= =?UTF-8?q?p=20By=20Step=20Guide=20To=20Installing=20Xubuntu=20Linux.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Step Guide To Installing Xubuntu Linux.md | 157 ++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md diff --git a/sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md b/sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md new file mode 100644 index 0000000000..af699dfd8b --- /dev/null +++ b/sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md @@ -0,0 +1,157 @@ +A Step By Step Guide To Installing Xubuntu Linux +================================================================ + +### Introduction To Installing Xubuntu Linux ### + +![Xubuntu](http://f.tqn.com/y/linux/1/S/J/J/1/fulldesktop.png) + +This guide shows how to install Xubuntu Linux using step by step instructions. + +Why would you want to install Xubuntu? Here are three reasons: + +1. You have a computer running Windows XP that is out of support +2. You have [a computer that is running really slowly][1] and you want a lightweight but modern operating system +3. You want to be able to customise your computing experience + +The first thing you need to do is download Xubuntu and create a bootable USB drive. + +After you have done this boot into a live version of Xubuntu and click on the install Xubuntu icon. + +### Choose Your Installation Language ### + +![Choose Language](http://f.tqn.com/y/linux/1/S/K/J/1/xubuntuinstall1.png) + +The first step is to choose your language. + +Click on the language in the left pane and then click "Continue" + +### Choose Wireless Connection ### + +![Set Up Your Wireless Connection](http://f.tqn.com/y/linux/1/S/L/J/1/xubuntuinstall2.png) + +The second step requires you to choose your internet connection. This is not a required step and there are reasons why you might choose not to set up your internet connection at this stage. + +If you have a [poor internet connection][3] it is a good idea not to choose a wireless network because the installer will attempt to download updates as part of the installation. Your installation will therefore take a long time to complete. + +If you have a really [good internet connection][4] choose your wireless network and enter the security key. + +### Be Prepared ### + +![Preparing To Install Xubuntu](http://f.tqn.com/y/linux/1/S/M/J/1/xubuntuinstall3.png) + +You will now see a checklist which shows how well prepared you are for installing Xubuntu: + +- Do you have at least 6.2 gigabytes of disk space +- Are you connected to the internet +- Are you connected to a power source + +The only one that is a necessity is the disk space. + +As mentioned in the previous step you can install Xubuntu without being connected to the internet. You can install updates once the installation is complete. + +You only need to be connected to a power source if you are likely to run out of battery power during the installation. + +Note that if you are connected to the internet there is a checkbox to turn off the option to download updates while installing. + +There is also a checkbox that lets you install third party software to enable you to [play MP3s][5] and watch [Flash videos][6]. This is a step that can be completed post installation as well. + +### Choose Your Installation Type ### + +![](http://f.tqn.com/y/linux/1/S/N/J/1/xubuntuinstall4.png) + +The next step is to choose the installation type. The options available will depend on what is already installed on the computer. + +In my case I was installing Xubuntu on a netbook over the top of [Ubuntu MATE][7] and so I had options to reinstall Ubuntu, erase and reinstall, install Xubuntu alongside Ubuntu or something else. + +If you have Windows on your computer you will have options to install alongside, replace Windows with Xubuntu or something else. + +This guide shows how to install Xubuntu on a computer and not how to dual boot. That is a completely different guide altogether. + +Choose the option to replace your operating system with Xubuntu and click "Continue" + +Note: This will cause your disk to be wiped and you should backup all of your data before continuing + +### Choose The Disk To Install To ### + +![](http://f.tqn.com/y/linux/1/S/O/J/1/xubuntuinstall5.png) + +Select the drive you wish to install Xubuntu to. + +Click "Install Now". + +A warning will appear telling you that the drive will be wiped and you will be shown a list of partitions that will be created. + +Note: This is the very last chance to change your mind. If you click continue the disk will be wiped and Xubuntu will be installed + +Click "Continue" to install Xubuntu + +### Choose Your Location ### + +![](http://f.tqn.com/y/linux/1/S/P/J/1/xubuntuinstall7.png) + +You are now required to choose your location by clicking on the map. This sets your timezone so that your clock is set to the right time. + +After you have selected the correct location click "Continue". + +### Choose Your Keyboard Layout ### + +![](http://f.tqn.com/y/linux/1/S/Q/J/1/xubuntuinstall8.png) + +Choose your keyboard layout. + +To do this select the language of your keyboard in the left hand pane and then choose the exact layout in the right pane such as dialect, number of keys etc. + +You can click the "Detect Keyboard Layout" button to automatically select the best keyboard layout. + +To make sure the keyboard layout is set correctly enter text into the "Type here to test your keyboard". Pay close attention to function keys and symbols such as pound and dollar symbols. + +Don't worry if you don't get this right during installation. You can set the keyboard layout again within Xubuntu's system settings post installation. + +### Add A User ### + +![](http://f.tqn.com/y/linux/1/S/R/J/1/xubuntuinstall9.png) + +n order to use Xubuntu you will need to have at least one user set up and so the installer requires you to create a default user. + +Enter your name and a name to distinguish the computer into the first two boxes. + +Choose a username and [set up a password][8] for the user. You will need to type the password in twice to make sure you have set the password correctly. + +If you want Xubuntu to automatically login without having to enter a password check the box marked "Log in automatically". Personally I would never recommend doing this though. + +The better option is to check the "Require my password to log in" radio button and if you want to be completely secure check the "Encrypt my home folder" option. + +Click "Continue" to move on. + +### Wait For Installation To Complete ### + +![](http://f.tqn.com/y/linux/1/S/S/J/1/xubuntuinstall10.png) + +The files will now be copied to your computer and Xubuntu will be installed. + +During this process you will see a short slide show. You can go and [make some coffee][9] at this point and relax. + +A message will appear stating that you can continue to try Xubuntu or reboot to start using the newly installed Xubuntu. + +When you are ready, reboot and remove the USB drive. + +Note: To install Xubuntu on a UEFI based machine requires some extra steps not included here. These instructions will be added as a separate guide + +via : http://linux.about.com/od/howtos/ss/A-Step-By-Step-Guide-To-Installing-Xubuntu-Linux.htm#step-heading + +作者：[Gary Newell][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linux.about.com/bio/Gary-Newell-132058.htm +[1]:http://windows.about.com/od/maintainandfix/a/8ways2speedup.htm +[2]:http://linux.about.com/od/howtos/ss/How-To-Create-A-Persistent-Bootable-Xubuntu-Linux-USB-Drive.htm +[3]:http://netforbeginners.about.com/od/basicinternethardware/f/Why-Internet-Connections-Can-Be-Slow.htm +[4]:http://netforbeginners.about.com/b/2011/09/07/test-your-internet-connection-speed-here.htm +[5]:http://mp3.about.com/od/freebies/tp/freemusictp.htm +[6]:http://animation.about.com/od/2danimationtutorials/ss/2d_fla_lesson1.htm +[7]:http://www.everydaylinuxuser.com/2014/11/ubuntu-mate-vs-lubuntu-on-old-netbook.html +[8]:http://netsecurity.about.com/cs/generalsecurity/a/aa112103b.htm +[9]:http://coffeetea.about.com/od/preparationandrecipes/ \ No newline at end of file From c9b90bfdf16fc793ff45e05416fcf1d98b3b0096 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Fri, 16 Jan 2015 21:09:31 +0800 Subject: [PATCH 064/215] translating --- sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md b/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md index 4c21f3f02c..f141fada2f 100644 --- a/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md +++ b/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md @@ -1,3 +1,5 @@ +Translating---geekpi + Configure Mate Desktop With Mate Tweak ================================================================================ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Mate_Tweak.jpeg) From 474941fb36cc81b21c9aee9ee40b705a189d935e Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Fri, 16 Jan 2015 21:20:02 +0800 Subject: [PATCH 065/215] translating --- ... Configure Mate Desktop With Mate Tweak.md | 35 ------------------- ... Configure Mate Desktop With Mate Tweak.md | 33 +++++++++++++++++ 2 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md create mode 100644 translated/tech/20150115 Configure Mate Desktop With Mate Tweak.md diff --git a/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md b/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md deleted file mode 100644 index f141fada2f..0000000000 --- a/sources/tech/20150115 Configure Mate Desktop With Mate Tweak.md +++ /dev/null @@ -1,35 +0,0 @@ -Translating---geekpi - -Configure Mate Desktop With Mate Tweak -================================================================================ -![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Mate_Tweak.jpeg) - -[Installing Mate Desktop in Ubuntu][1] is one thing but you might be wondering about how to **configure Mate Desktop**? Most of the desktop environments have their own tweaking tools. For example Unity has Unity Tweak Tool, GNOME has Gnome Tweak Tool, Elementary OS has Elementary Tweak Tool. Good news is that Mate Desktop too has its own configuration tweak tool, named [Mate Tweak][2]. - -Mate Tweak is a fork of [mintDesktop][3], a configuration tool for Linux Mint. - -### Install Mate Tweak to configure Mate Desktop ### - -Mate Tweak can be easily installed in Ubuntu and Ubuntu based system via its official PPA. Open a terminal and use the following commands: - - sudo add-apt-repository ppa:ubuntu-mate-dev/ppa - sudo apt-get update - sudo apt-get install mate-tweak - -You can control what shows on the desktop, buttons layout and other interface tweaks and windows behavior. Compare to Unity and Gnome tweak tools, Mate Tweak doesn’t have much to offer in terms of tweaking. For example you can still not [change themes][4] with it but at least it provides an easier way to change some configuration. I hope that it will have more features in near future. - --------------------------------------------------------------------------------- - -via: http://itsfoss.com/configure-mate-desktop-mate-tweak/ - -作者：[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/install-mate-desktop-ubuntu-14-04/ -[2]:https://bitbucket.org/flexiondotorg/mate-tweak -[3]:https://github.com/linuxmint/mintdesktop -[4]:http://itsfoss.com/how-to-install-themes-in-ubuntu-13-10/ \ No newline at end of file diff --git a/translated/tech/20150115 Configure Mate Desktop With Mate Tweak.md b/translated/tech/20150115 Configure Mate Desktop With Mate Tweak.md new file mode 100644 index 0000000000..7ae68abaae --- /dev/null +++ b/translated/tech/20150115 Configure Mate Desktop With Mate Tweak.md @@ -0,0 +1,33 @@ +使用Mate Tweak配置Mate桌面 +================================================================================ +![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Mate_Tweak.jpeg) + +[在Ubuntu中安装Mate桌面][1]是一码事但是你或许想要知道如何**配置Mate桌面**？ 大多数桌面环境都有它们自己的调整工具。比如Unity有Unity Tweak，Gnome有Gnome Tweak，Elementary OS有 Elementary OS Teweak。好消息是Mate桌面也有它自己的调整工具，叫Mate Tweak][2]。 + +Mate Tweak是[mintDesktop][3]的克隆分支，一款Linux Mint的配置工具。 + +### 安装Mate Tweak来配置Mate桌面 ### + +Mate Tweak可以通过官方的PPA很简单地在Ubuntu和基于Ubuntu的系统中安装。打开终端，输入下面的命令： + + sudo add-apt-repository ppa:ubuntu-mate-dev/ppa + sudo apt-get update + sudo apt-get install mate-tweak + +你可以控制桌面的显示、按钮的布局和其他界面微调和窗口行为。与Unity和Gnome的调整工具比起来，Mate Tweak没有提供太多的调整选项。比如你还不能用它[改变主题][4]，但是至少它提供了一个简单的方法来改变一些配置。我希望它可以在不久的将来提供更多的特性。 + +-------------------------------------------------------------------------------- + +via: http://itsfoss.com/configure-mate-desktop-mate-tweak/ + +作者：[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/install-mate-desktop-ubuntu-14-04/ +[2]:https://bitbucket.org/flexiondotorg/mate-tweak +[3]:https://github.com/linuxmint/mintdesktop +[4]:http://itsfoss.com/how-to-install-themes-in-ubuntu-13-10/ \ No newline at end of file From 1b6d81032f650e86354b8c20aa84af3afc5918df Mon Sep 17 00:00:00 2001 From: DoubleC <450760206@qq.com> Date: Sat, 17 Jan 2015 11:14:26 +0800 Subject: [PATCH 066/215] SPccman translating MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 申领文章 --- ... Manage Network using nmcli Tool in RedHat or CentOS 7.x.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md b/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md index be02ea9e9d..ba0d32eb37 100644 --- a/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md +++ b/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md @@ -1,3 +1,4 @@ +SPccman.......translating How to Manage Network using nmcli Tool in RedHat / CentOS 7.x ================================================================================ A new feature of [**Red Hat Enterprise Linux 7**][1] and **CentOS 7** is that the default networking service is provided by **NetworkManager**, a dynamic network control and configuration daemon that attempts to keep network devices and connections up and active when they are available while still supporting the traditional ifcfg type configuration files. NetworkManager can be used with the following types of connections: Ethernet, VLANs, Bridges, Bonds, Teams, Wi-Fi, mobile broadband (such as cellular 3G), and IP-over-InfiniBand. For these connection types, NetworkManager can configure network aliases, IP addresses, static routes, DNS information, and VPN connections, as well as many connection-specific parameters. @@ -89,4 +90,4 @@ via: http://linoxide.com/linux-command/nmcli-tool-red-hat-centos-7/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://linoxide.com/author/adriand/ -[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ \ No newline at end of file +[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ From 4d9c0d7c9994a7663c87c8a165ed1dd89339f5f4 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Sat, 17 Jan 2015 14:26:02 +0800 Subject: [PATCH 067/215] translating --- ... To a Different Directory on a Linux or Unix-like Systems.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md b/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md index bae3c66664..cdb1abab5a 100644 --- a/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md +++ b/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md @@ -1,3 +1,5 @@ +Translating----geekpi + How To Extract a Tar Files To a Different Directory on a Linux/Unix-like Systems ================================================================================ I want to extract tar file to specific directory called /tmp/data. How can I extract a tar archive to a different directory using tar command on a Linux or Unix-like systems? From 45126b50e27e224f0b4a04865c14c4bdc3c84c70 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Sat, 17 Jan 2015 14:39:14 +0800 Subject: [PATCH 068/215] translated --- ...rectory on a Linux or Unix-like Systems.md | 65 ------------------- ...rectory on a Linux or Unix-like Systems.md | 63 ++++++++++++++++++ 2 files changed, 63 insertions(+), 65 deletions(-) delete mode 100644 sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md create mode 100644 translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md diff --git a/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md b/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md deleted file mode 100644 index cdb1abab5a..0000000000 --- a/sources/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md +++ /dev/null @@ -1,65 +0,0 @@ -Translating----geekpi - -How To Extract a Tar Files To a Different Directory on a Linux/Unix-like Systems -================================================================================ -I want to extract tar file to specific directory called /tmp/data. How can I extract a tar archive to a different directory using tar command on a Linux or Unix-like systems? - -You do not need to change the directory using cd command and extract files. Untarring a file can be done using the following syntax: - -### Syntax ### - -Typical Unix tar syntax: - - tar -xf file.name.tar -C /path/to/directory - -GNU/tar syntax: - - tar xf file.tar -C /path/to/directory - - tar xf file.tar --directory /path/to/directory - -### Example: Extract files to another directory ### - -In this example, I'm extracting $HOME/etc.backup.tar file to a directory called /tmp/data. First, you have to create the directory manually, enter: - - mkdir /tmp/data - -To extract a tar archive $HOME/etc.backup.tar into a /tmp/data, enter: - - tar -xf $HOME/etc.backup.tar -C /tmp/data - -To see a progress pass the -v option: - - tar -xvf $HOME/etc.backup.tar -C /tmp/data - -Sample outputs: - -![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 Command Extract Archive To Different Directory Command - -You can extract specific files too use: - - tar -xvf $HOME/etc.backup.tar file1 file2 file3 dir1 -C /tmp/data - -To extract a foo.tar.gz (.tgz extension file) tarball to /tmp/bar, enter: - - mkdir /tmp/bar - tar -zxvf foo.tar.gz -C /tmp/bar - -To extract a foo.tar.bz2 (.tbz, .tbz2 & .tb2 extension file) tarball to /tmp/bar, enter: - - mkdir /tmp/bar - tar -jxvf foo.tar.bz2 -C /tmp/bar - --------------------------------------------------------------------------------- - -via: http://www.cyberciti.biz/faq/howto-extract-tar-file-to-specific-directory-on-unixlinux/ - -作者：[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 \ No newline at end of file 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 new file mode 100644 index 0000000000..34923b5ec3 --- /dev/null +++ b/translated/tech/20150115 How To Extract a Tar Files To a Different Directory on a Linux or Unix-like Systems.md @@ -0,0 +1,63 @@ +如何在Linux/类Unix系统中解压tar文件到不同的目录中 +================================================================================ +我想要解压一个tar文件到一个指定的目录叫/tmp/data。我该如何在Linux或者类Unix的系统中使用tar命令解压一个tar文件到不同的目录中？ + +你不必使用cd名切换到其他的目录并解压。可以使用下面的语法解压一个文件： + +### 语法 ### + +典型Unix tar语法： + + tar -xf file.name.tar -C /path/to/directory + +GNU/tar 语法： + + tar xf file.tar -C /path/to/directory + + tar xf file.tar --directory /path/to/directory + +### 示例：解压文件到另一个文件夹中 ### + +在本例中。我解压$HOME/etc.backup.tar到文件夹/tmp/data中。首先，你需要手动创建这个目录，输入： + + mkdir /tmp/data + +要解压$HOME/etc.backup.tar 到/tmp/data中，输入： + + tar -xf $HOME/etc.backup.tar -C /tmp/data + +要看到进度，使用-v选项： + + tar -xvf $HOME/etc.backup.tar -C /tmp/data + +示例输出： + +![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命令解压文件到不同的目录 + +你也可以指定解压的文件： + + tar -xvf $HOME/etc.backup.tar file1 file2 file3 dir1 -C /tmp/data + +要解压foo.tar.gz（.tgz扩展文件）包到/tmp/bar中，输入： + + mkdir /tmp/bar + tar -zxvf foo.tar.gz -C /tmp/bar + +要解压foo.tar.bz2（.tbz, .tbz2 和 .tb2 扩展文件）包到/tmp/bar中，输入： + + mkdir /tmp/bar + tar -jxvf foo.tar.bz2 -C /tmp/bar + +-------------------------------------------------------------------------------- + +via: http://www.cyberciti.biz/faq/howto-extract-tar-file-to-specific-directory-on-unixlinux/ + +作者：[nixCraft][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.cyberciti.biz/tips/about-us \ No newline at end of file From 279ea5f48922cfad3caaeaae719b50a4b9057cac Mon Sep 17 00:00:00 2001 From: Vic___ Date: Sat, 17 Jan 2015 22:44:53 +0800 Subject: [PATCH 069/215] Vic020 --- ...ps for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md b/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md index 3459775a94..c456aa6601 100644 --- a/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md +++ b/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md @@ -1,3 +1,5 @@ + Vic020 + Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04 ================================================================================ If you do a distribution upgrade from **Ubuntu** 12.04 to 14.04, the upgrade will bring among other things an important update to **Apache**, from [version 2.2][1] to version 2.4. The update brings many improvements but it may cause some errors when used with the old configuration file from 2.2. @@ -53,4 +55,4 @@ via: http://linoxide.com/linux-how-to/apache-migration-2-2-to-2-4-ubuntu-14-04/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://linoxide.com/author/adriand/ -[1]:http://httpd.apache.org/docs/2.4/ \ No newline at end of file +[1]:http://httpd.apache.org/docs/2.4/ From 1610b8f56b0f5ef07e25681a73ad32c9ea00f52b Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 18 Jan 2015 12:15:46 +0800 Subject: [PATCH 070/215] =?UTF-8?q?=E6=B8=85=E9=99=A4=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tion infects Linux systems with malware.md | 35 ----- ...nel Vulnerabilities Disclosed This Week.md | 28 ---- ...0140902 The awesomely epic guide to KDE.md | 116 --------------- .../20141021 Interview--Thomas Voß of Mir.md | 119 --------------- .../talk/20141022 FOSS and the Fear Factor.md | 131 ----------------- ...te Linux Provides Consistency by Design.md | 115 --------------- ...s Civil War--Has It Really Come to This.md | 136 ------------------ ...141222 A brief history of Linux malware.md | 92 ------------ ...Solomon Hykes to Devs--Have It Your Way.md | 102 ------------- 9 files changed, 874 deletions(-) delete mode 100644 sources/news/20141211 Turla espionage operation infects Linux systems with malware.md delete mode 100644 sources/news/20141219 New 64-bit Linux Kernel Vulnerabilities Disclosed This Week.md delete mode 100644 sources/talk/20140902 The awesomely epic guide to KDE.md delete mode 100644 sources/talk/20141021 Interview--Thomas Voß of Mir.md delete mode 100644 sources/talk/20141022 FOSS and the Fear Factor.md delete mode 100644 sources/talk/20141024 Calculate Linux Provides Consistency by Design.md delete mode 100644 sources/talk/20141030 Debian's Civil War--Has It Really Come to This.md delete mode 100644 sources/talk/20141222 A brief history of Linux malware.md delete mode 100644 sources/talk/20141223 Docker CTO Solomon Hykes to Devs--Have It Your Way.md diff --git a/sources/news/20141211 Turla espionage operation infects Linux systems with malware.md b/sources/news/20141211 Turla espionage operation infects Linux systems with malware.md deleted file mode 100644 index b6ac36c4e8..0000000000 --- a/sources/news/20141211 Turla espionage operation infects Linux systems with malware.md +++ /dev/null @@ -1,35 +0,0 @@ -Turla espionage operation infects Linux systems with malware -================================================================================ -![](http://images.techhive.com/images/article/2014/12/open-source-linux-100533457-primary.idge.jpg) - -> A newly identified Linux backdoor program is tied to the Turla cyberespionage campaign, researchers from Kaspersky Lab said - -A newly discovered malware program designed to infect Linux systems is tied to a sophisticated cyberespionage operation of Russian origin dubbed Epic Turla, security researchers found. - -The Turla campaign, also known as Snake or Uroburos, [was originally uncovered in February][1], but goes back several years. The massive operation infected computers at government organizations, embassies, military installations, education and research institutions and pharmaceutical companies in over 45 countries. - -The newly identified Turla component for Linux was uploaded recently to a multi-engine antivirus scanning service and was described by security researchers from antivirus vendor Kaspersky Lab as "a previously unknown piece of a larger puzzle." - -"So far, every single Turla sample we've encountered was designed for the Microsoft Windows family, 32 and 64 bit operating systems," the Kaspersky researchers said Monday in a [blog post][2]. "The newly discovered Turla sample is unusual in the fact that it's the first Turla sample targeting the Linux operating system that we have discovered." - -The Turla Linux malware is based on an open-source backdoor program called cd00r developed in 2000. It allows attackers to execute arbitrary commands on a compromised system, but doesn't require elevated privileges or root access to function and listens to commands received via hidden TCP/UDP packets, making it stealthy. - -"It can't be discovered via netstat, a commonly used administrative tool," said the Kaspersky researchers, who are still analyzing the malware's functionality. - -"We suspect that this component was running for years at a victim site, but do not have concrete data to support that statement just yet," they said. - -Since their blog post Monday, the Kaspersky researchers also found a second Turla Linux component that appears to be a separate malware program. - --------------------------------------------------------------------------------- - -via: http://www.computerworld.com/article/2857129/turla-espionage-operation-infects-linux-systems-with-malware.html - -作者：[Lucian Constantin][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.computerworld.com/author/Lucian-Constantin/ -[1]:http://news.techworld.com/security/3505688/invisible-russian-cyberweapon-stalked-us-and-ukraine-since-2005-new-research-reveals/ -[2]:https://securelist.com/blog/research/67962/the-penquin-turla-2/ diff --git a/sources/news/20141219 New 64-bit Linux Kernel Vulnerabilities Disclosed This Week.md b/sources/news/20141219 New 64-bit Linux Kernel Vulnerabilities Disclosed This Week.md deleted file mode 100644 index cb0c2b0b61..0000000000 --- a/sources/news/20141219 New 64-bit Linux Kernel Vulnerabilities Disclosed This Week.md +++ /dev/null @@ -1,28 +0,0 @@ -New 64-bit Linux Kernel Vulnerabilities Disclosed This Week -================================================================================ -![](http://www.phoronix.com/assets/categories/linuxkernel.jpg) - -For those that didn't hear the news yet, multiple Linux x86_64 vulnerabilities were made public this week. - -With CVE-2014-9322 that's now public, there's a local privilege escalation issue affecting all kernel versions prior to Linux 3.17.5. CVE-2014-9322 is described as "privilege escalation due to incorrect handling of a #SS fault caused -by an IRET instruction. In particular, if IRET executes on a writeable kernel stack (this was always the case before 3.16 and is sometimes the case on 3.16 and newer), the assembly function general_protection will execute with the user's gsbase and the kernel's gsbase swapped. This is likely to be easy to exploit for privilege escalation, except on systems with SMAP or UDEREF. On those systems, assuming that the mitigation works correctly, the impact of this bug may be limited to massive memory corruption and an eventual crash or reboot." - -Fortunately, it's fixed [in Linux kernel Git since late November][1]. CVE-2014-9322 is linked to CVE-2014-9090, which is also corrected by the fixes in Git. - -There's also two x86_64 kernel bugs related to espfix. "The next two bugs are related to espfix. The IRET instruction has IMO a blatant design flaw: IRET to a 16-bit user stack segment will leak bits 31:16 of the kernel stack pointer. This flaw exists on 32-bit and 64-bit systems. 32-bit Linux kernels have mitigated this leak for a long time, and 64-bit Linux kernels have mitigated this leak since 3.16. The mitigation is called espfix." - -Fixes for CVE-2014-8133 and CVE-2014-8134 are in KVM and Linux kernel Git as of a few days ago. More details on these x86_64 vulnerabilities via [this oss-sec posting][2]. These issues were uncovered by Andy Lutomirski at AMA Capital Management. - --------------------------------------------------------------------------------- - -via: http://www.phoronix.com/scan.php?page=news_item&px=MTg2NzY - -作者：[Michael Larabel][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.michaellarabel.com/ -[1]:https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/x86/kernel/entry_64.S?id=6f442be2fb22be02cafa606f1769fa1e6f894441 -[2]:http://seclists.org/oss-sec/2014/q4/1052 \ No newline at end of file diff --git a/sources/talk/20140902 The awesomely epic guide to KDE.md b/sources/talk/20140902 The awesomely epic guide to KDE.md deleted file mode 100644 index 50da2c40ff..0000000000 --- a/sources/talk/20140902 The awesomely epic guide to KDE.md +++ /dev/null @@ -1,116 +0,0 @@ -The awesomely epic guide to KDE -================================================================================ -**Everything you ever wanted to know about KDE (but were too afraid of the number of possible solutions to ask).** - -Desktops on Linux. They’re a concept completely alien to users of other operating systems because they never having to think about them. Desktops must feel like the abstract idea of time to the Amondawa tribe, a thought that doesn’t have any use until you’re in a different environment. But here it is – on Linux you don’t have to use the graphical environment lurking beneath your mouse cursor. You can change it for something completely different. If you don’t like windows, switch to xmonad. If you like full-screen apps, try Gnome. And if you’re after the most powerful and configurable point-and-click desktop, there’s KDE. - -KDE is wonderful, as they all are in their own way. But in our opinion, KDE in particular suffers from poor default configuration and a rather allusive learning curve. This is doubly frustrating, firstly because it has been quietly growing more brilliant over the last couple of years, and secondly, because KDE should be the first choice for users unhappy with their old desktop – in particular, Windows 8 users pining for an interface that makes sense. - -But fear not. We’re going to use a decade’s worth of KDE firefighting to bring you the definitive guide to making KDE look good and function slightly more like how you might expect it to. We’re not going to look at KDE’s applications, other than perhaps Dolphin; we’re instead going to look at the functionality in the desktop environment itself. And while our guinea pig distribution is going to be Mageia, this guide will be equally applicable to any recent KDE desktop running from almost any distribution, so don’t let the default Mageia background put you off. - -### Fonts ### - -A great first target for getting your system looking good is its selection of fonts. It used to be the case that many of us would routinely copy fonts across from a Windows installation, getting the professional Ariel and Helvetica font rendering that was missing from Linux at the time. But thanks to generic quality fonts such as DejaVu and Nimbus Sans/Roman, this isn’t a problem any more. But it’s still worth finding a font you prefer, as there are now so many great alternatives to choose between. - -The best source of free fonts we’ve found is [www.fontsquirrel.com][1] – it hosts the Roboto, Roboto Slab (Hello!) and Roboto Condensed (Hello!) typefaces used throughout our magazine, and also on the Nexus 5 smartphone (Roboto was developed for use in the Ice Cream Sandwich version of the Android mobile operating system). - -TrueType fonts, with their **.ttf** file extensions, are incredibly easy to install from KDE. Download the zip file, right-click and select something from the Extract menu. Now all you need to do is drag a selection across the TrueType fonts you want to install and select ‘Install’ from the right-click Actions menu. KDE will take care of the rest. - -Another brilliant thing about KDE is that you can change all the fonts at once. Open the System Settings panel and click on Application Appearances, followed by the fonts tab, and click on Adjust All Fonts. Now just select a font from the requester. Most KDE applications will update with your choice immediately, while other applications, such as Firefox, will require a restart. Either way, it’s a quick and effective way of experimenting with your desktop’s usability and appearance. We’d recommend either Open Sans or the thinner Aller fonts. - -![Most distributions don’t include decent fonts. But KDE enables you to quickly install new ones and apply them to your desktop.](http://www.linuxvoice.com/wp-content/uploads/2014/09/kde-4.png) -Most distributions don’t include decent fonts. But KDE enables you to quickly install new ones and apply them to your desktop. - -### Eye candy ### - -One of KDE’s most secret features is that backgrounds can be dynamic. We don’t find much use for this when it comes to the desktops that tells us the weather outside the window, but we do like backgrounds that dynamically grab images from the internet. With most distributions you’ll need to install something for this to work. Just search for **plasma-wallpaper** in your distribution’s package manager. Our favourite is **plasma-wallpaper-potd**, as this installs easy access to update-able wallpaper images from a variety of sources. - -Changing a desktop background is easy with KDE, but it’s not intuitive. Mageia, for example, defaults to using ‘Folder’ view, as this is closer to the traditional desktop where files from the Desktop folder in your home directory are displayed on the background, and the whole desktop works like a file manager. Right-click and select ‘Folder Settings’ if this is the view you’re using. Alternatively, KDE defaults to ‘Desktop’, where the background is clear apart from any widgets you add yourself, and files and folders are considered links to the sources. The menu item in this mode is labelled Desktop Settings. The View Configuration panel that changes the background is the same, however, and you need to make your changes in the Wallpaper drop-down menu. We’d recommend Picture Of The Day as the wallpaper, and the Astronomy Picture Of The Day as the image source. - -Another default option we think is crazy is the blue glow that surrounds the active window. While every other desktop uses a slightly deeper drop-shadow, KDE’s active window looks like it’s bathed in radioactive light. The solution to this lies in the default theme, and this can be changed by going to KDE’s System Settings control panel and selecting Workspace Appearance. On the first page, which is labelled Window Decorations, you’ll find that Oxygen is nearly always selected, and it’s this theme that contains the option to change the blue glow. Just click on the Configure Decoration button, flip to the Shadows tab and disable Active Window Glow’. Alternatively, if you’d like active windows to have a more pronounced shadow, change the inner and outer colours to black. - -You may have seen the option to download wallpapers, for example, from within a KDE window, and you can see this now by clicking on the Get New Decorations button. Themes are subjective, but our favourite combination is currently the Chrome window decoration (it looks identical to Google’s default theme for its browser) with the Aya desktop theme. The term ‘desktop theme’ is a bit of a misnomer, as it doesn’t encapsulate every setting as you might expect. Instead it controls how generic desktop elements are rendered. The most visible of these elements is the launch panel, and changing the desktop theme will usually have a dramatic effect on its appearance, but you’ll also notice a difference in the widgets system. - -The final graphical flourish we’d suggest is to change the icon set that KDE uses. There’s nothing wrong with the default Oxygen set, but there are better options. Unfortunately, this is where the ‘Get New Themes’ download option often fails, probably because icon packages are large and can overwhelm the personal storage space often reserved for projects like these. We’d suggest going to [kde-look.org][2] and browsing its icon collections. Open up the Icons panel from KDE’s System Settings, click on the Icons tab followed by Install Theme File and point the requester at the location of the archive you just downloaded. KDE will take it from there and add the icon set to the list in the panel. Try Kotenza for a flat theme, or keep an eye on Nitrux development. - -![Remove the blue glow and change a few of the display options, and KDE starts to look pretty good in our opinion.](http://www.linuxvoice.com/wp-content/uploads/2014/09/kde-5.png) -Remove the blue glow and change a few of the display options, and KDE starts to look pretty good in our opinion. - -### The panel ### - -Our next target is going to be the panel at the bottom of the screen. This has become a little dated, especially if you’re using KDE on a large or high-resolution display, so our first suggestion is to re-scale and centre it for your screen. The key to moving screen components in KDE is making sure they’re unlocked, and this accomplished by right-clicking on the ‘plasma’ cashew in the top-right of the display where the current activity is listed. Only when widgets are unlocked can you re-size the panel, and even add new applications from the launch menu. - -With widgets unlocked, click on the cashew on the side of the panel followed by More Settings and select Centre for panel alignment. With this enabled you can re-size the panel using the sliders on either side and the panel itself will always stay in the middle of your screen. Just pretend you’re working on indentation on a word processor and you’ll get the idea. You can also change its height when the sliders are visible by dragging the central height widget, and to the left of this, you can drag the panel to a different edge on your screen. The top edge works quite well, but many of KDE’s applets don’t work well when stacked vertically on the left or right edges of the display. - -There are two different kinds of task manager applets that come with KDE. The default displays each running application as a title bar in the panel, but this takes up quite a bit of space. The alternative task manager displays only the icon of the application, which we think is much more useful. Mageia defaults to the icon version, but most others – and KDE itself – prefer the title bar applet. To change this, click on the cashew again and hover over the old applet so that the ‘X’ appears, then click on this ‘X’ to remove the applet from the panel. Now click on Add Widgets, find the two task managers and drag the icon version on to your panel. You can re-arrange any other applets in this mode by dragging them to the left and right. - -By default, the Icon-Only task manager will only display icons for tasks running on the current desktop, which we think is counterintuitive, as it’s more convenient to see all of the applications you may have running and to quickly switch between whatever desktops on which they may be running with a simple click. To change this behaviour, right-click on the applet and select the Settings menu option and the Behaviour tab in the next window. Deselect ‘Only Show Tasks From The Current Desktop’, and perhaps ‘Only Show Tasks From The Current Activity’ if you use KDE’s activities. - -Another alteration we like to make is to reconfigure the virtual desktops applet from showing four desktops as a 2×2, which doesn’t look too good on a small panel, to 4×1. This can be done by right-clicking on the applet, selecting Pager Settings and then clicking on the Virtual Desktops tabs and changing the number of rows to ‘1’. - -Finally, there’s the launch menu. Mageia has switched this from the new style of application launcher to the old style originally seen in Microsoft Windows. We prefer the former because of its search field, but the two can be switched by right-clicking the icon and selecting the Switch To… menu option. - -If you find the hover-select action of this mode annoying, where moving the mouse over one of the categories automatically selects it, you can disable it by right-clicking on the launcher, selecting Launcher Settings from the menu and disabling ‘Switch Tabs On Hover’ from the General settings page. It’s worth reiterating that many of these menu options are only available when widgets are unlocked, so don’t despair if you don’t see the correct menu entry at first. - -> ### Activities ### -> -> No article on KDE would be complete without some discussion of what KDE calls Activities. In many ways, Activities are a solution waiting for a problem. They’re meta-virtual desktops that allow you to group desktop configuration and applications together. You may have an activity for photo editing, for example, or one for working and another for the internet. If you’ve got a touchscreen laptop, activities could be used to switch between an Android-style app launcher (the Search and Launch mode from the Desktop Settings panel), and the regular desktop mode. We use a single activity as a default for screenshots, for instance, while another activity switches everything to the file manager desktop mode. But the truth is that you have to understand what they are before you can find a way of using them. -> -> Some installations of KDE will include the Activity applet in the toolbar. Its red, blue and green dots can be clicked on to open the activity manager, or you can click on the Plasma cashew in the top-right and select Activities. This will open the bar at the bottom of the screen, which lists activities installed and primed on your system. Clicking on any will switch between them; as will pressing the meta key (usually the Windows key) and Tab. -> -> We’d suggest that finding a fast way to switch between activities, such as with a keyboard shortcut or with the Activity Bar widget is the key to using them more. With the Activity Manager open, clicking on Create Activity lets you either clone the current desktop, add a blank desktop or create a new activity from a list of templates. Clone works well if you want to add some default applications to the desktop for your current setup. To remove an activity, switch to another one and press the Stop and Delete buttons from the Activity Manager. - -### Upgraded launch menu ### - -You may want to look into replacing the default launch menu entirely. If you open the Add Widgets view, for instance, and search for menus, you’ll see several results. Our current favourite is called Application Launcher (QML). It provides the same kind of functionality as the default menu, but has a cleaner interface after you’ve enlarged the initial window. But if we’re being honest, we don’t use the launcher that much. We prefer to do most launching through KRunner, which is the seemingly simple requester that appears when you hold Alt+F2. - -KRunner is better than the default launcher, because you can type this shortcut from anywhere, regardless of which applications are running or where your mouse is located. When you start to type the name of the application you want to run into KRunner, you’ll see the results filtered in real time beneath the entry field – press Enter to launch the top choice. - -KRunner is capable of so much more. You can type in calculations like **=sin(90)**, for example, and see the result in real time. You can search Google with **gg**: or Wikipedia with **wp**: followed by the search terms, and add many other operations through installable modules. To make best use of this awesome KDE feature, make sure you’ve got the **plasma-addons** package installed, and search for **runner** on your distribution’s package manager. When you next launch KRunner and click on the tool icon to the left of the search bar, you’ll see a wide variety of plugins that can do all kinds of things with the text you type in. In classic KDE style, many don’t include instructions on how to use them, so here’s our breakdown of the most useful things you can do with KRunner: - -![](http://www.linuxvoice.com/wp-content/uploads/2014/09/kde-3.png) - -### File management ### - -File management may not be the most exciting subject in Linux, but it is one we all seem to spend a lot of time doing, whether that’s moving a download into a better folder, or copying photos from a camera. The old file manager, Konqueror, was one of the best reasons for using KDE in the first place, and while Konqueror has been superseded by Dolphin in KDE 4.x, it’s still knocking around – even if it is labelled a web browser. - -If you open Konqueror and enter the URL as **file:/**, it turns back into that file manager of old, with many of its best features intact. You can click on the lower status bar, for example, and split the view vertically or horizontally, into other views. You can fill the view with proportionally sized blocks by selecting Preview File Size View from the right-click menu, and preview many other file types without ever leaving Konqueror. - -Mageia uses a double-click for most options, whereas we prefer a single click. This can be changed from the System-Settings panel by opening Input Devices, clicking on Mouse and enabling ‘Single-click To Open Files And Folders’. If you’ve become used to Apple’s reverse scroll, you’ll also find an option here to reverse the scroll direction on Linux. - -Konqueror is a great application, but it hasn’t been a focus of KDE development for a considerable period of time. Dolphin has replaced it, and while this is a much simplified file manager, it does inherit some of Konqueror’s best features. You can still split the view, for instance, albeit one only once, and only horizontally, from the toolbar. You can also view lots of metadata. Select the Details View and right-click on the column headings for the files, and you can add columns that list the word counts in text files, or an image’s size and orientation, or the artist, title and duration of an audio file, all from within the contents of the data. This is KDE’s semantic desktop in action, and it’s been growing in functionality for the last couple of years. Apple’s OS X, for example, has only just started pushing its ability to tag files and applications – we’ve been able to do this from KDE for a long time. We don’t know any other desktop that comes close to providing that level of control. - -### Window management ### - -KDE has a comprehensive set of windowing functions as well as graphical effects. They’re all part of the window manager, KWin, rather than the desktop, which is what we’ve been dealing with so far. It’s the window manager’s job to handle the positioning, moving and rendering of your windows, which is why they can be replaced without switching the whole desktop. You might want to try KWin on the RazorQt desktop, for example, to get the best of both the minimal environment RazorQt offers and the power of KDE’s window manager. - -The easiest way to get to KWin’s configuration settings is to right-click on the title bar of any window (this is usually the most visible element of any window manager), and select Window Manager Settings from the More Actions menu. - -The Task Switcher is the tool that appears when you press Alt+Tab, and continually pressing those two keys will switch between all running applications on the current desktop. You can also use cursor keys to move left and right through the list. These settings are mostly sensibly configured, but you may want to include All Other Desktops in the Filter Windows By section, as that will allow you to quickly switch to applications running on other desktops. We also like the Cover Switch visualisation rather than the Thumbnails view, and you can even configure the perceived distance of the windows by clicking on the toolbar icon. - -The next page on the window manager control module handles what happens at the edges of your screen. At the very least, we prefer to enable Switch Desktop On Edge by selecting Only When Moving Windows from the drop-down list. This means that when you drag a window to one edge, the virtual desktop will switch beneath, effectively dragging the window on to a new virtual desktop. - -The great thing about enabling this only for dragged windows is that it doesn’t interfere with KDE’s fantastic window snapping feature. When you drag a window close to the left or right edge, for instance, KDE displays a ghosted window where your window will snap to if you release the mouse. This is a great way of turning KDE into a tiling window manager, where you can easily have two windows split down the middle of the screen area. Moving a window into any of the corners will also give you the ability to neatly arrange your windows to occupy a quarter of the screen, which is ideal for large displays. - -We also enable a mode similar to Mission Control on OS X when the cursor is in the region of the top-left corner of the screen. On the screen edge layout, click on the dot in the top-right of the screen (or any other point you’d prefer) and select Desktop Grid from the drop-down menu that appears. Now when you move to the top-right of your display, you’ll get an overview of all your virtual desktops, any of which can be chosen with a click. - -Two pages down in the configuration module, there’s a page called Focus. This is an old idea where you can change whether a window becomes active when you click on it, or when you roll your mouse cursor over it. KDE adds another twist to this by providing a slider that progresses from click to a strict hover policy, where the window under the cursor always becomes active. We prefer to use one of the middle options – Focus Follows Mouse – as this chooses the most obvious window to activate for us without making too many mistakes, and it means we seldom click to focus. We also reduce the focus delay to 200ms, but this will depend on how you feel about the feature after using it for a while. - -KDE has so many features, many of which only come to light when you start to use the desktop. It really is a case of developers often adding things and then telling no one. But we feel KDE is worth the effort, and unlikely some other desktops, is unlikely to change too much in the transition from 4.x to 5. That means the time you spend learning how to use KDE now is an investment. Dive in!. - -![KDE visual effects (click for larger)](http://www.linuxvoice.com/wp-content/uploads/2014/09/kde-1.png) -KDE visual effects (click for larger) - --------------------------------------------------------------------------------- - -via: http://www.linuxvoice.com/desktops/ - -作者：[Ben Everard][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.linuxvoice.com/author/ben_everard/ -[1]:http://www.fontsquirrel.com/ -[2]:http://kde-look.org/ \ No newline at end of file diff --git a/sources/talk/20141021 Interview--Thomas Voß of Mir.md b/sources/talk/20141021 Interview--Thomas Voß of Mir.md deleted file mode 100644 index be5271b66e..0000000000 --- a/sources/talk/20141021 Interview--Thomas Voß of Mir.md +++ /dev/null @@ -1,119 +0,0 @@ -Interview: Thomas Voß of Mir -================================================================================ -**Mir was big during the space race and it’s a big part of Canonical’s unification strategy. We talk to one of its chief architects at mission control.** - -Not since the days of 2004, when X.org split from XFree86, have we seen such exciting developments in the normally prosaic realms of display servers. These are the bits that run behind your desktop, making sure Gnome, KDE, Xfce and the rest can talk to your graphics hardware, your screen and even your keyboard and mouse. They have a profound effect on your system’s performance and capabilities. And where we once had one, we now have two more – Wayland and Mir, and both are competing to win your affections in the battle for an X replacement. - -We spoke to Wayland’s Daniel Stone in issue 6 of Linux Voice, so we thought it was only fair to give equal coverage to Mir, Canonical’s own in-house X replacement, and a project that has so far courted controversy with some of its decisions. Which is why we headed to Frankfurt and asked its Technical Architect, Thomas Voß, for some background context… - -![](http://www.linuxvoice.com/wp-content/uploads/2014/10/voss_1.jpg) - -**Linux Voice: Let’s go right back to the beginning, and look at what X was originally designed for. X solved the problems that were present 30 years ago, where people had entirely different needs, right?** - -**Thomas Voß**: It was mainframes. It was very expensive mainframe computers with very cheap terminals, trying to keep the price as low as possible. And one of the first and foremost goals was: “Hey, I want to be able to distribute my UI across the network, ideally compressed and using as little data as possible”. So a lot of the decisions in X were motivated by that. - -A lot of the graphics languages that X supports even today have been motivated by that decision. The X developers started off in a 2D world; everything was a 2D graphics language, the X way of drawing rectangles. And it’s present today. So X is not necessarily bad in that respect; it still solves a lot of use cases, but it’s grown over time. - -One of the reasons is that X is a protocol, in essence. So a lot of things got added to the protocol. The problem with adding things to a protocol is that they tend to stick. To use a 2D graphics language as an example, XVideo is something that no-one really likes today. It’s difficult to support and the GPU vendors actually cry out in pain when you start talking about XVideo. It’s somewhat bloated, and it’s just old. It’s an old proven technology – and I’m all for that. I actually like X for a lot of things, and it was a good source of inspiration. But then when you look at your current use cases and the current setup we are in, where convergence is one of the buzzwords – massively overrated obviously – but at the heart of convergence lies the fact that you want to scale across different form factors. - -**LV: And convergence is big for Canonical isn’t it?** - -**Thomas**: It’s big, I think, for everyone, especially over time. But convergence is a use case that was always of interest to us. So we always had this idea that we want one codebase. We don’t want a situation like Apple has with OS X and iOS, which are two different codebases. We basically said “Look, whatever we want to do, we want to do it from one codebase, because it’s more efficient.” We don’t want to end up in the situation where we have to be maintaining two, three or four separate codebases. - -That’s where we were coming from when we were looking at X, and it was just too bloated. And we looked at a lot of alternatives. We started looking at how Mac OS X was doing things. We obviously didn’t have access to the source code, but if you see the transition from OS 9 to OS X, it was as if they entirely switched to one graphics language. It was pre-PostScript at that time. But they chose one graphics language, and that’s it. From that point on, when you choose a graphics language, things suddenly become more simple to do. Today’s graphics language is EGL ES, so there was inspiration for us to say we were converged on GL and EGL. From our perspective, that’s the least common denominator. - -> We basically said: whatever we want to do, we want to do it from one codebase, because it’s more efficient. - -Obviously there are disadvantages to having only one graphics language, but the benefits outweigh the disadvantages. And I think that’s a common theme in the industry. Android made the same decision to go that way. Even Wayland to a certain degree has been doing that. They have to support EGL and GL, simply because it’s very convenient for app developers and toolkit developers – an open graphics language. That was the part that inspired us, and we wanted to have this one graphics language and support it well. And that takes a lot of craft. - -So, once you can say: no more weird 2D API, no more weird phong API, and everything is mapped out to GL, you’re way better off. And you can distill down the scope of the overall project to something more manageable. So it went from being impossible to possible. And then there was me, being very opinionated. I don’t believe in extensibility from the beginning – traditionally in Linux everything is super extensible, which has got benefits for a certain audience. - -If you think about the audience of the display server, it’s one of the few places in the system where you’ve got three audiences. So you’ve got the users, who don’t care, or shouldn’t care, about the display server. - -**LV: It’s transparent to them.** - -**Thomas**: Yes, it’s pixels, right? That’s all they care about. It should be smooth. It should be super nice to use. But the display server is not their main concern. It obviously feeds into a user experience, quite significantly, but there are a lot of other parts in the system that are important as well. - -Then you’ve got developers who care about the display server in terms of the API. Obviously we said we want to satisfy this audience, and we want to provide a super-fast experience for users. It should be rock solid and stable. People have been making fun of us and saying “yeah, every project wants to be rock solid and stable”. Cool – so many fail in doing that, so let’s get that down and just write out what we really want to achieve. - -And then you’ve got developers, and the moment you expose an API to them, or a protocol, you sign a contract with them, essentially. So they develop to your API – well, many app developers won’t directly because they’ll be using toolkits – but at some point you’ve got developers who sign up to your API. - -![](http://www.linuxvoice.com/wp-content/uploads/2014/10/voss_3.jpg) - -**LV: The developers writing the toolkits, then?** - -**Thomas**: We do a lot of work in that arena, but in general it’s a contract that we have with normal app developers. And we said: look, we don’t want the API or contract to be super extensible and trying to satisfy every need out there. We want to understand what people really want to do, and we want to commit to one API and contract. Not five different variants of the contract, but we want to say: look, this is what we support and we, as Canonical and as the Mir maintainers, will sign up to. - -So I think that’s a very good thing. You can buy into specific shells sitting on top of Mir, but you can always assume a certain base level of functionality that we will always provide in terms of window management, in terms of rendering capabilities, and so on and so forth. And funnily enough, that also helps with convergence. Because once you start thinking about the API as very important, you really start thinking about convergence. And what happens if we think about form factor and we transfer from a phone to a tablet to a desktop to a fridge? - -**LV: And whatever might come!** - -**Thomas**: Right, right. How do we account for future developments? And we said we don’t feel comfortable making Mir super extensible, because it will just grow. Either it will just grow and grow, or you will end up with an organisation that just maintains your protocol and protocol extensions. - -**LV: So that’s looking at Mir in relation to X. The obvious question is comparing Mir to Wayland – so what is it that Mir does, that Wayland doesn’t?** - -**Thomas**: This might sound picky, but we have to distinguish what Wayland really is. Wayland is a protocol specification which is interesting because the value proposition is somewhat difficult. You’ve got a protocol and you’ve got a reference implementation. Specifically, when we started, Weston was still a test bed and everything being developed ended up in there. - -No one was buying into that; no one was saying, “Look, we’re moving this to production-level quality with a bona fide protocol layer that is frozen and stable for a specific version that caters to application authors”. If you look at the Ubuntu repository today, or in Debian, there’s Wayland-cursor-whatever, so they have extensions already. So that’s a bit different from our approach to Mir, from my perspective at least. - -There was this protocol that the Wayland developers finished and back then, before we did Mir and I looked into all of this, I wrote a Wayland compositor in Go, just to get to know things. - -**LV: As you do!** - -**Thomas**: And I said: you know, I don’t think a protocol is a good way of approaching this because versioning a protocol in a packaging scenario is super difficult. But versioning a C API, or any sort of API that has a binary stability contract, is way easier and we are way more experienced at that. So, in that respect, we are different in that we are saying the protocol is an implementation detail, at least up to a certain point. - -I’m pretty sure for version 1.0, which we will call a golden release, we will open up the protocol for communication purposes. Under the covers it’s Google buffers and sockets. So we’ll say: this is the API, work against that, and we’re committed to it. - -That’s one thing, and then we said: OK, there’s Weston, but we cannot use Weston because it’s not working on Android, the driver model is not well defined, and there’s so much work that we would have to do to actually implement a Wayland compositor. And then we are in a situation where we would have to cut out a set of functionality from the Wayland protocol and commit to that, no matter what happens, and ultimately that would be a fork, over time, right?. - -**LV: It’s a difficult concept for many end users, who just want to see something working.** - -**Thomas**: Right, and even from a developer’s perspective – and let’s jump to the political part – I find it somewhat difficult to have a party owning a protocol definition and another party building the reference implementations. Now, Gnome and KDE do two different Wayland compositors. I don’t see the benefit in that, to be quite frank, so the value proposition is difficult to my mind. - -The driver model in Mir and Wayland is ultimately not that different – it’s GL/EGL based. That is kind of the denominator that you will find in both things, which is actually a good thing, because if you look at the contract to application developers and toolkit developers, most of them don’t want Mir or Wayland. They talk ELG and GL, and at that point, it’s not that much of a problem to support both. - -> If there had been a full reference implementation of Wayland, our decision might have been different. - -So we did this work for porting the Chromium browser to Mir. We actually took the Chromium Wayland back-end, factored out all the common pieces to EGL and GL ES, and split it up into Wayland and Mir. - -And I think from a user’s or application developer’s perspective, the difference is not there. I think, in retrospect, if there would have been something like a full reference implementation of Wayland, where a company had signed up to provide something that is working, and committed to a certain protocol version, our decision might have been different. But there just wasn’t. It was five years out there, Wayland, Wayland, Wayland, and there was nothing that we could build upon. - -**LV: The main experience we’ve had is with RebeccaBlackOS, which has Weston and Wayland, because, like you say, there’s no that much out there running it.** - -**Thomas**: Right. I find Wayland impressive, obviously, but I think Mir will be significantly more relevant than Wayland in two years time. We just keep on bootstrapping everything, and we’ve got things working across multiple platforms. Are there issues, and are there open questions to solve? Most likely. We never said we would come up with the perfect solution in version 1. That was not our goal. I don’t think software should be built that way. So it just should be iterated. - -![](http://www.linuxvoice.com/wp-content/uploads/2014/10/voss_2.jpg) - -**LV: When was Mir originally planned for? Which Ubuntu release? Because it has been pushed back a couple of times.** - -**Thomas**: Well, we originally planned to have it by 14.04. That was the kind of stretch goal, because it highly depends on the availability of proprietary graphics drivers. So you can’t ship an LTS [Long Term Support] release of Ubuntu on a new display server without supporting the hardware of the big guys. - -**LV: We thought that would be quite ambitious anyway – a Long Term Support release with a whole new display server!** - -**Thomas**: Yes, it was ambitious – but for a reason. If you don’t set a stretch goal, and probably fail in reaching it, and then re-evaluate how you move forward, it’s difficult to drive a project. So if you just keep it evolving and evolving and evolving, and you don’t have a checkpoint at some point… - -**LV: That’s like a lot of open source projects. Inkscape is still on 0.48 or something, and it works, it’s reliable, but they never get to 1.0. Because they always say: “Oh let’s add this feature, and that feature”, and the rest of us are left thinking: just release 1.0 already!.** - -**Thomas**: And I wouldn’t actually tie it to a version number. To me, that is secondary. To me, the question is whether we call this ready for broad public consumption on all of the hardware versions we want to support? - -In Canonical, as a company, we have OEM contracts and we are enabling Ubuntu on a host of devices, and laptops and whatever, so we have to deliver on those contracts. And the question is, can we do that? No. Well, you never like a ‘no’. - -> The question is whether we call this ready for broad public consumption on the hardware we want to support. - -Usually, when you encounter a problem and you tackle it, and you start thinking how to solve the problem, that’s more beneficial than never hearing a no. That’s kind of what we were aiming for. Ubuntu 14.04 was a stretch goal – everyone was aware of that and we didn’t reach it. Fine, cool. Let’s go on. - -So how do we stage ourself for the next cycle, until an LTS? Now we have this initiative where we have a daily testable image with Unity 8 and Mir. It’s not super usable because it’s just essentially the tethered UI that you are seeing there, but still it’s something that we didn’t have a year ago. And for me, that’s a huge gain. - -And ultimately, before we can ship something, before any new display server can ship in an LTS release, you need to have buy-in from the GPU vendors. That’s what you need. - --------------------------------------------------------------------------------- - -via: http://www.linuxvoice.com/interview-thomas-vos-of-mir/ - -作者：[Mike Saunders][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.linuxvoice.com/author/mike/ \ No newline at end of file diff --git a/sources/talk/20141022 FOSS and the Fear Factor.md b/sources/talk/20141022 FOSS and the Fear Factor.md deleted file mode 100644 index e8dd265b87..0000000000 --- a/sources/talk/20141022 FOSS and the Fear Factor.md +++ /dev/null @@ -1,131 +0,0 @@ -FOSS and the Fear Factor -================================================================================ -![](http://www.linuxinsider.com/ai/181807/foss-open-source-security.jpg) - -> "'Many eyes' is a complete and total myth," said SoylentNews' hairyfeet. "I bet my last dollar that if you looked at every.single.package. that makes up your most popular distros and then looked at how many have actually downloaded the source for those various packages, you'd find that there is less than 30 percent ... that are downloaded by anybody but the guys that actually maintain the things." - -In a world that's been dominated for far too long by the [Systemd Inferno][1], Linux fans will have to be forgiven if they seize perhaps a bit too gleefully upon the scraps of cheerful news that come along on any given day. - -Of course, for cheerful news, there's never any better place to look than the [Reglue][2] effort. Run by longtime Linux advocate and all-around-hero-for-kids Ken Starks, as alert readers [may recall][3], Reglue just last week launched a brand-new [fundraising effort][4] on Indiegogo to support its efforts over the coming year. - -Since 2005, Reglue has placed more than 1,600 donated and then refurbished computers into the homes of financially disadvantaged kids in Central Texas. Over the next year, it aims to place 200 more, as well as paying for the first 90 days of Internet connection for each of them. - -"As overused as the term is, the 'Digital Divide' is alive and well in some parts of America," Starks explained. "We will bridge that divide where we can." - -How's that for a heaping helping of hope and inspiration? - -### Windows as Attack Vector ### - -![](http://www.linuxinsider.com/images/article_images/linuxgirl_bg_pinkswirl_150x245.jpg) - -Offering discouraged FOSS fans a bit of well-earned validation, meanwhile -- and perhaps even a bit of levity -- is the news that Russian hackers apparently have begun using Windows as a weapon against the rest of the world. - -"Russian hackers use Windows against NATO" is the [headline][5] over at Fortune, making it plain for all the world to see that Windows isn't the bastion of security some might say it is. - -The sarcasm is [knee-deep][6] in the comments section on Google+ over that one. - -### 'Hackers Shake Confidence' ### - -Of course, malicious hacking is no laughing matter, and the FOSS world has gotten a bitter taste of the effects for itself in recent months with the Heartbleed and Shellshock flaws, to name just two. - -Has it been enough to scare Linux aficionados away? - -That essentially is [the suggestion][7] over at Bloomberg, whose story, entitled "Hackers Shake Confidence in 1980s Free Software Idealism," has gotten more than a few FOSS fans' knickers in a twist. - -### 'No Software Is Perfect' ### - -"None of this has shaken my confidence in the slightest," asserted [Linux Rants][8] blogger Mike Stone down at the blogosphere's Broken Windows Lounge, for instance. - -"I remember a time when you couldn't put a Windows machine on the network without firewall software or it would be infected with viruses/malware in seconds," he explained. "I don't recall the articles claiming that confidence had been shaken in Microsoft. - -"The fact of the matter is that no software is perfect, not even FOSS, but it comes closer than the alternatives," Stone opined. - -### 'My Faith Is Just Fine' ### - -"It is hard to even begin to get into where the Bloomberg article fails," began consultant and [Slashdot][9] blogger Gerhard Mack. - -"For one, decompilers have existed for ages and allow black hats to find flaws in proprietary software, so the black-hats can find problems but cannot admit they found them let alone fix them," Mack explained. "Secondly, it has been a long time since most open source was volunteer-written, and most contributions need to be paid. - -"The author goes on to rip into people who use open source for not contributing monetarily, when most of the listed companies are already Linux Foundation members, so they are already contributing," he added. - -In short, "my faith in open source is just fine, and no clickbait Bloomberg article will change that," Mack concluded. - -### 'The Author Is Wrong' ### - -"Clickbait" is also the term Google+ blogger Alessandro Ebersol chose to describe the Bloomberg account. - -"I could not see the point the author was trying to make, except sensationalism and views," he told Linux Girl. - -"The author is wrong," Ebersol charged. "He should educate himself on the topic. The flaws are results of lack of funding, and too many corporations taking advantage of free software and giving nothing back." - -Moreover, "I still believe that a piece of code that can be studied and checked by many is far more secure than a piece made by a few," Google+ blogger Gonzalo Velasco C. chimed in. - -"All the rumors that FLOSS is as weak as proprietary software are only [FUD][10] -- period," he said. "It is even more sad when it comes from private companies that drink in the FLOSS fountain." - -### 'Source Helps Ensure Security' ### - -Chris Travers, a [blogger][11] who works on the [LedgerSMB][12] project, had a similar view. - -"I do think that having the source available helps ensure security for well-designed, well-maintained software," he began. - -"Those of us who do development on such software must necessarily approach the security process under a different set of constraints than proprietary vendors do," Travers explained. - -"Since our code changes are public, when we release a security fix this also provides effectively full disclosure," he said, "ensuring that the concerns for unpatched systems are higher than they would be for proprietary solutions absent full disclosure." - -At the same time, "this disclosure cuts both ways, as software security vendors can use this to provide further testing and uncover more problems," Travers pointed out. "In the long run, this leads to more secure software, but in the short run it has security costs for users." - -Bottom line: "If there is good communication with the community, if there is good software maintenance and if there is good design," he said, "then the software will be secure." - -### 'Source Code Isn't Magic Fairy Dust' ### - -SoylentNews blogger hairyfeet had a very different view. - -"'Many eyes' is a complete and total myth," hairyfeet charged. "I bet my last dollar that if you looked at every.single.package. that makes up your most popular distros and then looked at how many have actually downloaded the source for those various packages, you'd find that there is less than 30 percent of the packages that are downloaded by anybody but the guys that actually maintain the things. - -"How many people have done a code audit on Firefox? [LibreOffice][13]? Gimp? I bet you won't find a single one, because everybody ASSUMES that somebody else did it," he added. - -"At the end of the day, Wall Street is finding out what guys like me have been saying for years: Source code isn't magic fairy dust that makes the bugs go away," hairyfeet observed. - -### 'No One Actually Looked at It' ### - -"The problem with [SSL][14] was that everyone assumed the code was good, but almost no one had actually looked at, so you never had the 'many eyeballs' making the bugs shallow," Google+ blogger Kevin O'Brien conceded. - -Still, "I think the methodology and the idealism are separable," he suggested. "Open source is a way of writing software in which the value created for everyone is much greater than the value captured by any one entity, which is why it is so powerful. - -"The idea that corporate contributions somehow sully the purity is a stupid idea," added O'Brien. "Corporate involvement is not inherently bad; what is bad is trying to lock other people out of the value created. Many companies handle this well, such as Red Hat." - -### 'The Right Way to Do IT' ### - -Last but not least, "my confidence in FLOSS is unshaken," blogger [Robert Pogson][15] declared. - -"After all, I need software to run my computers, and as bad as some flaws are in FLOSS, that vulnerability pales into insignificance compared to the flaws in that other OS -- you know, the one that thinks images are executable and has so much complexity that no one, not even M$ with its $billions, can fix." - -FOSS is "the right way to do IT," Pogson added. "The world can and does make its own software, and the world has more and better programmers than the big corporations. - -"Those big corporations use FLOSS and should support FLOSS," he maintained, offering "thanks to the corporations who hire FLOSS programmers; sponsor websites, mirrors and projects; and who give back code -- the fuel in the FLOSS economy." - --------------------------------------------------------------------------------- - -via: http://www.linuxinsider.com/story/FOSS-and-the-Fear-Factor-81221.html - -作者：Katherine Noyes -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://www.linuxinsider.com/perl/story/80980.html -[2]:http://www.reglue.org/ -[3]:http://www.linuxinsider.com/story/78422.html -[4]:https://www.indiegogo.com/projects/deleting-the-digital-divide-one-computer-at-a-time -[5]:http://fortune.com/video/2014/10/14/russian-hackers-use-windows-against-nato/ -[6]:https://plus.google.com/+KatherineNoyes/posts/DQvRMekLHV4 -[7]:http://www.bloomberg.com/news/2014-10-14/hackers-shake-confidence-in-1980s-free-software-idealism.html -[8]:http://linuxrants.com/ -[9]:http://slashdot.org/ -[10]:http://en.wikipedia.org/wiki/Fear,_uncertainty_and_doubt -[11]:http://ledgersmbdev.blogspot.com/ -[12]:http://www.ledgersmb.org/ -[13]:http://www.libreoffice.org/ -[14]:http://en.wikipedia.org/wiki/Transport_Layer_Security -[15]:http://mrpogson.com/ \ No newline at end of file diff --git a/sources/talk/20141024 Calculate Linux Provides Consistency by Design.md b/sources/talk/20141024 Calculate Linux Provides Consistency by Design.md deleted file mode 100644 index 9d56c3b6cf..0000000000 --- a/sources/talk/20141024 Calculate Linux Provides Consistency by Design.md +++ /dev/null @@ -1,115 +0,0 @@ -Calculate Linux Provides Consistency by Design -================================================================================ -![](http://www.linuxinsider.com/ai/120560/linux-desktop-kde-xfce.jpg) - -> Calculate Linux has a rather interesting strategy for desktop environments. It is characterized by two flavors with the same look and feel. That does not mean that the inherent functionality of the KDE and Xfce desktops are compromised. Rather, the Calculate Linux developers did what you seldom see within a Linux distribution with more than one desktop option: They unified the design. - -Calculate Linux 14 is a distribution designed with home and SMB users in mind. It is optimized for rapid deployment in corporate environments as well. - -Calculate gives users something no other Linux distro makes possible. The Xfce desktop session is customized to imitate the look of the [KDE][1] desktop environment. - -This design approach goes a long way toward making Calculate Linux a one-distro-fits-all solution. Individual users or entire departments within an organization can fine-tune user preferences and features without changing the common appearance or performance. - -Calculate Linux 14, developed by Alexander Tratsevskiy in Russia, is not your typical cookie-cutter type of Linux OS. This latest version, released Sept. 5, is a rolling-release distribution that provides a number of preconfigured features. - -It uses a source-based approach to package management to optimize the software. This in part comes from its roots as a Gentoo Linux-based distribution. - -Calculate Linux comes in three more versions to expand its reach. Calculate Directory Server is for servers, and Calculate Linux Scratch for building customized systems. The Calculate Media Center is a distro to run a home multimedia center. - -### What's New ### - -This latest version of Calculate ships with a few new features, including notification of software updates and an improved administration panel. - -This release adds an improved graphical user interface for Calculate Utilities. It also provides various kernel and other software package updates. - -It comes in 32-bit or 64-bit builds that include two desktop options for personal/business use: KDE and Xfce. A boot menu lets users choose to run the Calculate live desktop environment from RAM for added performance or with a command line interface only. - -Why two choices? Users get better performance on low-end computers using the lightweight desktop environment that comes with Xfce. This is the second release containing this option. It solves the problem of not being able to run the KDE edition of Calculate Linux on underpowered hardware. - -### Designing Details ### - -Calculate Linux has a rather interesting strategy for desktop environments. It is characterized by two flavors with one common design. - -That does not mean that the inherent functionality of the KDE and Xfce desktops are compromised. Rather, the Calculate Linux developers did what you seldom see within a Linux distribution with more than one desktop option. - -Typically, KDE by design is much more animation based. By design, Xfce has fewer visual frills in keeping with its lightweight philosophy. Most KDE distributions place the panel bar at the bottom and do not have a Docky-style launcher anywhere in the desktop decor. - -In Calculate Linux, a classic style application menu, task switcher and system tray are configured at the top of the screen in both desktop versions. At the bottom of the display, there is a hidden quick-launch bar that pops up when the mouse pointer strays toward the lower edge of the screen. - -> ![](http://www.linuxinsider.com/article_images/2014/81242_990x557.jpg) -> Calculate Linux has a unified design that makes KDE and Xfce desktops look nearly the same. The panel and menu display are very nontraditional as seen in this KDE desktop view. - -This duality ties the two desktops together. Both the KDE and the Xfce versions have right-click access to some of the most commonly used system commands and features. - -### Look and Feel ### - -Whether you run the KDE or the Xfce desktops, the panel design is the same. The menu falls from the top left corner as a single box with the same categories in both versions. - -> ![](http://www.linuxinsider.com/article_images/2014/81242_990x540.jpg) -> The Xfce desktop in Calculate Linux is almost totally indistinguishable from its KDE counterpart. - -Hover the mouse over the right edge of the menu box to see the category contents slide out to the right of the box. Only then do you see a varying range of applications to launch with a click. - -The same operation governs the popup launcher bar hidden at the bottom of the screen. Some of the offerings are desktop-specific, however. - -> ![](http://www.linuxinsider.com/article_images/2014/81242_990x556.jpg) -> Calculate Linux embeds a popup launch dock in both the KDE and Xfce desktop editions. - -For example, the bottom dock in both desktop versions launches the Chromium Web browser, [LibreOffice][3], GIMP, SMPlayer and Leafpad (simple text editor). The KDE dock launches kcalc, digikam, Amarok and k3b disk burner. Xfce launches Galculator, Clementine and xfburn. - -### Designed to Differ ### - -One difference is the KDE version has an added button where expected along the upper right edge of the screen. It also has a Widgets button near the far right end of the top panel. - -These provide access to the activities layout where you choose the style of desktop typical of KDE. These are: Grid, Newspaper, Folder, Grouping and Search & Launch. - -A second style difference between the two desktop versions is the inclusion of widgets with the KDE version. These desktop widgets personalize the desktop items. - -### Feature Folly ### - -The Calculate Desktop edition, both KDE and Xfce, creates a user profile when it loads. This profile is fully integrated with Calculate Directory Server. Roaming profiles also are supported. Auto-tuning applications at logon are based on the server settings. - -The approach greatly simplifies the setup and maintenance roles for users with no IT department to support the computer system. The desktop version functions simply as a standalone operating system. No server is needed. However, enterprise and SMB environments can pair the desktop version with the server version for seamless integration. - -Either way, the common set of toolbars, desktop applications and basic settings are easier to configure for desktop and server use, regardless of the desktop environment choice. - -You can install Calculate Linux on a USB thumb drive or a USB hard drive with a choice of these volume formats: ext4, ext3, ext2, reiserfs, btrfs, xfs, jfs, nilfs2 or fat32. - -### Gentler Gentoo ### - -The Gentoo distro in its own right installs applications compiled from source. It uses a software packaging system called "Portage" to semi-automate this process. It also uses the command-line compiling system run by Emerge. - -Calculate's developers soften this Gentoo-based software compiling process somewhat, but it is still more complex than using a community-managed automated software binary repository. - -Calculate Linux is fully compatible with Gentoo repositories and support for binary repository updates. System files are updated via Portage throughout the distribution life cycle. - -### Bottom Line ### - -Calculate Linux is a well-tooled Linux distro that makes consistency in design job number one. It is highly configurable and is optimized for nearly every computing circumstance. - -It runs a full-blown KDE desktop on upper-end hardware, and provides the same look and feel with Xfce on low-end gear. Calculate Linux runs from a hard drive installation or by loading directly into RAM. - -It could offer home and SMB users an effective distro alternative. However, typical for Gentoo-based distros, Calculate Linux's weak point is the lack of a full-fledged binary software repository system. - -### Want to Suggest a Review? ### - -Is there a Linux software application or distro you'd like to suggest for review? Something you love or would like to get to know? - -Please [email your ideas to me][4], and I'll consider them for a future Linux Picks and Pans column. - -And use the Talkback feature below to add your comments! - --------------------------------------------------------------------------------- - -via: http://www.linuxinsider.com/story/Calculate-Linux-Provides-Consistency-by-Design-81242.html - -作者：Jack M. Germain -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://www.calculate-linux.org/ -[2]:http://www.kde.org/ -[3]:http://www.libreoffice.org/ -[4]:jack.germain@newsroom.ectnews.com \ No newline at end of file diff --git a/sources/talk/20141030 Debian's Civil War--Has It Really Come to This.md b/sources/talk/20141030 Debian's Civil War--Has It Really Come to This.md deleted file mode 100644 index 090ffb1f03..0000000000 --- a/sources/talk/20141030 Debian's Civil War--Has It Really Come to This.md +++ /dev/null @@ -1,136 +0,0 @@ -Debian's Civil War: Has It Really Come to This? -================================================================================ -![](http://www.linuxinsider.com/ai/254566/debian.jpg) - -**"The 'new' Debian would be rather weak," said blogger Robert Pogson. "Would it have the hundreds of mirrors that make Debian wonderful? I doubt that. Debian is a great distro. Disemboweling it out of spite is just wrong. Why can't we come to some amicable agreement? Why do we have to race at full speed to the edge of a cliff when we don't know if we can stop?"** - -Well it seems no matter how loudly we here in the Linux blogosphere try to hum a happy tune or discuss [cheerful FOSS matters][1], we just can't seem to drown out the shouts and screams coming from those standing too close to the Systemd Inferno. - -Stand back, people! It's dangerous! - -The embers, of course, [had been hot][2] for some time already before the blaze [flared sky-high][3] a few months ago. Now, the conflagration appears to be completely out of control. - -Need proof? Two words: [Debian fork][4]. - -That's right: Debian, the granddaddy of Linux distributions and embodiment of everything so many FOSS fans hold dear, may be forked, and it's apparently all because of Systemd. - -A more upsetting development would be hard to conceive. - -### 'Roll Up Your Sleeves' ### - -![](http://www.linuxinsider.com/images/article_images/linuxgirl_bg_pinkswirl_150x245.jpg) - -"Debian today is haunted by the tendency to betray its own mandate, a base principle of the Free Software movement: put the user's rights first," explained the anonymous developers behind the Debian Fork site. "What is happening now instead is that through a so-called 'do-ocracy,' developers and package maintainers are imposing their choices on users." - -Their conclusion: "Roll up your sleeves, we may need to fork Debian." - -Quick as a flash, [word traveled][5] to [Slashdot][6], [LXer][7] and beyond. - -Down at the Linux blogosphere's Punchy Penguin Saloon, a profound hush fell as soon as the news arrived. Fortunately, it lasted only a fraction of a second. - -### 'I Say Go for It' ### - -"Freedom of choice implies the freedom to be a complete idiot, and clearly Free Software has its share," Google+ blogger Kevin O'Brien said. - -"I have been skeptical about Systemd, but I have trouble believing there are enough people this crazy to actually pull off a fork of Debian," O'Brien added. "I predict a year from now we won't remember what this was all about." - -On the other hand: "I say go for it if you're that passionate about it," offered [Linux Rants][8] blogger Mike Stone. "This is Linux we're talking about, after all, and Linux is open source. Anybody should always feel free to do what they want with Linux, as long as they're willing to share. - -"The fact that SysVinit will still be available on standard Debian kind of makes forking it over Systemd seem a little silly, but I'm not going to stand in the way of anybody that wants to fork any FOSS for their own use," Stone added. - -Indeed, "Linux's strength is also its Achilles' Heel," Google+ blogger Rodolfo Saenz opined. 'In the Linux world, forking is inevitable. It is part of Linux's evolution." - -### 'A Lot of Misinformation' ### - -At the same time, "I think if they were likely to actually fork Debian, they would have just gone and done it rather than throw a massive public temper tantrum," consultant and Slashdot blogger Gerhard Mack suggested. - -"Secondly, I think there is a lot of misinformation out there about what Systemd does and how it works," Mack added. 'At the beginning of all of this I was very worried about the stability and security of the systems I maintain after reading the nerd rage on Slashdot, The Register, and sites like [Boycott Systemd][9], so I looked into Systemd for myself. - -"What I have discovered is that they seem to be confusing Systemd with things that are bundled with Systemd but run separately using a 'least privilege needed for the task' type design," he explained. "There are things I don't like, such as the binary logs, but then I can just configure it to run through syslogd as usual and ignore the binary logs." - -Particularly "hilarious," Mack added, is that people "suggest that only desktops need to boot quickly," he said. "I have seen some automated systems that load VMs on demand, and they would be much more effective if they booted faster." - -### 'I'm Really Confused' ### - -It will be "a sad day if Debian forks over this Systemd thing," longtime Debian user [Robert Pogson][10] told Linux Girl. - -"I am one of the haters, I guess," Pogson said. "I see adopting Systemd as something that kept Jessie's bug count high for months. I just don't see the need for it. I've read that some desktop users complain that Systemd is all for server users and I've read that some server users complain that Systemd is all for desktop users. I'm both and I'm really confused." - -Meanwhile, "do I need to learn a lot about Systemd to use it?" Pogson wondered. "I'm too old to learn too many new tricks. Does it give me any benefits, or is it just a nuisance? - -"I see faster booting as a rather small benefit for a lot of nuisance value like binary logs... what's with that?" he added. "I've learned to use grep on current logs to get what I need. Hiding them is just making GNU/Linux more like that other OS. Yuck!" - -### 'Nonfree Software Is the Real Enemy' ### - -Debian is an organization of roughly a thousand developers, Pogson pointed out. - -"They work hard and make the world a better place," he said. "Forcing them to choose which fork to take is really cruel and unusual punishment for such generous people. If the fork is 50/50, Debian might take years of recruitment to recover. That does no one any good. - -"The 'new' Debian would be rather weak," Pogson added. "Would it have the hundreds of mirrors that make Debian wonderful? I doubt that. Debian is a great distro. Disemboweling it out of spite is just wrong. Why can't we come to some amicable agreement? Why do we have to race at full speed to the edge of a cliff when we don't know if we can stop?" - -Bottom line: "If this civil war gets any worse, I may switch back to Debian Stable/Wheezy, my 'bomb shelter,' in the hope that I can wait for peace to break out," he concluded. "I don't need the drama. Bill Gates must be laughing at this waste of energy. Nonfree software is the real enemy -- not folks building/using Debian GNU/Linux." - -### 'It Is What Happens' ### - -It is a sad development, Google+ blogger Gonzalo Velasco C. agreed. - -At the same time, "it is what happens in the FLOSS world when you don't listen to your peers and users and listen to others that have their own (commercial) agenda and 'suggest' you use a tool as hungry as Systemd, regardless of its merits and modernism comparing to old sisVinit," he said. - -"There are a lot of technical discussions and arguments out there, and Debian must show it is neither deaf nor blind and re-discuss the issue," he added. - -### Red Hat's Influence ### - -"Do the users wish to be beholden to [Red Hat's][11] corporate roadmap? If the answer is 'no,' then a fork is the only choice left open, as it's pretty plain to see that Debian will go Systemd whether their users like it or not," SoylentNews blogger hairyfeet said. - -"It all comes down to cloud computing, and RH intends to foist its version of SVCHOSTS for Linux onto Debian and Ubuntu," he added. "The reason why is obvious: it gives them pretty much every major Linux distro, as they are nearly all built on RH, Debian or Ubuntu." - -So, the answer is simple, hairyfeet said: "If you want RH calling the shots, then stay; if not, fork." - -### 'Seems Like a Lot of Work' ### - -Of course, there's nothing to prevent a fork, Google+ blogger Brett Legree pointed out. - -"If someone wants to do it, that's their choice," he noted. - -"Seems like a lot of work, though," Legree added. "I mean, I figure that most people wouldn't care either way what init system is being used, and those who do know can probably figure out how to configure Debian (or whatever) to use a different init system. That's been possible up to now, and I'd expect it will continue to be so." - -Forks are a lot of work to maintain, agreed Chris Travers, a [blogger][12] who works on the [LedgerSMB][13] project. - -"Trust me -- I know from experience, as LedgerSMB began life as a fork of SQL-Ledger," Travers said. - -Still, "there are huge differences in philosophy between init scripts and Systemd, and this is an area where there is probably room for a good Unix-like distro to keep the old ways," Travers said. "There are certainly worse things than forks developing. This being said, I wonder if people who really want Unix should instead switch to the BSDs." - -### 'Like Killing Mosquitoes With Shotguns' ### - -The Debian community was not aware of everything the changes in the init system would bring, Google+ blogger Alessandro Ebersol suggested. "They thought it was a non-issue." - -Now that "a large number of Debian sysadmins are not pleased," however, forking would be "an extreme measure," he said, "and a last resort. There are still a lot of things that can be done." - -After all, Debian is "the GNU/Linux that runs on anything, in any *nix setup -- remember the Debian BSD flavor, and that Debian BSD will have to be accommodated to work with the new init system," Ebersol pointed out. - -"So, I believe all is not lost for Debian, but a fork, right now, is too extreme, like killing mosquitoes with shotguns," he concluded. "There's still time and place to make peace and amendments in the Debian community." - --------------------------------------------------------------------------------- - -via: http://www.linuxinsider.com/story/81262.html - -作者：[Katherine Noyes][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://twitter.com/noyesk -[1]:http://www.reglue.org/ -[2]:http://www.linuxinsider.com/story/80472.html -[3]:http://www.linuxinsider.com/story/80980.html -[4]:http://debianfork.org/ -[5]:http://linux.slashdot.org/story/14/10/20/1944226/debians-systemd-adoption-inspires-threat-of-fork -[6]:http://slashdot.org/ -[7]:http://lxer.com/module/forums/t/35625/ -[8]:http://linuxrants.com/ -[9]:http://boycottsystemd.org/ -[10]:http://mrpogson.com/ -[11]:http://www.redhat.com/ -[12]:http://ledgersmbdev.blogspot.com/ -[13]:http://www.ledgersmb.org/ \ No newline at end of file diff --git a/sources/talk/20141222 A brief history of Linux malware.md b/sources/talk/20141222 A brief history of Linux malware.md deleted file mode 100644 index 07c8d82907..0000000000 --- a/sources/talk/20141222 A brief history of Linux malware.md +++ /dev/null @@ -1,92 +0,0 @@ -[translating by KayGuoWhu] -A brief history of Linux malware -================================================================================ -A look at some of the worms and viruses and Trojans that have plagued Linux throughout the years. - -### Nobody’s immune ### - -![Image courtesy Shutterstock](http://images.techhive.com/images/article/2014/12/121114-linux-malware-1-100535381-orig.jpg) - -Although not as common as malware targeting Windows or even OS X, security threats to Linux have become both more numerous and more severe in recent years. There are a couple of reasons for that – the mobile explosion has meant that Android (which is Linux-based) is among the most attractive targets for malicious hackers, and the use of Linux as a server OS for and in the data center has also grown – but Linux malware has been around in some form since well before the turn of the century. Have a look. - -### Staog (1996) ### - -![](http://images.techhive.com/images/article/2014/12/121114-stago-100535400-orig.gif) - -The first recognized piece of Linux malware was Staog, a rudimentary virus that tried to attach itself to running executables and gain root access. It didn’t spread very well, and it was quickly patched out in any case, but the concept of the Linux virus had been proved. - -### Bliss (1997) ### - -![](http://images.techhive.com/images/article/2014/12/121114-3new-100535402-orig.gif) - -If Staog was the first, however, Bliss was the first to grab the headlines – though it was a similarly mild-mannered infection, trying to grab permissions via compromised executables, and it could be deactivated with a simple shell switch. It even kept a neat little log, [according to online documentation from Ubuntu][1]. - -### Ramen/Cheese (2001) ### - -![](http://images.techhive.com/images/article/2014/12/121114-ramen-100535404-orig.jpg) - -Cheese is the malware you actually want to get – certain Linux worms, like Cheese, may actually have been beneficial, patching the vulnerabilities the earlier Ramen worm used to infect computers in the first place. (Ramen was so named because it replaced web server homepages with a goofy image saying that “hackers looooove noodles.” - -### Slapper (2002) ### - -![Image courtesy Wikimedia CommonsCC LicenseKevin Collins](http://images.techhive.com/images/article/2014/12/121114-linux-malware-5-100535389-orig.jpg) - -The Slapper worm struck in 2002, infecting servers via an SSL bug in Apache. That predates Heartbleed by 12 years, if you’re keeping score at home. - -### Badbunny (2007) ### - -![Image courtesy Shutterstock](http://images.techhive.com/images/article/2014/12/121114-linux-malware-6-100535384-orig.jpg) - -Badbunny was an OpenOffice macro worm that carries a sophisticated script payload that worked on multiple platforms – even though the only effect of a successful infection was to download a raunchy pic of a guy in a bunny suit, er, doing what bunnies are known to do. - -### Snakso (2012) ### - -![](http://images.techhive.com/images/article/2014/12/121114-linux-malware-7-100535385-orig.jpg) -Image courtesy [TechWorld UK][2] - -The Snakso rootkit targeted specific versions of the Linux kernel to directly mess with TCP packets, injecting iFrames into traffic generated by the infected machine and pushing drive-by downloads. - -### Hand of Thief (2013) ### - -![](http://images.techhive.com/images/article/2014/12/121114-thief-100535405-orig.jpg) - -Hand of Thief is a commercial (sold on Russian hacker forums) Linux Trojan creator that made quite a splash when it was introduced last year. RSA researchers, however, discovered soon after that [it wasn’t quite as dangerous as initially thought][3]. - -### Windigo (2014) ### - -![](http://images.techhive.com/images/article/2014/12/121114-linux-malware-9-100535390-orig.jpg) - -Image courtesy [freezelight][4] - -Windigo is a complex, large-scale cybercrime operation that targeted tens of thousands of Linux servers, causing them to produce spam and serve drive-by malware and redirect links. It’s still out there, according to ESET security, [so admins should tread carefully][5]. - -### Shellshock/Mayhem (2014) ### - -![Shellshock/Mayhem (2014)](http://images.techhive.com/images/article/2014/12/121114-malware-mayhem-100535406-orig.gif) - -Striking at the terminal strikes at the heart of Linux, which is why the recent Mayhem attacks – which targeted the so-called Shellshock vulnerabilities in Linux’s Bash command-line interpreter using a specially crafted ELF library – were so noteworthy. Researchers at Yandex said that the network [had snared 1,400 victims as of July][6]. - -### Turla (2014) ### - -![Image courtesy CW](http://images.techhive.com/images/article/2014/12/121114-linux-malware-11-100535391-orig.jpg) - -A large-scale campaign of cyberespionage emanating from Russia, called Epic Turla by researchers, was found to have a new Linux-focused component earlier this week. It’s apparently [based on a backdoor access program from all the way back in 2000 called cd00r][7]. - --------------------------------------------------------------------------------- - -via: http://www.networkworld.com/article/2858742/linux/a-brief-history-of-linux-malware.html - -作者：[Jon Gold][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/Jon-Gold/ -[1]:https://help.ubuntu.com/community/Linuxvirus -[2]:http://news.techworld.com/security/3412075/linux-users-targeted-by-mystery-drive-by-rootkit/ -[3]:http://www.networkworld.com/article/2168938/network-security/dangerous-linux-trojan-could-be-sign-of-things-to-come.html -[4]:https://www.flickr.com/photos/63056612@N00/155554663 -[5]:http://www.welivesecurity.com/2014/04/10/windigo-not-windigone-linux-ebury-updated/ -[6]:http://www.pcworld.com/article/2825032/linux-botnet-mayhem-spreads-through-shellshock-exploits.html -[7]:http://www.computerworld.com/article/2857129/turla-espionage-operation-infects-linux-systems-with-malware.html \ No newline at end of file diff --git a/sources/talk/20141223 Docker CTO Solomon Hykes to Devs--Have It Your Way.md b/sources/talk/20141223 Docker CTO Solomon Hykes to Devs--Have It Your Way.md deleted file mode 100644 index 167098a20c..0000000000 --- a/sources/talk/20141223 Docker CTO Solomon Hykes to Devs--Have It Your Way.md +++ /dev/null @@ -1,102 +0,0 @@ -Docker CTO Solomon Hykes to Devs: Have It Your Way -================================================================================ -![](http://www.linuxinsider.com/ai/845971/docker-cloud.jpg) - -**"We made a very conscious effort with Docker to insert the technology into an existing toolbox. We did not want to turn the developer's world upside down on the first day. ... We showed them incremental improvements so that over time the developers discovered more things they could do with Docker. So the developers could transition into the new architecture using the new tools at their own pace."** - -[Docker][1] in the last two years has moved from an obscure Linux project to one of the most popular open source technologies in cloud computing. - -Project developers have witnessed millions of Docker Engine downloads. Hundreds of Docker groups have formed in 40 countries. Many more companies are announcing Docker integration. Even Microsoft will ship Windows 10 with Docker preinstalled. - -![](http://www.linuxinsider.com/article_images/2014/81504_330x260.jpg) - -Solomon Hykes -Founder and CTO of Docker - -"That caught a lot of people by surprise," Docker founder and CTO Solomon Hykes told LinuxInsider. - -Docker is an open platform for developers and sysadmins to build, ship and run distributed applications. It uses a Docker engine along with a portable, lightweight runtime and packaging tool. It also needs the Docker Hub and a cloud service for sharing applications and automating workflows. - -Docker provides a vehicle for developers to quickly assemble their applications from components. It eliminates the friction between development, quality assurance and production environments. Thus, IT can ship applications faster and run them unchanged on laptops, on data center virtual machines, and in any cloud. - -In this exclusive interview, LinuxInsider discusses with Solomon Hykes why Docker is revitalizing Linux and the cloud. - -**LinuxInsider: You have said that Docker's success is more the result of being in the right place at the right time for a trend that's much bigger than Docker. Why is that important to users?** - -**Solomon Hykes**: There is always an element of being in the right place at the right time. We worked on this concept for a long time. Until recently, the market was not ready for this kind of technology. Then it was, and we were there. Also, we were very deliberate to make the technology flexible and very easy to get started using. - -**LI: Is Docker a new cloud technology or merely a new way to do cloud storage?** - -**Hykes**: Containers in themselves are just an enabler. The really big story is how it changes the software model enormously. Developers are creating new kinds of applications. They are building applications that do not run on only one machine. There is a need for completely new architecture. At the heart of that is independence from the machine. - -The problem for the developer is to create the kind of software that can run independently on any kind of machine. You need to package it up so it can be moved around. You need to cross that line. That is what containers do. - -**LI: How analogous is the software technology to traditional cargo shipping in containers?** - -**Hykes**: That is a very apt example. It is the same thing for shipping containers. The innovation is not in the box. It is in how the automation handles millions of those boxes moving around. That is what is important. - -**LI: How is Docker affecting the way developers build their applications?** - -**Hykes**: The biggest way is it helps them structure their applications for a better distributive system. Another distributive application is Gmail. It does not run on just one application. It is distributive. Developers can package the application as a series of services. That is their style of reasoning when they design. It brings the tooling up to the level of design. - -**LI: What led you to this different architecture approach?** - -**Hykes**: What is interesting about this process is that we did not invent this model. It was there. If you look around, you see this trend where developers are increasingly building distributive applications where the tooling is inadequate. Many people have tried to deal with the existing tooling level. This is a new architecture. When you come up with tools that support this new model, the logical thing to do is tell the developer that the tools are out of date and are inadequate. So throw away the old tools and here are the new tools. - -**LI: How much friction did you encounter from developers not wanting to throw away their old tools?** - -**Hykes**: That approach sounds perfectly reasonable and logical. But in fact it is very hard to get developers to throw away their tools. And for IT departments the same thing is very true. They have legacy performance to support. So most of these attempts to move into next-generation tools have failed. They ask too much of the developers from day one. - -**LI: How did you combat that reaction from developers?** - -**Hykes**: We made a very conscious effort with Docker to insert the technology into an existing toolbox. We did not want to turn the developer's world upside down on the first day. Instead, we showed them incremental improvements so that over time the developers discovered more things they could do with Docker. So the developers could transition into the new architecture using the new tools at their own pace. That makes all the difference in the world. - -**LI: What reaction are you seeing from this strategy?** - -**Hykes**: When I ask people using Docker today how revolutionary it is, some say they are not using it in a revolutionary way. It is just a little improvement in my toolbox. That is the point. Others say that they jumped all in on the first day. Both responses are OK. Everyone can take their time moving toward that new model. - -**LI: So is it a case of integrating Docker into existing platforms, or is a complete swap of technology required to get the full benefit?** - -**Hykes**: Developers can go either way. There is a lot of demand for Docker native. But there is a whole ecosystem of new tools and companies competing to build brand new platforms entirely build on top of Docker. Over time the world is trending towards Docker native, but there is no rush. We totally support the idea of developers using bits and pieces of Docker in their existing platform forever. We encourage that. - -**LI: What about Docker's shared Linux kernel architecture?** - -**Hykes**: There are two steps involved in answering that question. What Docker does is become a layer on top of the Linux kernel. It exposes an abstraction function. It takes advantage of the underlying system. It has access to all of the Linux features. It also takes advantage of the networking stack and the storage subsystem. It uses the abstraction feature to map what developers need. - -**LI: How detailed a process is this for developers?** - -**Hykes**: As a developer, when I make an application I need a run-time that can run my application in a sandbox environment. I need a packaging system that makes it easy to move it around to other machines. I need a networking model that allows my application to talk to the outside world. I need storage, etc. We abstract ... the gritty details of whatever the kernel does right now. - -**LI: Why does this benefit the developer?** - -**Hykes**: There are two really big advantages to that. The first is simplicity. Developers can actually be productive now because that abstraction is easier for them to comprehend and is designed for that. The system APIs are designed for the system. What the developer needs is a consistent abstraction that works everywhere. - -The second advantage is that over time you can support more systems. For example, early on Docker could only work on a single distribution of Linux under very narrow versions of the kernel. Over time, we expanded the surface area for the number of systems out there that Docker supports natively. So now you can run Docker on every major Linux distribution and in combination with many more networking and storage features. - -**LI: Does this functionality trickle down to nondevelopers, or is the benefit solely targeting developers?** - -**Hykes**: Every time we expand that surface area, every single developer that uses the Docker abstraction benefits from that too. So every application running Docker gets the added functionality every time the Docker community adds to the expansion. That is the thing that benefits all users. Without that universal expansion, every single developer would not have time to invest to update. There is just too much to support. - -**LI: What about Microsoft's recent announcement that it was shipping Docker support with Windows?** - -**Hykes**: If you think of Docker as a very narrow and very simple tool, then why would you roll out support for Windows? The whole point is that over time, you can expand the reach of that abstraction. Windows works very differently, obviously. But now that Microsoft has committed to adding features to Windows 10, it exposes the functionality required to run Docker. That is real exciting. - -Docker still has to be ported to Windows, but Microsoft has committed to contributing in a major way to the port. Realize how far Microsoft has come in doing this. Microsoft is doing this fully upstream in a completely native, open source way. Everyone installing Windows 10 will get Docker preinstalled. - -**LI: What lies ahead for growing Docker's feature set and user base?** - -**Hykes**: The community has a lot of features on the drawing board. Most of them have to do with more improved tools for developers to build better distributive applications. A toolkit implies having a series of tools with each tool designed for one job. - -In each of these subsystems, there is a need for new tools. In each of these areas, you will see an enormous amount of activity in the community in terms of contributions and designs. In that regard, the Docker project is enormously ambitious. The ability to address each of these areas will ensure that developers have a huge array of choices without fragmentation. - --------------------------------------------------------------------------------- - -via: http://www.linuxinsider.com/story/Docker-CTO-Solomon-Hykes-to-Devs-Have-It-Your-Way-81504.html - -作者：Jack M. Germain -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:https://www.docker.com/ \ No newline at end of file From 46b43e0ba81c5262d58afb42b4b2aa7d8385e4a1 Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 18 Jan 2015 12:59:52 +0800 Subject: [PATCH 071/215] PUB:20140701 Easy File Comparisons With These Great Free Diff Tools @H-mudcup --- ...risons With These Great Free Diff Tools.md | 166 +++++++++++++++++ ...risons With These Great Free Diff Tools.md | 168 ------------------ 2 files changed, 166 insertions(+), 168 deletions(-) create mode 100644 published/20140701 Easy File Comparisons With These Great Free Diff Tools.md delete mode 100644 translated/share/20140701 Easy File Comparisons With These Great Free Diff Tools.md diff --git a/published/20140701 Easy File Comparisons With These Great Free Diff Tools.md b/published/20140701 Easy File Comparisons With These Great Free Diff Tools.md new file mode 100644 index 0000000000..9dc13a69b4 --- /dev/null +++ b/published/20140701 Easy File Comparisons With These Great Free Diff Tools.md @@ -0,0 +1,166 @@ +文件轻松比对，伟大而自由的比较软件们 +================================================================================ + +文件比较工具用于比较计算机上的文件的内容，找到他们之间相同与不同之处。比较的结果通常被称为diff。 + +diff同时也是一个基于控制台的、能输出两个文件之间不同之处的著名的文件比较程序的名字。diff是于二十世纪70年代早期，在Unix操作系统上被开发出来的。diff将会把两个文件之间不同之处的部分进行输出。 + +Linux拥有很多不错的GUI工具，能使你能清楚的看到两个文件或同一文件不同版本之间的不同之处。这次我从自己最喜欢的GUI比较工具中选出了五个推荐给大家。除了其中的一个，其他的都是开源的。 + +这些应用程序可以让你更清楚的看到文件或目录的差别，能合并有差异的文件，可以解决冲突并将其输出成一个新的文件或补丁，其也用于那些预览和备注文件改动的产品上（比如，在源代码合并到源文件树之前，要先接受源代码的改变）。因此它们是非常重要的软件开发工具。它们可以帮助开发人员们对文件进行处理，不停的把文件转来转去。这些比较工具不仅仅能用于显示源代码文件中的不同之处；他们还适用于很多种的文本文件。可视化的特性使文件比较变得容易、简单。 + +---------- + +###Meld + +![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Meld.png) + +Meld是一个适用于Gnome桌面的、开源的、图形化的文件差异查看和合并的应用程序。它支持2到3个文件的同时比较、递归式的目录比较、处于版本控制(Bazaar, Codeville, CVS, Darcs, Fossil SCM, Git, Mercurial, Monotone, Subversion)之下的目录比较。还能够手动或自动合并文件差异。 + +Meld的重点在于帮助开发人员比较和合并多个源文件，并在他们最喜欢的版本控制系统下能直观的浏览改动过的地方。 + +功能包括 + +- 原地编辑文件，即时更新 +- 进行两到三个文件的比较及合并 +- 在显示的差异和冲突之间的导航 +- 使用插入、改变和冲突这几种标记可视化展示本地和全局的差异 +- 内置正则表达式文本过滤器，可以忽略不重要的差异 +- 语法高亮度显示（使用可选的gtksourceview) +- 将两到三个目录中的文件逐个进行比较，显示新建，缺失和替换过的文件 +- 对任何有冲突或差异的文件直接打开比较界面 +- 可以过滤文件或目录以避免以忽略某些差异 +- 被改动区域的自动合并模式使合并更容易 +- 也有一个简单的文件管理 +- 支持多种版本控制系统，包括Git, Mercurial, Bazaar 和 SVN +- 在提交前开启文件比较来检查改动的地方和内容 +- 查看文件版本状态 +- 还能进行简单的版本控制操作（例如，提交、更新、添加、移动或删除文件） +- 继承自同一文件的两个文件进行自动合并 +- 标注并在中间的窗格显示所有有冲突的变更的基础版本 +- 显示并合并同一文件的无关的独立修改 +- 锁定只读性质的基础文件以避免出错 +- 可以整合到已有的命令行界面中，包括gitmergetool +- 国际化支持 +- 可视化使文件比较更简单 + +- 网址: [meldmerge.org][1] +- 开发人员: Kai Willadsen +- 证书: GNU GPL v2 +- 版本号: 1.8.5 + +---------- + +###DiffMerge + +![](http://www.sourcegear.com/images/screenshots/diffmerge/img_merge_linux.png) + +DiffMerge是一个可以在Linux、Windows和OS X上运行的，可以可视化文件的比较和合并的应用软件。 + +功能包括: + +- 图形化显示两个文件之间的差别。包括插入行，高亮标注以及对编辑的全面支持 +- 图形化显示三个文件之间的差别。（安全的前提下）允许自动合并，并对最终文件可以随意编辑 +- 并排显示两个文件夹的比较，显示哪一个文件只存在于其中一个文件夹而不存在于另外的一个文件夹，还能一对一的将完全相同的、等价的或不同的文件配对 +- 规则设置和选项让你可以个性化它的外观和行为 +- 基于Unicode，可以导入多种编码的字符 +- 跨平台工具 + +- 网址: [sourcegear.com/diffmerge][2] +- 开发人员: SourceGear LLC +- 证书: Licensed for use free of charge (not open source) +- 版本号: 4.2 + +---------- + +###xxdiff + +![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-xxdiff.png) + +xxdiff是个开源的图形化的可进行文件、目录比较及合并的工具。 + +xxdiff可以用于显示两到三个文件或两个目录的差别，还能产生一个合并后的版本。被比较的两到三个文件会并排显示，并将有区别的文字内容用不同颜色高亮显示以便于识别。 + +这个程序是个非常重要的软件开发工具。他可以图形化的显示两个文件或目录之间的差别，合并有差异的文件，其也用于那些预览和备注文件改动的产品上（比如，在源代码合并到源文件树之前，要先接受源代码的改变） + +功能包括: + +- 比较两到三个文件，或是两个目录（浅层或递归） +- 横向高亮显示差异 +- 交互式的文件合并，可视化的输出和保存 +- 可以辅助合并的评论/监管 +- 自动合并文件中时不合并 CVS 冲突，并以两个文件显示以便于解决冲突 +- 可以用其它的比较程序计算差异：适用于GNU diff、SGI diff和ClearCase的cleardiff，以及所有与这些程序输出相似的文件比较程序。 +- 可以使用资源文件实现完全的个性化设置 +- 用起来感觉和Rudy Wortel或SGI的xdiff差不多，与桌面系统无关 +- 功能和输出可以和脚本轻松集成 + +- 网址: [furius.ca/xxdiff][3] +- 开发人员: Martin Blais +- 证书: GNU GPL +- 版本号: 4.0 + +---------- + +###Diffuse + +![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Diffuse.png) + +Diffuse是个开源的图形化工具，可用于合并和比较文本文件。Diffuse能够比较任意数量的文件，并排显示，并提供手动行匹配调整，能直接编辑文件。Diffuse还能从bazaar、CVS、darcs, git, mercurial, monotone, Subversion和GNU RCS 库中获取版本用于比较及合并。 + +功能包括: + +- 比较任意数量的文件，并排显示（多方合并） +- 行匹配可以被用户人工矫正 +- 直接编辑文件 +- 语法高亮 +- 支持Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion和SVK +- 支持Unicode +- 可无限撤销 +- 易用的键盘导航 + +- 网址: [diffuse.sourceforge.net][] +- 开发人员: Derrick Moser +- 证书: GNU GPL v2 +- 版本号: 0.4.7 + +---------- + +###Kompare + +![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Kompare.png) + +Kompare是个开源的GUI前端程序，可以对不同源文件之间差异的可视化和合并。Kompare可以比较文件或文件夹内容的差异。Kompare支持很多种diff格式，并提供各种选项来设置显示的信息级别。 + +不论你是个想比较源代码的开发人员，还是只想比较一下研究论文手稿与最终文档的差异，Kompare都是个有用的工具。 + +Kompare是KDE桌面环境的一部分。 + +功能包括: + +- 比较两个文本文件 +- 递归式比较目录 +- 显示diff产生的补丁 +- 将补丁合并到一个已存在的目录 +- 可以让你在编译时更轻松 + +- 网址: [www.caffeinated.me.uk/kompare/][5] +- 开发者: The Kompare Team +- 证书: GNU GPL +- 版本号: Part of KDE + +-------------------------------------------------------------------------------- + +via: http://www.linuxlinks.com/article/2014062814400262/FileComparisons.html + +作者：Frazer Kline +译者：[H-mudcup](https://github.com/H-mudcup) +校对：[wxy](https://github.com/wxy) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://meldmerge.org/ +[2]:https://sourcegear.com/diffmerge/ +[3]:http://furius.ca/xxdiff/ +[4]:http://diffuse.sourceforge.net/ +[5]:http://www.caffeinated.me.uk/kompare/ diff --git a/translated/share/20140701 Easy File Comparisons With These Great Free Diff Tools.md b/translated/share/20140701 Easy File Comparisons With These Great Free Diff Tools.md deleted file mode 100644 index d70a94496e..0000000000 --- a/translated/share/20140701 Easy File Comparisons With These Great Free Diff Tools.md +++ /dev/null @@ -1,168 +0,0 @@ -Translated By H-mudcup - -文件轻松比对，伟大而自由的比较软件们 -================================================================================ -作者 Frazer Kline - -文件比较工具用于比较电脑文件的内容，找到他们之间相同与不同之处。比较的结果通常被称为diff。 - -diff同时也是一个著名的，基于控制台的，能输出两个文件之间不同之处的，文件比较程序的名字。diff是二十世纪70年代早期，在Unix操作系统上被开发出来的。diff将会把两个文件之间不同之处的部分进行输出。 - -Linux拥有很多不错的，能使你能清楚的看到两个文件或同一文件不同版本之间的不同之处的，很棒的GUI工具。这次我从自己最喜欢的GUI比较工具中选出了五个推荐给大家。除了其中的一个，其他的都有开源许可证。 - -这些应用程序可以让文件或目录的差别变得可见，能合并有差异的文件，可以解决冲突并将其输出成一个新的文件或补丁，还能帮助回顾文件被改动过的地方并评论最终产品（比如，在源代码合并到源文件树之前，要先批准源代码的改变）。因此它们是非常重要的软件开发工具。它们不停的把文件传来传，帮助开发人员们在同一个文件上工作。这些比较工具不仅仅能用于显示源代码文件中的不同之处；他们还适用于很多种文本类文件。可视化的特性使文件比较变得容易、简单。 - ----------- - -![](http://www.linuxlinks.com/portal/content2/png/Meld.png) - -![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Meld.png) - -Meld是一个适用于Gnome桌面的，开源的，图形化的文件差异查看和合并的应用程序。它支持2到3个文件的同时比较，递归式的目录比较，版本控制(Bazaar, Codeville, CVS, Darcs, Fossil SCM, Git, Mercurial, Monotone, Subversion)之下的目录比较。还能够手动或自动合并文件差异。 - -eld的重点在于帮助开发人员比较和合并多个源文件，并在他们最喜欢的版本控制系统下能直观的浏览改动过的地方。 - -功能包括 - -- 原地编辑文件，即时更新 -- 进行两到三个文件的比较及合并 -- 差异和冲突之间的导航 -- 可视化本地和总体间的插入、改变和冲突这几种不同之处。 -- 内置正则表达式文本过滤器，可以忽略不重要的差异 -- 语法高亮度显示（可选择gtksourceview) -- 将两到三个目录一个文件一个文件的进行比较，显示新建，缺失和替换过的文件。 -- 可直接开启任何有冲突或差异的文件的比较 -- 可以过滤文件或目录以避免出现假差异 -- 被改动区域的自动合并模式使合并更容易 -- 简单的文件管理 -- 支持多种版本控制系统，包括Git, Mercurial, Bazaar and SVN -- 在提交前开启文件比较来检查改动的地方和内容 -- 查看文件版本状态 -- 还能进行简单的版本控制操作（例如，提交、更新、添加、移动或删除文件） -- 继承自同一文件的两个文件进行自动合并 -- 标注并在中间的窗格显示所有有冲突的变更的基础版本 -- 显示并合并同一文件的各自独立的修改 -- 锁定只读性质的基础文件以避免出错 -- 可以整合到已有的命令行界面中，包括gitmergetool -- 国际化支持 -- 可视化使文件比较更简单 - -- 网址: [meldmerge.org][1] -- 开发人员: Kai Willadsen -- 证书: GNU GPL v2 -- 版本号: 1.8.5 - ----------- - -![](http://www.linuxlinks.com/portal/content2/png/DiffMerge.png) - -![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-DiffMerge.png) -注：上面这个图访问不到，图的地址是原文地址的小图的链接地址，发布的时候在验证一下，如果还访问不到，不行先采用小图或者网上搜一下看有没有大图 - -DiffMerge是一个可以在Linux、Windows和OS X上运行的，可以可视化文件的比较和合并的应用软件。 - -功能包括: - -- 图形化的显示两个文件之间的差别。包括插入行，高亮标注以及对编辑的全面支持。 -- 图形化的显示三个文件之间的差别。（安全的前提下）允许自动合并还完全拥有最终文件的编辑权。 -- 并排显示两个文件夹的比较，显示哪一个文件只存在于其中一个文件夹而不存在于与之相比较的那个文件夹，还能一对一的将完全相同的、等价的或不同的文件配对。 -- 规则设置和选项让你可以个性化它的外观和行为 -- 基于Unicode，可以导入多种编码的字符 -- 跨平台工具 - -- 网址: [sourcegear.com/diffmerge][2] -- 开发人员: SourceGear LLC -- 证书: Licensed for use free of charge (not open source) -- 版本号: 4.2 - ----------- - -![](http://www.linuxlinks.com/portal/content2/png/xxdiff.png) - -![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-xxdiff.png) - -xxdiff是个开源的图形化的，可进行文件、目录比较及合并的工具。 - -xxdiff可以用于显示两到三个文件或两个目录的差别，还能产生一个合并后的版本。被比较的两到三个文件会并排显示，并将有区别的文字内容用不同颜色高亮显示以便于识别。 - -这个程序是个非常重要的软件开发工具。他可以图形化的显示两个文件或目录之间的差别，合并有差异的文件，解决冲突并评论结果（例如在源代码合并到一个源文件树里之前必须先允许其改变） - -功能包括: - -- 比较两到三个文件，或是两个目录（浅层或递归） -- 水平差别高亮显示 -- 文件可以被交互式的合并，可视化的输出和保存 -- 可以可视化合并的评论/监管 -- 保留自动合并文件中的冲突，并以两个文件显示以便于解决冲突 -- 用额外的比较程序估算差异：适用于GNU diff、SGI diff和ClearCase的cleardiff，以及所有与这些程序输出相似的文件比较程序。 -- 可以在源文件上实现完全的个性化设置 -- 用起来感觉和Rudy Wortel或SGI的xdiff差不多， it is desktop agnostic -- 功能和输出可以和脚本轻松集成 - -- 网址: [furius.ca/xxdiff][3] -- 开发人员: Martin Blais -- 证书: GNU GPL -- 版本号: 4.0 - ----------- - -![](http://www.linuxlinks.com/portal/content2/png/Diffuse.png) - -![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Diffuse.png) - -Diffuse是个开源的图形化工具，可用于合并和比较文本文件。Diffuse能够比较任意数量的文件，并排显示，并提供手动行匹配调整，能直接编辑文件。Diffuse还能从bazaar、CVS、darcs, git, mercurial, monotone, Subversion和GNU矫正控制系统（GNU Revision Control System ，RCS)这些关于比较及合并的资源中对文件进行恢复和矫正。 - -功能包括: - -- 比较任意数量的文件，并排显示（多方合并） -- 行匹配可以被用户人工矫正 -- 直接编辑文件 -- 语法高亮 -- 支持Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion和SVK -- 支持Unicode -- 可无限撤销 -- 简易键盘导航 - -- 网址: [diffuse.sourceforge.net][] -- 开发人员: Derrick Moser -- 证书: GNU GPL v2 -- 版本号: 0.4.7 - ----------- - -![](http://www.linuxlinks.com/portal/content2/png/Kompare.png) - -![](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Kompare.png) - -Kompare是个开源的GUI前端程序，可以开启不同源文件之间差异的可视化和合并。Kompare可以比较文件或文件夹内容的差异。Kompare支持很多种diff格式，并提供各种选项来设置显示的信息级别。 - -不论你是个想比较源代码的开发人员，还是只想比较一下研究论文手稿与最终文档的差异，Kompare都是个有用的工具。 - -Kompare是KDE桌面环境的一部分。 - -功能包括: - -- 比较两个文本文件 -- 递归式比较目录 -- 显示diff产生的补丁 -- 将补丁合并到一个已存在的目录 -- 在无聊的编译时刻，逗你玩 - -- 网址: [www.caffeinated.me.uk/kompare/][5] -- 开发者: The Kompare Team -- 证书: GNU GPL -- 版本号: Part of KDE - --------------------------------------------------------------------------------- - -via: http://www.linuxlinks.com/article/2014062814400262/FileComparisons.html - -译者：[H-mudcup](https://github.com/H-mudcup) 校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://meldmerge.org/ -[2]:https://sourcegear.com/diffmerge/ -[3]:http://furius.ca/xxdiff/ -[4]:http://diffuse.sourceforge.net/ -[5]:http://www.caffeinated.me.uk/kompare/ From a7d222693082f1e586c6189398d1bcb1a38f8f81 Mon Sep 17 00:00:00 2001 From: geekpi Date: Sun, 18 Jan 2015 14:42:22 +0800 Subject: [PATCH 072/215] Update 20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md --- ...Manage Network using nmcli Tool in RedHat or CentOS 7.x.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md b/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md index b874ccd089..177746b97e 100644 --- a/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md +++ b/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md @@ -1,3 +1,5 @@ +translating-----geekpi + How to Manage Network using nmcli Tool in RedHat / CentOS 7.x ================================================================================ A new feature of [**Red Hat Enterprise Linux 7**][1] and **CentOS 7** is that the default networking service is provided by **NetworkManager**, a dynamic network control and configuration daemon that attempts to keep network devices and connections up and active when they are available while still supporting the traditional ifcfg type configuration files. NetworkManager can be used with the following types of connections: Ethernet, VLANs, Bridges, Bonds, Teams, Wi-Fi, mobile broadband (such as cellular 3G), and IP-over-InfiniBand. For these connection types, NetworkManager can configure network aliases, IP addresses, static routes, DNS information, and VPN connections, as well as many connection-specific parameters. @@ -90,4 +92,4 @@ via: http://linoxide.com/linux-command/nmcli-tool-red-hat-centos-7/ 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://linoxide.com/author/adriand/ -[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ \ No newline at end of file +[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ From 923230af5674e243a2d2168d5c6634c5c17db3c5 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Sun, 18 Jan 2015 15:27:49 +0800 Subject: [PATCH 073/215] translated --- ...sing nmcli Tool in RedHat or CentOS 7.x.md | 95 ------------------- ...sing nmcli Tool in RedHat or CentOS 7.x.md | 92 ++++++++++++++++++ 2 files changed, 92 insertions(+), 95 deletions(-) delete mode 100644 sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md create mode 100644 translated/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md diff --git a/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md b/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md deleted file mode 100644 index 177746b97e..0000000000 --- a/sources/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md +++ /dev/null @@ -1,95 +0,0 @@ -translating-----geekpi - -How to Manage Network using nmcli Tool in RedHat / CentOS 7.x -================================================================================ -A new feature of [**Red Hat Enterprise Linux 7**][1] and **CentOS 7** is that the default networking service is provided by **NetworkManager**, a dynamic network control and configuration daemon that attempts to keep network devices and connections up and active when they are available while still supporting the traditional ifcfg type configuration files. NetworkManager can be used with the following types of connections: Ethernet, VLANs, Bridges, Bonds, Teams, Wi-Fi, mobile broadband (such as cellular 3G), and IP-over-InfiniBand. For these connection types, NetworkManager can configure network aliases, IP addresses, static routes, DNS information, and VPN connections, as well as many connection-specific parameters. - -The NetworkManager can be controlled with the command-line tool, **nmcli**. - -### General nmcli usage ### - -The general syntax for nmcli is: - - # nmcli [ OPTIONS ] OBJECT { COMMAND | help } - -One cool thing is that you can use the TAB key to complete actions when you write the command so if at any time you forget the syntax you can just press TAB to see a list of available options. - -![nmcli tab](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-tab.jpg) - -Some examples of general nmcli usage: - - # nmcli general status - -Will display the overall status of NetworkManager. - - # nmcli connection show - -Will display all connections. - - # nmcli connection show -a - -Will display only the active connections. - - # nmcli device status - -Will display a list of devices recognized by NetworkManager and their current state. - -![nmcli general](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-gneral.jpg) - -### Starting / stopping network interfaces ### - -You can use the nmcli tool to start or stop network interfaces from the command line, this is the equivalent of up/down in ifconfig. - -To stop an interface use the following syntax: - - # nmcli device disconnect eno16777736 - -To start it you can use this syntax: - - # nmcli device connect eno16777736 - -### Adding an ethernet connection with static IP ### - -To add a new ethernet connection with a static IP address you can use the following command: - - # nmcli connection add type ethernet con-name NAME_OF_CONNECTION ifname interface-name ip4 IP_ADDRESS gw4 GW_ADDRESS - -replacing the NAME_OF_CONNECTION with the name you wish to apply to the new connection, the IP_ADDRESS with the IP address you wish to use and the GW_ADDRESS with the gateway address you use (if you don't use a gateway you can omit this last part). - - # nmcli connection add type ethernet con-name NEW ifname eno16777736 ip4 192.168.1.141 gw4 192.168.1.1 - -To set the DNS servers for this connection you can use the following command: - - # nmcli connection modify NEW ipv4.dns "8.8.8.8 8.8.4.4" - -To bring up the new Ethernet connection, issue a command as follows: - - # nmcli connection up NEW ifname eno16777736 - -To view detailed information about the newly configured connection, issue a command as follows: - - # nmcli -p connection show NEW - -![nmcli add static](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-add-static.jpg) - -### Adding a connection that will use DHCP ### - -If you wish to add a new connection that will use DHCP to configure the interface IP address, gateway address and dns servers, all you have to do is omit the ip/gw address part of the command and Network Manager will use DHCP to get the configuration details. - -For example, to create a DHCP configured connection profile named NEW_DHCP, on device -eno16777736 you can use the following command: - - # nmcli connection add type ethernet con-name NEW_DHCP ifname eno16777736 - --------------------------------------------------------------------------------- - -via: http://linoxide.com/linux-command/nmcli-tool-red-hat-centos-7/ - -作者：[Adrian Dinu][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/adriand/ -[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ diff --git a/translated/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md b/translated/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md new file mode 100644 index 0000000000..10c19b2d92 --- /dev/null +++ b/translated/tech/20150114 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md @@ -0,0 +1,92 @@ +如何在RedHat/CentOS 7.x中使用nmcli管理网络 +================================================================================ +[**Red Hat Enterprise Linux 7**][1]和**CentOS 7**的一个新特性是默认的网络服务由**NetworkManager**提供，这是一个动态的网络控制和配置守护进程，它在网络设备和连接可用时保持链接正常，同时也提供了典型的ifcfg类型的配置文件。NetworkManager可以用于下面这些连接：Ethernet、 VLANs、桥接、Bonds、Teams、 Wi-Fi、 移动宽带 (比如 3G)和IP-over-InfiniBand(IPoIB)。 + +NetworkManager可以由命令行工具**nmcli**控制。 + +### nmcli的通常用法 ### + +nmcli的通常语法是： + + # nmcli [ OPTIONS ] OBJECT { COMMAND | help } + +一件很酷的事情是你可以使用tab键来补全操作，这样你在何时忘记了语法你都可以用tab来看到可用的选项了。 + +![nmcli tab](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-tab.jpg) + +nmcli通常用法的一些例子： + + # nmcli general status + +会显示NetworkManager的整体状态。 + + # nmcli connection show + +会显示所有的连接 + + # nmcli connection show -a + +仅显示活跃的连接 + + # nmcli device status + +显示NetworkManager识别的设备列表和它们当前的状态。 + +![nmcli general](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-gneral.jpg) + +### 启动/停止网络设备 ### + +你可以使用nmcli从命令行启动或者停止网络设备，这等同于ifconfig中的up和down。 + +停止网络设备使用下面的语法： + + # nmcli device disconnect eno16777736 + +要启动它使用下面的语法： + + # nmcli device connect eno16777736 + +### 使用静态IP添加一个以太网连接 ### + +要用静态IP添加一个以太网连接可以使用下面的命令： + + # nmcli connection add type ethernet con-name NAME_OF_CONNECTION ifname interface-name ip4 IP_ADDRESS gw4 GW_ADDRESS + +将NAME_OF_CONNECTION替换成新的连接名，IP_ADDRESS替换成你要的IP地址，GW_ADDRESS替换成你使用的网关地址（如果你并不使用网关，你可以忽略这部分）。 + + # nmcli connection add type ethernet con-name NEW ifname eno16777736 ip4 192.168.1.141 gw4 192.168.1.1 + +=要设置这个连接的DNS服务器使用下面的命令： + + # nmcli connection modify NEW ipv4.dns "8.8.8.8 8.8.4.4" + +要启用新的以太网连接，使用下面的命令： + + # nmcli connection up NEW ifname eno16777736 + +要查看新配置连接的详细信息，使用下面的命令： + + # nmcli -p connection show NEW + +![nmcli add static](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-add-static.jpg) + +### 添加一个使用DHCP的连接 ### + +如果你想要添加一个使用DHCP来配置接口IP地址、网关地址和dns服务器地址的新的连接，你要做的就是忽略命令中的ip/gw部分，NetworkManager会自动使用DHCP来获取配置细节。 + +比如，要创建一个新的叫NEW_DHCP的DHCP连接，在设备eno16777736上你可以使用下面的命令： + + # nmcli connection add type ethernet con-name NEW_DHCP ifname eno16777736 + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-command/nmcli-tool-red-hat-centos-7/ + +作者：[Adrian Dinu][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/adriand/ +[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ From 86f317ce86abb9ffa8b4977f2606a081e95b315d Mon Sep 17 00:00:00 2001 From: DoubleC <450760206@qq.com> Date: Sun, 18 Jan 2015 20:49:03 +0800 Subject: [PATCH 074/215] delete source file delete source file --- ...sing nmcli Tool in RedHat or CentOS 7.x.md | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md diff --git a/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md b/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md deleted file mode 100644 index ba0d32eb37..0000000000 --- a/sources/tech/20150115 How to Manage Network using nmcli Tool in RedHat or CentOS 7.x.md +++ /dev/null @@ -1,93 +0,0 @@ -SPccman.......translating -How to Manage Network using nmcli Tool in RedHat / CentOS 7.x -================================================================================ -A new feature of [**Red Hat Enterprise Linux 7**][1] and **CentOS 7** is that the default networking service is provided by **NetworkManager**, a dynamic network control and configuration daemon that attempts to keep network devices and connections up and active when they are available while still supporting the traditional ifcfg type configuration files. NetworkManager can be used with the following types of connections: Ethernet, VLANs, Bridges, Bonds, Teams, Wi-Fi, mobile broadband (such as cellular 3G), and IP-over-InfiniBand. For these connection types, NetworkManager can configure network aliases, IP addresses, static routes, DNS information, and VPN connections, as well as many connection-specific parameters. - -The NetworkManager can be controlled with the command-line tool, nmcli. - -### General nmcli usage ### - -The general syntax for nmcli is: - - # nmcli [ OPTIONS ] OBJECT { COMMAND | help } - -One cool thing is that you can use the TAB key to complete actions when you write the command so if at any time you forget the syntax you can just press TAB to see a list of available options. - -![nmcli tab](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-tab.jpg) - -Some examples of general nmcli usage: - - # nmcli general status - -Will display the overall status of NetworkManager. - - # nmcli connection show - -Will display all connections. - - # nmcli connection show -a - -Will display only the active connections. - - # nmcli device status - -Will display a list of devices recognized by NetworkManager and their current state. - -![nmcli general](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-gneral.jpg) - -### Starting / stopping network interfaces ### - -You can use the nmcli tool to start or stop network interfaces from the command line, this is the equivalent of up/down in ifconfig. -To stop an interface use the following syntax: - - # nmcli device disconnect eno16777736 - -To start it you can use this syntax: - - # nmcli device connect eno16777736 - -### Adding an ethernet connection with static IP ### - -To add a new ethernet connection with a static IP address you can use the following command: - - # nmcli connection add type ethernet con-name NAME_OF_CONNECTION ifname interface-name ip4 IP_ADDRESS gw4 GW_ADDRESS - -replacing the NAME_OF_CONNECTION with the name you wish to apply to the new connection, the IP_ADDRESS with the IP address you wish to use and the GW_ADDRESS with the gateway address you use (if you don't use a gateway you can omit this last part). - - # nmcli connection add type ethernet con-name NEW ifname eno16777736 ip4 192.168.1.141 gw4 192.168.1.1 - -To set the DNS servers for this connection you can use the following command: - - # nmcli connection modify NEW ipv4.dns "8.8.8.8 8.8.4.4" - -To bring up the new Ethernet connection, issue a command as follows: - - # nmcli connection up NEW ifname eno16777736 - -To view detailed information about the newly configured connection, issue a command as follows: - - # nmcli -p connection show NEW - -![nmcli add static](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-add-static.jpg) - -Adding a connection that will use DHCP - -If you wish to add a new connection that will use DHCP to configure the interface IP address, gateway address and dns servers, all you have to do is omit the ip/gw address part of the command and Network Manager will use DHCP to get the configuration details. - -For example, to create a DHCP configured connection profile named NEW_DHCP, on device -eno16777736 you can use the following command: - - # nmcli connection add type ethernet con-name NEW_DHCP ifname eno16777736 - --------------------------------------------------------------------------------- - -via: http://linoxide.com/linux-command/nmcli-tool-red-hat-centos-7/ - -作者：[Adrian Dinu][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/adriand/ -[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ From 208bdf9f160225edb96062352f7fe826e3c42ac9 Mon Sep 17 00:00:00 2001 From: DoubleC <450760206@qq.com> Date: Sun, 18 Jan 2015 21:00:20 +0800 Subject: [PATCH 075/215] =?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 翻译完成 --- ...k using nmcli Tool in RedHat CentOS 7.x.md | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 translated/tech/How to Manage Network using nmcli Tool in RedHat CentOS 7.x.md diff --git a/translated/tech/How to Manage Network using nmcli Tool in RedHat CentOS 7.x.md b/translated/tech/How to Manage Network using nmcli Tool in RedHat CentOS 7.x.md new file mode 100644 index 0000000000..febebc89ca --- /dev/null +++ b/translated/tech/How to Manage Network using nmcli Tool in RedHat CentOS 7.x.md @@ -0,0 +1,88 @@ +在 RedHat/CentOS 7.x 中使用 cmcli 命令管理网络 +=============== +[**Red Hat Enterprise Linux 7** 与 **CentOS 7**][1] 中默认的网络服务由 **NetworkManager** 提供，这是动态控制及配置网络的守护进程，它用于保持当前网络设备及连接处于工作状态，同时也支持传统的 ifcfg 类型的配置文件。 +NetworkManager 可以用于以下类型的连接： +Ethernet，VLANS，Bridges，Bonds，Teams，Wi-Fi，mobile boradband（如移动3G）以及 IP-over-InfiniBand。针对与这些网络类型，NetworkManager 可以配置他们的网络别名，IP 地址，静态路由，DNS，VPN连接以及很多其它的特殊参数。 + +可以用命令行工具 nmcli 来控制 NetworkManager。 + +###nmcli 用法### + + # nmcli [ OPTIONS ] OBJECT { COMMAND | help } + +我们可以通过 TAB 键补全命令，当你忘记这个命令的语法时只需要按下 TAB 就可以看到选项列表。 + +![nmcli tab](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-tab.jpg) + +使用 nmcli 的一些例子： + + # nmcli general status + +这条命令将 NetworkManager 的所有状态都打印出来。 + + # nmcli connection show + +显示所有连接。 + + # nmcli connection show -a + +仅显示当前活动的连接。 + + # nmcli device status + +列出通过 NetworkManager 验证的设备列表及他们的状态。 + +![nmcli general](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-gneral.jpg) + +### 启动/停止 网络接口### + +使用 nmcli 工具启动或停止网络接口，与 ifconfig 的 up/down 是一样的。使用下列命令停止某个接口： + + # nmcli device disconnect eno16777736 + +下列命令用来启动接口： + + # nmcli device connect eno16777736 + +###添加静态IP的以太网连接 + +以下命令可以添加一个静态IP地址的以太网连接： + + # nmcli connection add type ethernet con-name NAME_OF_CONNECTION ifname interface-name ip4 IP_ADDRESS gw4 GW_ADDRESS + +根据你需要的配置更改 NAME_OF_CONNECTION,IP_ADDRESS, GW_ADDRESS参数（如果不需要网关的话可以省略最后一部分）。 + + # nmcli connection add type ethernet con-name NEW ifname eno16777736 ip4 192.168.1.141 gw4 192.168.1.1 + +使用下列命令设置DNS服务器： + + # nmcli connection modify NEW ipv4.dns "8.8.8.8 8.8.4.4" + +下列命令启动新的 Ethernet 连接： + + # nmcli connection up NEW ifname eno16777736 + +查看新连接的配置信息： + + # nmcli -p connection show NEW + +![nmcli add static](http://blog.linoxide.com/wp-content/uploads/2014/12/nmcli-add-static.jpg) + +增加新的连接，使用DHCP自动分配IP地址，网关，DNS等，你要做的就是将命令行后 ip/gw 地址部分去掉就行了，DHCP会自动分配这些参数。 + +例，在 eno 16777736 设备上配置一个 名为 NEW_DHCP 的 DHCP 连接 + + # nmcli connection add type ethernet con-name NEW_DHCP ifname eno16777736 + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/linux-command/nmcli-tool-red-hat-centos-7/ + +作者：[Adrian Dinu][a] +译者：[SPccman](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linoxide.com/author/adriand/ +[1]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/ From d952637700af776b9ed1687aa3c6d782b7cd579e Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 18 Jan 2015 22:57:21 +0800 Subject: [PATCH 076/215] PUB:20141224 Calife--A lightweight alternative to sudo @GOLinux --- ...life--A lightweight alternative to sudo.md | 64 ++++++++++++++++ ...life--A lightweight alternative to sudo.md | 75 ------------------- 2 files changed, 64 insertions(+), 75 deletions(-) create mode 100644 published/20141224 Calife--A lightweight alternative to sudo.md delete mode 100644 translated/share/20141224 Calife--A lightweight alternative to sudo.md diff --git a/published/20141224 Calife--A lightweight alternative to sudo.md b/published/20141224 Calife--A lightweight alternative to sudo.md new file mode 100644 index 0000000000..5c1fcf8f70 --- /dev/null +++ b/published/20141224 Calife--A lightweight alternative to sudo.md @@ -0,0 +1,64 @@ +Calife：一个轻量级的sudo替代品 +================================================================================ +Calife会在登录为另外一个用户前输入自己的密码（如果没有提供登录名，默认是登录为root），在验证具有正确的权限后，就会切换到该用户及其组身份，并就会执行一个shell。如果 calife 是由 root 执行的，不需要密码，会执行一个所需的用户ID的shell。 + +所用的shell是用户自身所用的，除非在calife.auth配置文件中指定了某个shell。如果在命令行指定了“-”选项，就会读取该用户的环境文件，该shell就像是一个登录shell。这和su的惯常用法不同。 + +只有在calife.auth中指定的用户才能使用此方法通过calife成为另外一个用户。calife.auth安装位置处于/etc/calife.auth。 + +### Calife特性 ### + +这里给出了一个关于calife特性的扩展列表： + +- 你可以完整保留你的环境变量和shell别名 +- 它可以全程记录会话的开始到结束 +- 你可以列出每个许可使用calife的用户，那样，你就可以用户赋予主管权限而不必提供root密码 +- 你可以在配置文件中指定哪个组可以使用：只要使用@staff或者%staff，那么所有staff组中的成员都将具有访问calife的权限 +- 通过calife也可以登录成为那些没有家目录或甚至没有shell的用户。如果你想要成为uucp或者甚至是bin，那会很方便 +- 你可以让calife在会话结束时运行一个指定的系统级的脚本（例如，发送一封邮件告知以root身份做了哪些事） + +### ubuntu中安装calife ### + +打开终端，然后运行以下命令 + + sudo apt-get install calife + +### 使用Calife ### + +### 语法 ### + + calife [-] [login] + +详情请参与calife手册页 + +-------------------------------------------------------------------------------- + +via: http://www.ubuntugeek.com/calife-a-lightweight-alternative-to-sudo.html + +作者：[ruchi][a] +译者：[GOLinux](https://github.com/GOLinux) +校对：[wxy](https://github.com/wxy) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://www.ubuntugeek.com/author/ubuntufix +[1]: +[2]: +[3]: +[4]: +[5]: +[6]: +[7]: +[8]: +[9]: +[10]: +[11]: +[12]: +[13]: +[14]: +[15]: +[16]: +[17]: +[18]: +[19]: +[20]: diff --git a/translated/share/20141224 Calife--A lightweight alternative to sudo.md b/translated/share/20141224 Calife--A lightweight alternative to sudo.md deleted file mode 100644 index b373116450..0000000000 --- a/translated/share/20141224 Calife--A lightweight alternative to sudo.md +++ /dev/null @@ -1,75 +0,0 @@ -Calife —— 一个轻量级的sudo替代方案 -================================================================================ -Calife要求用户用户以自己的密码登录（或者root，如果没有提供登录），在验证具有正确的权限后，就会切换到该用户以及组身份，然后就会执行一个shell。如果calife是由root执行的，不需要密码，一个具有恰当用户ID的shell就会被执行。 - -唤醒的shell是用户自身的，除非在calife.auth配置文件中指定了某个shell。 - -如果在命令行指定了“-”选项，就会读取该用户的环境文件，该shell就像是一个登陆shell。 - -这不是su的惯用操作。 - -只有在calife.auth中指定的用户才能使用此方法通过calife成为另外一个用户。 - -calife.auth安装位置处于/etc/calife.auth。 - -### Calife特性 ### - -这里给出了一个关于calife特性的扩展列表： - -你可以完整保留环境变量和shell别名 - -它可以全程记录会话开始到结束 - -你可以为每个calife用户许可的登录制作列表，那样，你就可以用户赋予主管权限而不必提供root密码 - -你可以在配置文件中指定一个组来取代所有管理员登录：只要使用@staff或者%staff，那么所有staff组中的成员都将具有访问calife的权限 - -calife也可以成为那些没有家目录或甚至没有shell的用户。如果你想要成为uucp或者甚至是bin，那会很实用 - -你可以让calife在会话结束时运行一个指定的系统范围的脚本（例如，发送一封邮件告知以root身份做了哪些事） - -### ubuntu中安装calife ### - -打开终端，然后运行以下命令 - - sudo apt-get install calife - -### 使用Calife ### - -### 语法 ### - - calife [-] [login] - -详情请参与calife手册页 - --------------------------------------------------------------------------------- - -via: http://www.ubuntugeek.com/calife-a-lightweight-alternative-to-sudo.html - -作者：[ruchi][a] -译者：[GOLinux](https://github.com/GOLinux) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://www.ubuntugeek.com/author/ubuntufix -[1]: -[2]: -[3]: -[4]: -[5]: -[6]: -[7]: -[8]: -[9]: -[10]: -[11]: -[12]: -[13]: -[14]: -[15]: -[16]: -[17]: -[18]: -[19]: -[20]: From 61a511d27f039dc97cdfa2be05d4f4808f3b1d7c Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 18 Jan 2015 23:08:36 +0800 Subject: [PATCH 077/215] PUB:20141127 Five Magnificent Linux Music Streaming Clients @Stevearzh --- ...gnificent Linux Music Streaming Clients.md | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) rename {translated/share => published}/20141127 Five Magnificent Linux Music Streaming Clients.md (89%) diff --git a/translated/share/20141127 Five Magnificent Linux Music Streaming Clients.md b/published/20141127 Five Magnificent Linux Music Streaming Clients.md similarity index 89% rename from translated/share/20141127 Five Magnificent Linux Music Streaming Clients.md rename to published/20141127 Five Magnificent Linux Music Streaming Clients.md index 526905c329..81409399fc 100644 --- a/translated/share/20141127 Five Magnificent Linux Music Streaming Clients.md +++ b/published/20141127 Five Magnificent Linux Music Streaming Clients.md @@ -2,17 +2,18 @@ Linux 下五款出色的流媒体客户端 ================================================================================ 数字流媒体这几天几乎占据了我音乐收听的全部时间。近年来我为了收藏 CD 花费了数量可观的费用；但它们中的大部分现在正静静地躺在满是灰尘的角落里。基本上所有的音乐流媒体服务所提供的的音质都不如 CD 的，但它们受欢迎的原因很大程度上在于其便捷性，而非高度保真的音质再现。音乐流媒体不仅造成了 CD 销量的大幅减少；也使数字音乐的下载开始缓慢下滑。这种趋势还会继续下去。音乐发烧友现在或许也想要拥抱音乐流媒体服务了，某些音乐流媒体服务商如 Tidal 提供了无损的音乐流媒体服务，其中包含了 25 万首比特率为 1411kbps 的 FLAC 格式的音乐。 -尽管 CD 暂时不会消失，但音乐流媒体服务商却无法协调和那些不满从音乐托管服务中收取的租金的唱片公司及音乐家之间的问题。这一切仍然处于变化之中；我们看到了今年 Led Zeppelin, Pink Floyd, Metallica 签名支持流媒体服务，但仍然有部分知名的老牌乐队如 Beatles, Radiohead 以及 AC/DC 拒绝将自己的作品放到流媒体上供粉丝收听。即使当某个唱片公司或者音乐家已经授权给流媒体服务商访问自己的作品，但只要音乐家发表声明就可以在第一时间将其作品从流媒体服务下架。本月（2014 年 11 月），Taylor Swift 请求将她的所有音乐作品从 Spotify 的流媒体服务下架。有些人还是更偏向于“拥有”他们的音乐，但这看起来像是一种快要过时了的欣赏音乐的方式。 +尽管 CD 暂时不会消失，但音乐流媒体服务商却无法调和那些不满从音乐托管服务中收取的租金的唱片公司及音乐家之间的问题。这一切仍然处于变化之中；我们看到了今年 Led Zeppelin, Pink Floyd, Metallica 签名支持流媒体服务，但仍然有部分知名的老牌乐队如 Beatles, Radiohead 以及 AC/DC 拒绝将自己的作品放到流媒体上供粉丝收听。即使当某个唱片公司或者音乐家已经授权给流媒体服务商访问自己的作品，但只要音乐家发表声明就可以在第一时间将其作品从流媒体服务下架。本月（2014 年 11 月），Taylor Swift 请求将她的所有音乐作品从 Spotify 的流媒体服务下架。有些人还是更偏向于“拥有”他们的音乐，但这看起来像是一种快要过时了的欣赏音乐的方式。 使用 Linux 平台来收听流媒体音乐服务的方法已经逐渐成熟。在 Linux 平台下，你可以找到许多客户端，通过它们你可以使用大部分的音乐流媒体服务；我希望 TIDAL 能在今后合适的时候发行 Linux 桌面客户端，而不是仅仅依赖 web 播放器。本文精选的这些应用都是非常出色的。另外 Amarok，pianobar 还有 Tomahawk 也表现得很不错。 -![Spotify](http://www.linuxlinks.com/portal/content2/png/Spotify.png) +### Spotify ![Spotify 播放界面](http://www.linuxlinks.com/portal/content/reviews/Audio/Screenshot-Spotify-Streaming.png) Spotify 是一种专有的 P2P 音乐流媒体服务，允许用户收听点播曲目或专辑。Spotify 将自己描述为“音乐圣殿。快捷、简易、免费的服务”。Spotify 分别为普通的移动端和桌面端用户提供了 96kbps 和 160kbps 比特率的流媒体服务，并且为高级用户提供了 Ogg Vorbis 格式的 320kbps 比特率的流媒体服务。Spotify 为普通用户提供了免费但是有广告的服务，以及无广告的订阅账户服务。 Spotify 是很奇妙的服务，向用户们提供了涵盖各种类型的数量众多的音乐，如：流行乐、另类摇滚、古典乐、铁克诺电音、摇滚乐等。这是发现新音乐的好方法。Spotify 得到了包括 Sony BMG，EMI，Universal 以及 Warner Music 在内的主流唱片公司，以及 Labrador Records，The Orchard，Alligator Records，Merlin，CD Baby，INgrooves 等独立唱片唱片公司和分销网络，甚至 Chandos，Naxos，EMI Classic，Warner Classics，Denon Essentials 这些古典唱片公司的支持，还有更多的公司在这里就不一一列举了。 + Spotify 的音乐涵盖范围还在继续以惊人的步伐扩张着。 Spotify 现在并没有发行官方版的 Linux 客户端。不过，开发团队已经推出了针对 Linux 的客户端预览版，并且表现得还不错。因为仍然是预览版，所以没有得到官方的支持。 @@ -34,9 +35,8 @@ Spotify 流媒体服务现已支持以下地区/国家：安道尔，阿根廷 - 许可证：专有许可证 - 当前版本：预览版 ----------- -![Pithos](http://www.linuxlinks.com/portal/content2/png/Pithos.png) +### Pithos ![Pithos 播放界面](http://www.linuxlinks.com/portal/content/reviews/Audio/Screenshot-Pithos-streaming.png) @@ -69,9 +69,8 @@ Pandora 音乐服务只能通过美国的 IP 地址使用。不过，非美国 - 许可证：GNU GPL v3 - 当前版本：1.0.0 ----------- -![Clementine](http://www.linuxlinks.com/portal/content2/png/Clementine.png) +### Clementine ![Clementine 播放界面](http://www.linuxlinks.com/portal/content/reviews/Audio/Screenshot-Clementine-Streaming.png) @@ -80,6 +79,7 @@ Clementine 基于 Amarok 开发，是一款跨平台的轻量级现代化音乐 Clementine 在 Amarok 1.4 的基础上开发。 **特色包括：** + - 检索、播放本地音乐库 - 从 Last.fm 和 SomaFM 收听互联网电台 - 标签式播放列表，支持导入导出 M3U，XSPF，PLS 及 ASX 格式的播放列表 @@ -110,9 +110,8 @@ Clementine 在 Amarok 1.4 的基础上开发。 - 许可证：GNU GPL v3 - 当前版本：1.2 ----------- -![Nuvola Player](http://www.linuxlinks.com/portal/content2/png/NuvolaPlayer.png) +### Nuvola Player ![Nuvola Player 播放界面](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-NuvolaPlayer-Streaming.png) @@ -151,9 +150,8 @@ Nuvola Player 是一个免费的开源项目，能够整合云端音乐到你的 - 许可证：2-Clause BSD license - 当前版本：2.4.3 ----------- -![Atraci](http://www.linuxlinks.com/portal/content2/png/Atraci-2.png) +### Atraci ![Atraci 播放界面](http://www.linuxlinks.com/portal/content/reviews/Utilities/Screenshot-Atraci.png) @@ -185,7 +183,7 @@ via: http://www.linuxlinks.com/article/20141116052055674/MusicStreaming.html 作者：Frazer Kline 译者：[Stevearzh](https://github.com/Stevearzh) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 2432f8ac8c5add7f23e13a846cd7157872763c45 Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 18 Jan 2015 23:16:40 +0800 Subject: [PATCH 078/215] PUB:20141204 How To Delete Oracle 11g Database Manually @geekpi --- ...41204 How To Delete Oracle 11g Database Manually.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename {translated/tech => published}/20141204 How To Delete Oracle 11g Database Manually.md (89%) diff --git a/translated/tech/20141204 How To Delete Oracle 11g Database Manually.md b/published/20141204 How To Delete Oracle 11g Database Manually.md similarity index 89% rename from translated/tech/20141204 How To Delete Oracle 11g Database Manually.md rename to published/20141204 How To Delete Oracle 11g Database Manually.md index dd272cdba9..cf236fa6ef 100644 --- a/translated/tech/20141204 How To Delete Oracle 11g Database Manually.md +++ b/published/20141204 How To Delete Oracle 11g Database Manually.md @@ -1,6 +1,6 @@ -如何手动删除Oracle 11g数？据库 +如何手动删除Oracle 11g数据库 ================================================================================ -下面的步骤会家你如何在Linux环境下手动删除Oracle 11g数据库。 +下面的步骤会教你如何在Linux环境下手动删除Oracle 11g数据库。 我在Centos 6上安装了Oralce 11G数据库。 @@ -15,7 +15,7 @@ **在SQL*Plus中关闭数据库，接着退出SQL*Plus** - sqlplus " / as sysdba' + sqlplus "/ as sysdba" ---------- @@ -26,7 +26,7 @@ 在Oralce Linux账户中： - lsnrctl stop + lsnrctl stop 回忆一下之前的文件路径;在删除这些文件的时候作为一个检查项。记住：你备份了数据库了么？当准备好之后，就删除你的数据文件吧，同样还有你的日志文件、控制文件和临时文件。 @@ -44,7 +44,7 @@ via: http://www.unixmen.com/manually-delete-oracle-11g-database/ 作者：[M.el Khamlichi][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 a881635bda06eae899f39ffebdd452db3077bf5f Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 18 Jan 2015 23:33:24 +0800 Subject: [PATCH 079/215] PUB:20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X @runningwater --- ...otable Ubuntu USB Drive For Mac In OS X.md | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) rename {translated/tech => published}/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md (81%) diff --git a/translated/tech/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md b/published/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md similarity index 81% rename from translated/tech/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md rename to published/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md index 5946e3c33f..31192e9aa9 100644 --- a/translated/tech/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md +++ b/published/20141205 How To Create A Bootable Ubuntu USB Drive For Mac In OS X.md @@ -1,28 +1,29 @@ -在 Mac OS X 系统中创建可启动的 Ubuntu USB 驱动盘 +在 Mac OS X 系统中创建用于 Mac 的 Ubuntu USB 启动盘 ================================================================================ + ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/11/Create_bootable_Ubuntu_USB_Mac_OS_X.jpg) -上个月，在戴尔的服务中心丢失我的笔记本后，我买了一台 Macbook Air 笔记本。买回来后我首先做的一些事就是给机器装上双系统，使 Ubuntu Linux 和 Mac OS X 都可用。随后的文章我会介绍如何在 Macbook 上安装 Linux ,刚开始我们需要学习 **如何在 Mac 的 OS X 系统中创建可启动的 Ubuntu USB 驱动盘**。 +上个月，在戴尔的服务中心丢失我的笔记本后，我买了一台 Macbook Air 笔记本。买回来后我首先做的一些事就是给机器装上双系统，使 Ubuntu Linux 和 Mac OS X 都可用。随后的文章我会介绍如何在 Macbook 上安装 Linux ,刚开始我们需要学习 **如何在 Mac OS X 系统中创建用于 Mac 的 Ubuntu USB 启动盘**。 -在 Ubuntu 系统或 Windows 系统中创建可启动的 USB 是非常容易的，但在 Mac OS X 系统中就没这么简单了。这就是为什么 Ubuntu 的官方指南上，在 Mac 中安装 live Ubuntu 推荐使用磁盘安装而不是 USB 的原因。考虑到我的 Macbook Air 既没有 CD 驱动也没有 DVD 驱动，所以我更愿意在 Mac OS X 下创建一个 live USB. +在 Ubuntu 系统或 Windows 系统中创建可启动的 USB 是非常容易的，但在 Mac OS X 系统中就没这么简单了。这就是为什么 Ubuntu 的官方指南上，在 Mac 中安装 live Ubuntu 推荐使用光盘安装而不是 USB 的原因。考虑到我的 Macbook Air 既没有 CD 驱动也没有 DVD 驱动，所以我更愿意在 Mac OS X 下创建一个 live USB。 ### 在 Mac OS X 下创建可启动 USB 驱动盘### -如前所述，在 Mac OS X 上创建对于像 Ubuntu 或任何其它可引导的操作系统这样的可启动 USB 盘是个极其麻烦的过程。但请别担心，按照下面的步骤一步一步操作就行。让我们就开始创建一个可启动的 USB 盘的操作吧： +如前所述，在 Mac OS X 上创建对于像 Ubuntu 或任何其它可引导的操作系统这样的可启动 USB 盘是个比较麻烦的过程。但请别担心，按照下面的步骤一步一步操作就行。让我们就开始创建一个可启动的 USB 盘的操作吧： #### 步骤 1: 格式化 USB 驱动盘 #### -苹果是以它自定义的标准而闻名的，所以 Mac OS X 系统有自己的文件系统类型就好不奇怪了，它的文件系统叫做 Mac OS 扩展或 [HFS 插件][1]。因此，您需要做的第一件事就是用 Mac OS 扩展文件系统来格式化您的 USB 驱动盘。 +苹果是以它自定义的标准而闻名的，所以 Mac OS X 系统有自己的文件系统类型就毫不奇怪了，它的文件系统叫做 Mac OS 扩展或 [HFS 插件][1]。因此，您需要做的第一件事就是用 Mac OS 扩展文件系统来格式化您的 USB 驱动盘。 -要格式化 USB 盘，插入 USB 钥匙链。从 Launchpad（在底部面板上的一个火箭形状的图标）上前往**磁盘工具**应用程序。 +要格式化 USB 盘，请先插入 USB 盘。从 Launchpad（在底部面板上的一个火箭形状的图标）上前往**磁盘工具**应用程序。 ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/11/Disk_Utility_Mac.jpg) -- 在磁盘工具中，从左手边的面板上选择 USB 驱动盘来格式化。 +- 在磁盘工具中，从左手边的面板上选择你的 USB 盘来格式化。 - 点击右边面板的**分区**标签。 - 从下拉菜单中，选择 **1 分区**。 - 给这驱动盘起个您想要的名字。 -- 接下来，切换来**格式化成 Mac OS 扩展 (日志型)** +- 接下来，切换分区格式为**格式化成 Mac OS 扩展 (日志型)** 下面的截屏将会对您有所帮助。 @@ -32,7 +33,7 @@ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/11/Format_Usb_Mac_2.jpg) -当所有的都已经设置完了后，仅仅只需点击**应用**按纽。它会弹出一个要格式化 USB 驱动盘的警告消息，当然是要点击分区按纽来格式化 USB 驱动盘拉。 +当所有都已经设置完了后，仅仅只需点击**应用**按纽。它会弹出一个要格式化 USB 驱动盘的警告消息，当然是要点击分区按纽来格式化 USB 驱动盘拉。 #### 步骤 2: 下载 Ubuntu #### @@ -50,15 +51,15 @@ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/11/ISO_to_IMG_Convert_Mac_OS_X.jpeg) -您可能已经注意到我并没有新转换出的文件加上 IMG 后缀。这是没问题的，因为后缀只是个标志，它代表的是文件类型并不是文件的扩展名。转换出来的文件可能会被 Mac OS X 系统自动加上个 .dmg 后缀。别担心，这是正常的。 +您可能已经注意到我并没有新转换出的文件加上 IMG 后缀。这是没问题的，因为后缀只是个标志，重要的是文件类型并不是文件的扩展名。转换出来的文件可能会被 Mac OS X 系统自动加上个 .dmg 后缀。别担心，这是正常的。 -#### 步骤 4: 获得 USB 驱动盘的设备号 #### +#### 步骤 4: 获得 USB 盘的设备号 #### -接下来的事情就是获得 USB 驱动盘的设备号。在终端中运行如下命令： +接下来的事情就是获得 USB 盘的设备号。在终端中运行如下命令： diskutil list - 它会列出系统中当前可用的所有‘磁盘’信息。从它的大小上您应该能识别出此 USB 驱动盘。为了避免混淆，我建议您只插入一个 USB 盘。我的示例中，设置号是 2 （一个大小为 8G 的 USB）: /dev/disk2 + 它会列出系统中当前可用的所有‘磁盘’信息。从它的大小上您应该能识别出此 USB 盘。为了避免混淆，我建议您只插入一个 USB 盘。我的示例中，设置号是 2 （一个大小为 8G 的 USB）: /dev/disk2 ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/11/Create_bootable_USB_Mac_OSX.jpeg) @@ -110,11 +111,11 @@ N 当然指的是我们前面使用过的设备号，在我的示例中是 2 ： diskutil eject /dev/disk2 -一旦弹出，点击前面出现那对话框上的**忽略**按纽。现在您的可启动 USB 磁盘已经创建好了，把它从系统中移除。 +一旦弹出，点击前面出现那对话框上的**忽略**按纽。现在您的可启动 USB 磁盘已经创建好了，把它拔下来吧。 #### 步骤 7: 检查您新创建的可启动 USB 盘 #### -一旦您在 Mac OS X 中完成了创建一个 live USB 这么重大的任务，是时候测试您的幸成果了。 +一旦您在 Mac OS X 中完成了创建一个 live USB 这么重大的任务，是时候测试您的新成果了。 - 插入可启动 USB 盘，重启系统。 - 在苹果启动的时候，一直按着 option （或 alt）键。 @@ -128,7 +129,7 @@ N 当然指的是我们前面使用过的设备号，在我的示例中是 2 ： ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2014/11/Ubuntu_boot_USB_Mac_OSX.jpeg) -我希望这篇教程对您想要在 Mac OS X 下创建可启动的 Ubuntu 系统 USB 驱动盘。在接下来的一篇文章中您会学到怎么样安装 OS X 和 Ubuntu 双系统。请继续关注。 +我希望这篇教程对您想要在 Mac OS X 下创建可启动的 Ubuntu 系统 USB 驱动盘有所帮助。在接下来的一篇文章中您会学到怎么样安装 OS X 和 Ubuntu 双系统。请继续关注。 -------------------------------------------------------------------------------- @@ -136,7 +137,7 @@ via: http://itsfoss.com/create-bootable-ubuntu-usb-drive-mac-os/ 作者：[Abhishek][a] 译者：[runningwater](https://github.com/runningwater) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From a01b43d76a35dc3584bbfc268ebb5d64101c00aa Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 19 Jan 2015 10:09:17 +0800 Subject: [PATCH 080/215] PUB:20141120 How to configure and secure your Postfix email server @GOLinux --- ...re and secure your Postfix email server.md | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) rename {translated/tech => published}/20141120 How to configure and secure your Postfix email server.md (74%) diff --git a/translated/tech/20141120 How to configure and secure your Postfix email server.md b/published/20141120 How to configure and secure your Postfix email server.md similarity index 74% rename from translated/tech/20141120 How to configure and secure your Postfix email server.md rename to published/20141120 How to configure and secure your Postfix email server.md index 40170ec535..454c984516 100644 --- a/translated/tech/20141120 How to configure and secure your Postfix email server.md +++ b/published/20141120 How to configure and secure your Postfix email server.md @@ -13,7 +13,7 @@ Postfix邮件服务器的配置与安全加固 service sendmail stop yum remove sendmail -Postfix包含了**两个配置文件main.cf和master.cf**，对于基本的配置，你需要修改main.cf。同时，postfix可以像shell变量一样定义参数，并通过美元符号来调用。这些参数不需要再使用前定义，Postfix只在运行中需要时才会查询某个参数。 +Postfix包含了**两个配置文件main.cf和master.cf**，对于基本的配置，你需要修改main.cf。同时，postfix可以像shell变量一样定义参数，并通过$来调用。这些参数不需要再使用前定义，Postfix只在运行中需要时才会查询某个参数。 ### 配置postfix ### @@ -21,23 +21,23 @@ Postfix包含了**两个配置文件main.cf和master.cf**，对于基本的配 去掉以下行的注释 - #Add the hostname of your machine + # 你的主机名 myhostname = yourhostname.com - #From Domain to be used when mail is sent from this linux machine + # 你的发件域 myorigin = $myhostname - #The network interface to receive mail on, I prefer localhost as I only want emails from this system to be delivered + # 指定用于接收邮件的网络接口，这里指定 localhost 是因为我们只用来接受本地的程序投递 inet_interfaces = localhost - # The protocol to use when postfix will make or accept a connection. You can use “all” if you want to enable IPv6 support + # 指定所使用的协议，可以使用“all”来增加 IPv6 支持 inet_protocols = ipv4 - #Domains to receive email for + # 指定所接受的邮件域 mydestination = $myhostname, localhost.$mydomain, localhost - #Only forward emails for the local machine and not machines on the network. + # 仅转发本地主机的邮件，而不是主机所在的网络 mynetworks_style = host 启动postfix @@ -48,13 +48,13 @@ Postfix包含了**两个配置文件main.cf和master.cf**，对于基本的配 echo test mail | mail -s "test" leo@techarena51.com && sudo tail -f /var/log/maillog - #Logs should output the following + # 输出的日志类似如下 Aug 25 14:16:21 vps postfix/smtp[32622]: E6A372DC065D: to=, relay=smtp.mailserver.org[50.56.21.176], delay=0.8, delays=0.1/0/0.43/0.27, dsn=2.0.0, status=sent (250 Great success) Aug 25 14:16:21 vps postfix/qmgr[5355]: E6A372DC065D: removed -但是，上述配置并不够，因为邮件服务大多数时候都会被垃圾邮件挤满，你需要添加SPF、PTR和DKIM记录。你的邮件仍然可能被当作垃圾邮件来投递，因为你的IP地址被列入了黑名单，大多数时候是因为你的vps先前被入侵了。 +但是，上述配置并不够，因为邮件服务大多数时候都会被垃圾邮件挤满，你需要添加SPF、PTR和DKIM记录。即便如此，你的邮件仍然可能被当作垃圾邮件来投递，因为你的IP地址被列入了黑名单，大多数时候是因为你的vps先前被入侵了。 -另外一种选择，或者说是更好的方式是使用第三方邮件提供商提供的邮件服务，如Gmail，或者甚至是Mailgun。我使用Mailgun，因为它们提供了每个月10000封免费电子邮件，而Gmail则提供了每天100封左右的邮件。 +还有另外一种选择，或者说是更好的方式是使用第三方邮件提供商提供的邮件服务，如Gmail，或者甚至是Mailgun。我使用Mailgun，因为它们提供了每个月10000封免费电子邮件，而Gmail则提供了每天100封左右的邮件。 在“/etc/postfix/main.cf”中，你需要添加“smtp.mailgun.com”作为你的“转发主机”，并启用“SASL”验证，这样postfix就可以连接并验证到远程Mailgun服务器。 @@ -77,21 +77,21 @@ Postfix本身不会实施“SASL”验证，因此你需要安装“cyrus-sasl-p ### 使用TLS加固Postfix安全 ### -Postfix支持TLS，它是SSL的后继者，允许你使用基于密钥的验证来加密数据。我推荐你阅读http://www.postfix.org/TLS_README.html，以了解tls是怎么和postfix一起工作的。 +Postfix支持TLS，它是SSL的后继者，允许你使用基于密钥的验证来加密数据。我推荐你阅读 http://www.postfix.org/TLS_README.html ，以了解TLS是怎么和postfix一起工作的。 为了使用TLS，你需要生成一个私钥和一个由证书授权机构颁发的证书。在本例中，我将使用自颁发的证书。 sudo yum install mod_ssl openssl - # Generate private key + # 生成私钥 openssl genrsa -out smtp.key 2048 - # Generate CSR + # 生成 CSR openssl req -new -key smtp.key -out smtp.csr - # Generate Self Signed Key + # 生成自签名的钥匙 openssl x509 -req -days 365 -in smtp.csr -signkey smtp.key -out smtp.crt - # Copy the files to the correct locations + # 将文件复制到正确的位置 cp smtp.crt /etc/pki/tls/certs cp smtp.key /etc/pki/tls/private/smtp.key cp smtp.csr /etc/pki/tls/private/smtp.csr @@ -109,10 +109,10 @@ Postfix支持TLS，它是SSL的后继者，允许你使用基于密钥的验证 smtp_tls_CAfile = /etc/ssl/certs/ca.crt smtp_tls_loglevel = 1 -安全级别“may”意味着宣告对远程SMTP客户端上的STARTTLS的支持，但是客户端不需要使用加密。我在这里用它作为每个[mailgun文档][1]，但是如果你想要强制使用TLS加密，可以使用“encrypt”。 +安全级别“may”意味着宣告对远程SMTP客户端上的STARTTLS的支持，但是客户端不需要使用加密。我在这里按照[mailgun文档][1]提示使用“may”，但是如果你想要强制使用TLS加密，可以使用“encrypt”。 service postfix restart - #Send a test email + # 发送一封测试邮件 echo test mail | mail -s "test" test@yourdomain.com && sudo tail -f /var/log/maillog 你应该会看到以下信息 @@ -122,7 +122,7 @@ Postfix支持TLS，它是SSL的后继者，允许你使用基于密钥的验证 如果一切正常，你可以注释掉以下参数。 -“smtp_tls_loglevel = 1” +“smtp\_tls\_loglevel = 1” 对于故障排除，我推荐你阅读[Postfix小建议和排障命令][2] @@ -132,7 +132,7 @@ via: http://techarena51.com/index.php/configure-secure-postfix-email-server/ 作者：[Leo G][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 7e84dad563b118543cb724b2adffdd471b1dfd2d Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 19 Jan 2015 10:22:17 +0800 Subject: [PATCH 081/215] PUB:20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem @geekpi --- ...iboot USB From Ubuntu Using MultiSystem.md | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) rename {translated/tech => published}/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md (70%) diff --git a/translated/tech/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md b/published/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md similarity index 70% rename from translated/tech/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md rename to published/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md index beb8600024..fb228ad6be 100644 --- a/translated/tech/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md +++ b/published/20141127 How To Create A Multiboot USB From Ubuntu Using MultiSystem.md @@ -1,8 +1,9 @@ -如何在Ubuntu上使用MultiSystem创建多启动USB +如何在Ubuntu上使用MultiSystem创建多启动USB盘 ================================================================================ + ### 介绍 ### -一些人并不知道**MultiSystem**是一个小型的开源软件来在Linux系统中创建多启动usb盘。使用这个工具，我们可以在USB中创建任意多的可启动Linux发行版。你所要的只是网络链接（之在MultiSystem安装的时候需要），以及一个足够大的USB盘，这取决于你想在USB盘中放入发行版的数量。 +也许还有不少人不知道**MultiSystem**，它是一个用来在Linux系统中创建多启动usb盘的小型的开源软件。使用这个工具，我们可以在USB中创建任意多的可启动Linux发行版。你所需要的只是网络链接（只在MultiSystem安装的时候需要），以及一个足够大的USB盘，这取决于你想在USB盘中放入发行版的数量。 ### 在 Ubuntu 14.10/14.04 安装MultiSystem ### @@ -14,18 +15,18 @@ #### 使用 PPA 安装: #### -相应地，你可以用下面的命令来更简单地使用PPA来安装MultiSystem。 +当然，你也可以用下面的命令来更简单地使用PPA来安装MultiSystem。 sudo apt-add-repository 'deb http://liveusb.info/multisystem/depot all main' wget -q -O - http://liveusb.info/multisystem/depot/multisystem.asc | sudo apt-key add - sudo apt-get update sudo apt-get install multisystem -安装玩之后，它会自动打开。只要点击关闭按钮退出。 +安装完之后，它会自动打开MultiSystem。只要点击关闭按钮退出。 ### 安装之后 ### -安装完成后，插入你的USB，并通过Unity Dash或者菜单运行MultiSystem。 +MultiSystem 安装完成后，可以插入你的USB，并通过Unity Dash或者菜单运行MultiSystem。 ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/Menu_0012.png) @@ -33,7 +34,7 @@ ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/MultiSystem_002.png) -选择USB设备，点击**确认**按钮。你可能会看到下面的错误窗口。不必担心，它说的是USB设备没有标签。点击OK让MultiSystem自动设置标签。 +选择USB设备，点击**确认**按钮。如果你看到下面的错误窗口，不必担心，它说的是USB设备没有标签。点击OK让MultiSystem自动设置标签。 ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/Error_003.png) @@ -47,7 +48,7 @@ ### 使用 ### -MultiSystem非常容易使用。将ISO文件拖入MultiSystem窗口中。如果这不能用，点击底部的**cd 按钮**来选择ISO文件。 +MultiSystem非常容易使用。将ISO文件拖入MultiSystem窗口中。如果不行的话，点击底部的**cd 按钮**来选择ISO文件。 ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/MultiSystem_006.png) @@ -65,24 +66,24 @@ MultiSystem非常容易使用。将ISO文件拖入MultiSystem窗口中。如果 ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/QEMU_009.png) -额外地，MultiSystem含有一些额外的选项： +此外，MultiSystem含有一些其它的选项： -- Grub 设置; -- Grub 和 Burg 的bootloader更新; -- 下载 LiveCD; -- VirtualBox 安装; -- 格式化USB盘; -- 还有更多选项。 +- Grub 设置 +- Grub 和 Burg 的bootloader更新 +- 下载 LiveCD +- VirtualBox 安装 +- 格式化USB盘 +- 还有更多选项 -要浏览额外的选项列表，进入MultiSystem的**菜单**标签。 +这些额外选项可以在MultiSystem的**菜单**标签里面看到。 ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/MultiSystem_010.png) -同样，你可以在Ubuntu中使用QEMU或者Oracle VirtualBox测试多启动USB盘。 +同样，你也可以在Ubuntu中使用QEMU或者Oracle VirtualBox测试多启动USB盘。 ![](http://180016988.r.cdn77.net/wp-content/uploads/2014/11/MultiSystem_011.png) -MultiSystem工具是我测试到现在最棒和最有用的一款工具。这款工具对那些想要在他们的机器上安装多个系统的人是非常有用的。在你外出的时候，你不必再携带CD/DVD袋了。只要买一个16GB或者32GB的USB就行，并把所有你想要的系统都放在里面，就像老板一样安装系统。 +MultiSystem工具是我测试到现在最棒和最有用的一款工具。这款工具对那些想要在他们的机器上安装多个系统的人是非常有用的。在你外出的时候，你不必再携带CD/DVD袋了。只要买一个16GB或者32GB的USB就行，并下载所有你想要的系统，随心所欲的安装系统即可。 并且，一个对于Windows系统用户的好消息是它也支持Windows系统。我在Windows 7上测试过，它可以工作！ @@ -94,7 +95,7 @@ via: http://www.unixmen.com/create-multiboot-usb-ubuntu-using-multisystem/ 作者：[SK][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 0bed6db0157ef60fe4873130f79106558b9a48be Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 19 Jan 2015 10:42:09 +0800 Subject: [PATCH 082/215] PUB:20150104 Docker Image Insecurity @tinyeyeser --- .../20150104 Docker Image Insecurity.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename {translated/tech => published}/20150104 Docker Image Insecurity.md (89%) diff --git a/translated/tech/20150104 Docker Image Insecurity.md b/published/20150104 Docker Image Insecurity.md similarity index 89% rename from translated/tech/20150104 Docker Image Insecurity.md rename to published/20150104 Docker Image Insecurity.md index 5efa79ae02..712096bf78 100644 --- a/translated/tech/20150104 Docker Image Insecurity.md +++ b/published/20150104 Docker Image Insecurity.md @@ -6,7 +6,7 @@ Docker的镜像并不安全！ 起初我以为这条信息引自Docker[大力推广][1]的镜像签名系统，因此也就没有继续跟进。后来，研究加密摘要系统的时候——Docker用这套系统来对镜像进行安全加固——我才有机会更深入的发现，逻辑上整个与镜像安全相关的部分具有一系列系统性问题。 -Docker所报告的，一个已下载的镜像经过“验证”，它基于的仅仅是一个标记清单（signed manifest)，而Docker却从未根据清单对镜像的校验和进行验证。一名攻击者以此可以提供任意所谓具有标记清单的镜像。一系列严重漏洞的大门就此敞开。 +Docker所报告的，一个已下载的镜像经过“验证”，它基于的仅仅是一个标记清单（signed manifest)，而Docker却从未据此清单对镜像的校验和进行验证。一名攻击者以此可以提供任意所谓具有标记清单的镜像。一系列严重漏洞的大门就此敞开。 镜像经由HTTPS服务器下载后，通过一个未加密的管道流进入Docker守护进程： @@ -14,7 +14,7 @@ Docker所报告的，一个已下载的镜像经过“验证”，它基于的 这条管道的性能没有问题，但是却完全没有经过加密。不可信的输入在签名验证之前是不应当进入管道的。不幸的是，Docker在上面处理镜像的三个步骤中，都没有对校验和进行验证。 -然而，不论Docker如何[声明][2]，实际上镜像的校验和从未经过校验。下面是Docker与镜像校验和的验证相关的代码[片段][3]，即使我提交了校验和不匹配的镜像，都无法触发警告信息。 +然而，不论Docker如何[声明][2]，实际上镜像的校验和（Checksum）从未经过校验。下面是Docker与镜像校验和的验证相关的代码[片段][3]，即使我提交了校验和不匹配的镜像，都无法触发警告信息。 if img.Checksum != "" && img.Checksum != checksum { log.Warnf("image layer checksum mismatch: computed %q, @@ -29,7 +29,7 @@ Docker支持三种压缩算法：gzip、bzip2和xz。前两种使用Go的标准 第三种压缩算法，xz，比较有意思。因为没有现成的Go实现，Docker 通过[执行(exec)][5]`xz`二进制命令来实现解压缩。 -xz二进制程序来自于[XZ Utils][6]项目，由[大概][7]2万行C代码生成而来。而C语言不是一门内存安全的语言。这意味着C程序的恶意输入，在这里也就是Docker镜像的XZ Utils解包程序，潜在地可能会执行任意代码。 +xz二进制程序来自于[XZ Utils][6]项目，由[大概][7]2万行C代码生成而来。而C语言不是一门内存安全的语言。这意味着C程序的恶意输入，在这里也就是Docker镜像的XZ Utils解包程序，潜在地存在可能会执行任意代码的风险。 Docker以root权限*运行* `xz` 命令，更加恶化了这一潜在威胁。这意味着如果在`xz`中出现了一个漏洞，对`docker pull`命令的调用就会导致用户整个系统的完全沦陷。 @@ -39,7 +39,6 @@ Docker以root权限*运行* `xz` 命令，更加恶化了这一潜在威胁。 由于其生成校验和的步骤固定，它解码不可信数据的过程就有可能被设计成[攻破tarsum的代码][9]。这里潜在的攻击既包括拒绝服务攻击，还有逻辑上的漏洞攻击，可能导致文件被感染、忽略、进程被篡改、植入等等，这一切攻击的同时，校验和可能都是不变的。 - **解包** 解包的过程包括tar解码和生成硬盘上的文件。这一过程尤其危险，因为在解包写入硬盘的过程中有另外三个[已报告的漏洞][10]。 @@ -60,8 +59,7 @@ Docker的工具包[libtrust][11]，号称“通过一个分布式的信任图表 ### 补救 ### -研究结束前，我[报告][15]了一些在tarsum系统中发现的问题，但是截至目前我报告的这些问题仍然 -没有修复。 +研究结束前，我[报告][15]了一些在tarsum系统中发现的问题，但是截至目前我报告的这些问题仍然没有修复。 要改进Docker镜像下载系统的安全问题，我认为应当有以下措施： @@ -79,16 +77,18 @@ Docker的工具包[libtrust][11]，号称“通过一个分布式的信任图表 作为将更新框架加入Docker的一部分，还应当加入一个本地密钥存储池，将root密钥与registry的地址进行映射，这样用户就可以拥有他们自己的签名密钥，而不必使用Docker公司的了。 -我注意到使用Docker公司非官方的宿主仓库往往会是一种非常糟糕的用户体验。当没有技术上的原因时，Docker也会将第三方的仓库内容降为二等地位来看待。这个问题不仅仅是生态问题，还是一个终端用户的安全问题。针对第三方仓库的全方位、去中心化的安全模型即必须又迫切。我希望Docker公司在重新设计他们的安全模型和镜像认证系统时能采纳这一点。 +我注意到使用非Docker公司官方的第三方仓库往往会是一种非常糟糕的用户体验。Docker也会将第三方的仓库内容降为二等地位来看待，即使不因为技术上的原因。这个问题不仅仅是生态问题，还是一个终端用户的安全问题。针对第三方仓库的全方位、去中心化的安全模型既必须又迫切。我希望Docker公司在重新设计他们的安全模型和镜像认证系统时能采纳这一点。 ### 结论 ### -Docker用户应当意识到负责下载镜像的代码是非常不安全的。用户们应当只下载那些出处没有问题的镜像。目前，这里的“没有问题”并不包括Docker公司的“可信（trusted）”镜像，例如官方的Ubuntu和其他基础镜像。 +Docker用户应当意识到负责下载镜像的代码是非常不安全的。用户们应当只下载那些出处没有问题的镜像。目前，这里的“没有问题”并**不**包括Docker公司的“可信（trusted）”镜像，例如官方的Ubuntu和其他基础镜像。 最好的选择就是在本地屏蔽 `index.docker.io`，然后使用`docker load`命令在导入Docker之前手动下载镜像并对其进行验证。Red Hat的安全博客有一篇[很好的文章][18]，大家可以看看。 感谢Lewis Marshall指出tarsum从未真正验证。 +参考 + - [校验和的代码][19] - [cloc][20]介绍了18141行没有空格没有注释的C代码，以及5900行的header代码，版本号为v5.2.0。 - [Android中也发现了][21]类似的bug，能够感染已签名包中的任意文件。同样出现问题的还有[Windows的Authenticode][22]认证系统，二进制文件会被篡改。 @@ -101,7 +101,7 @@ via: https://titanous.com/posts/docker-insecurity 作者：[titanous][a] 译者：[Mr小眼儿](http://blog.csdn.net/tinyeyeser) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 0c4ad0bc8e79e28c1f7f8ccf805708829baa8ea9 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Mon, 19 Jan 2015 12:05:39 +0800 Subject: [PATCH 083/215] translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md --- ... Step Guide To Installing Xubuntu Linux.md | 155 ++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md diff --git a/translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md b/translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md new file mode 100644 index 0000000000..3fc83ba9ef --- /dev/null +++ b/translated/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md @@ -0,0 +1,155 @@ +手把手教你安装Xubuntu Linux +============================================== + +### 简介 ### + +![Xubuntu](http://f.tqn.com/y/linux/1/S/J/J/1/fulldesktop.png) + +这个教程会一步一步的教你如何安装Xubuntu Linux。 + +为什么你会想要安装Xubuntu呢？这里有三个原因： + +1. 你有一台安装Windows XP的计算机，但是微软已经不再对Windows XP提供支持 +2. 你的[电脑运行很慢][1]，并且你想要一个轻量级并且跟得上时代潮流的操作系统 +3. 你想要增加一些DIY经验 + +首先，你需要[下载Xubuntu，并且创建一个启动优盘][2]。 + +完成以后，用优盘启动到Xubuntu，然后点击安装Xubuntu图标。 + +### 选择你的安装语言 ### + +![选择语言](http://f.tqn.com/y/linux/1/S/K/J/1/xubuntuinstall1.png) + +第一步，选择你的安装语言。 + +在左边的列表中选择语言，然后单击“Continue”。 + +### 选择无线网络链接 ### + +![选择无线网络](http://f.tqn.com/y/linux/1/S/L/J/1/xubuntuinstall2.png) + +第二步，需要你来选择你的网络链接。这个步骤不是必须的。 + +如果你[网络状况十分糟糕][3]，直接跳过是一个明智的选择，因为安装程序会在安装过程中从网络上下载一些更新包。那么可想而知，你的安装过程就会花费很长的时间。 + +当然，如果你的[网速很快][4]，选择一个无线网，然后输入密码就行了。 + +### 准备安装 ### + +![准备安装](http://f.tqn.com/y/linux/1/S/M/J/1/xubuntuinstall3.png) + +这时候，你将会看到一个列表，显示安装Xubuntu的一些准备条件： + +- 是否拥有至少6.2G的磁盘空间 +- 是否链接到互联网 +- 是否连接了电源 + +只有磁盘空间是必要条件。 + +在上一个步骤中提到过，你可以在安装Xubuntu的过程中不安装更新包。在系统安装完成以后再安装更新包也是可以的。 + +安装过程中，如果电池电量耗完的话，你才必须要链接到到电源。 + +这里还有一个复选框，提示你是否安装用于[播放MP3][5]或者[Flash视频][6]的第三方软件，当然，这些内容也可以在安装完成以后进行。 + +### 选择安装类型 ### + +![选择安装类型](http://f.tqn.com/y/linux/1/S/N/J/1/xubuntuinstall4.png) + +接下来的步骤是选择安装类型。显示那些选项，取决于之前电脑上安装了什么系统。 + +在我的示例中，我已经安装了[Ubuntu MATE][7]，所以，我的选项是重装Ubuntu、删除并且重装、Xubuntu和Ubuntu双系统、以及其他。 + +如果你的计算机上安装了Windows，那么你得到的选项就是，安装双系统、使用Xubuntu替换Windows以及其他。 + +这个教程只是用来说明如何在计算机上安装Xubuntu，而不是怎么安装双系统，那将是一个完全不同的教程。 + +选择使用Xubuntu替换当前系统，然后点击“Continue”。 + +> 备注：这会导致你的磁盘被完全清除，在继续安装之前，你应该备份你的数据。 + +### 选择安装磁盘 ### + +![清除磁盘并且安装Xubuntu](http://f.tqn.com/y/linux/1/S/O/J/1/xubuntuinstall5.png) + +选择你要在那个磁盘上安装的Xubuntu。 + +点击“Install Now”。 + +这时候会弹出一个警告窗口，会提示你，选择的磁盘驱动器会被完全清除，然后会显示一个新创建的分区列表。 + +> 备注：这是你改变主意的最后一个机会，如果你点击继续，磁盘就会被完全清除，然后开始安装Xubuntu。 + +点击“Continue”来安装Xubuntu。 + +### 选择地区 ### + +![选择地区](http://f.tqn.com/y/linux/1/S/P/J/1/xubuntuinstall7.png) + +这个步骤中，你需要通过点击底图来选择你的地区。系统根据你的选择来设置时区，这样，你的时钟就可以显示正确的时间了。 + +选择以后点击“Continue”。 + +### 选择键盘布局 ### + +![选择键盘布局](http://f.tqn.com/y/linux/1/S/Q/J/1/xubuntuinstall8.png) + +选择你的键盘布局。 + +在左边的列表中选择键盘语言，然后在右边的列表显示确切的键盘布局。 + +你也可以点击“Detect Keyboard Layout”让系统选择最适合的键盘布局。 + +如果你需要确认键盘布局是否正确，可以在“Type here to test your keyboard”输入字符。你需要特别注意fn键和一些符号，例如英镑和美元符号。 + +如果在安装过程中没有设对也没关系，安装完成以后在Xubuntu系统设置中也可以进行调整。 + +### 新增用户 ### + +![新增用户](http://f.tqn.com/y/linux/1/S/R/J/1/xubuntuinstall9.png) + +为了使用Xubuntu，你至少需要设置一个用户，因此安装程序需要你设置一个默认用户。 + +在前两个输入框里面，输入你的名字以及用来识别你的计算机的名字。 + +为用户选择一个用户名并且[创建一个密码][8]。为了保证你的密码输入正确，你需要输入两遍。 + +如果你想要系统自动登入，而不是在每次启动的时候输入密码，选择“Log in automatically”。尽管对于我来说，我肯定不会选择这个选项。 + +更好的选项是“Require my password to log in”，并且如果你想要更高的安全等级，勾选“Encrypt my home fodler”选项。 + +点击“Continue”然后继续。 + +### 等待安装完成 ### + +![等待安装完成](http://f.tqn.com/y/linux/1/S/S/J/1/xubuntuinstall10.png) + +这个步骤中，将会会拷贝文件到你的电脑，并且安装Xubuntu。 + +在这个过程中，你会看到一个简短的幻灯片。在这个时候你可以去[泡一杯咖啡][9]或者放松一下什么的。 + +安装完成以后，会弹出提示告诉你是否重新启动，并且开始体验一下新安装的Xubuntu系统。 + +准备好了么？拔掉启动盘重新启动吧。 + +> 备注：在UEFI机器上面安装Xubuntu的话，需要一些额外的步骤，在这个教程里面没有提到。关于这方面的内容，且听下回分解。 + +via : http://linux.about.com/od/howtos/ss/A-Step-By-Step-Guide-To-Installing-Xubuntu-Linux.htm#step-heading + +作者：[Gary Newell][a] +译者：[zhouj-sh](https://github.com/zhouj-sh) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linux.about.com/bio/Gary-Newell-132058.htm +[1]:http://windows.about.com/od/maintainandfix/a/8ways2speedup.htm +[2]:http://linux.about.com/od/howtos/ss/How-To-Create-A-Persistent-Bootable-Xubuntu-Linux-USB-Drive.htm +[3]:http://netforbeginners.about.com/od/basicinternethardware/f/Why-Internet-Connections-Can-Be-Slow.htm +[4]:http://netforbeginners.about.com/b/2011/09/07/test-your-internet-connection-speed-here.htm +[5]:http://mp3.about.com/od/freebies/tp/freemusictp.htm +[6]:http://animation.about.com/od/2danimationtutorials/ss/2d_fla_lesson1.htm +[7]:http://www.everydaylinuxuser.com/2014/11/ubuntu-mate-vs-lubuntu-on-old-netbook.html +[8]:http://netsecurity.about.com/cs/generalsecurity/a/aa112103b.htm +[9]:http://coffeetea.about.com/od/preparationandrecipes/ \ No newline at end of file From b56f724ca227d0ba74c86283513b746ef89c19f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?latyas=28=E6=87=92=29?= Date: Mon, 19 Jan 2015 13:42:23 +0800 Subject: [PATCH 084/215] [Translating]What is good audio editing software on Linux --- ...141219 What is good audio editing software on Linux.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sources/tech/20141219 What is good audio editing software on Linux.md b/sources/tech/20141219 What is good audio editing software on Linux.md index 416dd9bf52..d9228b4eda 100644 --- a/sources/tech/20141219 What is good audio editing software on Linux.md +++ b/sources/tech/20141219 What is good audio editing software on Linux.md @@ -1,6 +1,8 @@ -What is good audio editing software on Linux +Translating by ly0 + +Linux下一些蛮不错的音频编辑软件 ================================================================================ -Whether you are an amateur musician or just a student recording his professor, you need to edit and work with audio recordings. If for a long time such task was exclusively attributed to Macintosh, this time is over, and Linux now has what it takes to do the job. In short, here is a non-exhaustive list of good audio editing software, fit for different tasks and needs. +无论你是一个业余的音乐家或者仅仅是一个上课撸教授音的学，你总是需要和录音打交道。如果你有很长的时间仅仅用Mac干这种事情，那么可以和这个过程说拜拜了，现在Linux也可以干同样的事情。简而言之，这里有一个简单但是不错的音频编辑软件列表，来满足你对不同任务和需求。 ### 1. Audacity ### @@ -78,4 +80,4 @@ via: http://xmodulo.com/good-audio-editing-software-linux.html [17]: [18]: [19]: -[20]: \ No newline at end of file +[20]: From 74239768b1e788c60e78bc226ea01631d5c42f1b Mon Sep 17 00:00:00 2001 From: alim0x Date: Mon, 19 Jan 2015 13:45:03 +0800 Subject: [PATCH 085/215] [translaing]the haistory of android - 12 --- .../The history of Android/12 - The history of Android.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 index 6f7058c56a..67538389d0 100644 --- 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 @@ -1,3 +1,5 @@ +translating by alim0x + The history of Android ================================================================================ ### Android 2.1—the discovery (and abuse) of animations ### @@ -88,11 +90,11 @@ The oft-neglected Music app got a minor update. The four-button home screen was -------------------------------------------------------------------------------- -via: +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 \ No newline at end of file +[t]:https://twitter.com/RonAmadeo From 814f81b13d9b64295235211ddeab00da9d9d4fa0 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Mon, 19 Jan 2015 13:56:53 +0800 Subject: [PATCH 086/215] delete sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md --- ... Step Guide To Installing Xubuntu Linux.md | 157 ------------------ 1 file changed, 157 deletions(-) delete mode 100644 sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md diff --git a/sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md b/sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md deleted file mode 100644 index af699dfd8b..0000000000 --- a/sources/share/20150116 A Step By Step Guide To Installing Xubuntu Linux.md +++ /dev/null @@ -1,157 +0,0 @@ -A Step By Step Guide To Installing Xubuntu Linux -================================================================ - -### Introduction To Installing Xubuntu Linux ### - -![Xubuntu](http://f.tqn.com/y/linux/1/S/J/J/1/fulldesktop.png) - -This guide shows how to install Xubuntu Linux using step by step instructions. - -Why would you want to install Xubuntu? Here are three reasons: - -1. You have a computer running Windows XP that is out of support -2. You have [a computer that is running really slowly][1] and you want a lightweight but modern operating system -3. You want to be able to customise your computing experience - -The first thing you need to do is download Xubuntu and create a bootable USB drive. - -After you have done this boot into a live version of Xubuntu and click on the install Xubuntu icon. - -### Choose Your Installation Language ### - -![Choose Language](http://f.tqn.com/y/linux/1/S/K/J/1/xubuntuinstall1.png) - -The first step is to choose your language. - -Click on the language in the left pane and then click "Continue" - -### Choose Wireless Connection ### - -![Set Up Your Wireless Connection](http://f.tqn.com/y/linux/1/S/L/J/1/xubuntuinstall2.png) - -The second step requires you to choose your internet connection. This is not a required step and there are reasons why you might choose not to set up your internet connection at this stage. - -If you have a [poor internet connection][3] it is a good idea not to choose a wireless network because the installer will attempt to download updates as part of the installation. Your installation will therefore take a long time to complete. - -If you have a really [good internet connection][4] choose your wireless network and enter the security key. - -### Be Prepared ### - -![Preparing To Install Xubuntu](http://f.tqn.com/y/linux/1/S/M/J/1/xubuntuinstall3.png) - -You will now see a checklist which shows how well prepared you are for installing Xubuntu: - -- Do you have at least 6.2 gigabytes of disk space -- Are you connected to the internet -- Are you connected to a power source - -The only one that is a necessity is the disk space. - -As mentioned in the previous step you can install Xubuntu without being connected to the internet. You can install updates once the installation is complete. - -You only need to be connected to a power source if you are likely to run out of battery power during the installation. - -Note that if you are connected to the internet there is a checkbox to turn off the option to download updates while installing. - -There is also a checkbox that lets you install third party software to enable you to [play MP3s][5] and watch [Flash videos][6]. This is a step that can be completed post installation as well. - -### Choose Your Installation Type ### - -![](http://f.tqn.com/y/linux/1/S/N/J/1/xubuntuinstall4.png) - -The next step is to choose the installation type. The options available will depend on what is already installed on the computer. - -In my case I was installing Xubuntu on a netbook over the top of [Ubuntu MATE][7] and so I had options to reinstall Ubuntu, erase and reinstall, install Xubuntu alongside Ubuntu or something else. - -If you have Windows on your computer you will have options to install alongside, replace Windows with Xubuntu or something else. - -This guide shows how to install Xubuntu on a computer and not how to dual boot. That is a completely different guide altogether. - -Choose the option to replace your operating system with Xubuntu and click "Continue" - -Note: This will cause your disk to be wiped and you should backup all of your data before continuing - -### Choose The Disk To Install To ### - -![](http://f.tqn.com/y/linux/1/S/O/J/1/xubuntuinstall5.png) - -Select the drive you wish to install Xubuntu to. - -Click "Install Now". - -A warning will appear telling you that the drive will be wiped and you will be shown a list of partitions that will be created. - -Note: This is the very last chance to change your mind. If you click continue the disk will be wiped and Xubuntu will be installed - -Click "Continue" to install Xubuntu - -### Choose Your Location ### - -![](http://f.tqn.com/y/linux/1/S/P/J/1/xubuntuinstall7.png) - -You are now required to choose your location by clicking on the map. This sets your timezone so that your clock is set to the right time. - -After you have selected the correct location click "Continue". - -### Choose Your Keyboard Layout ### - -![](http://f.tqn.com/y/linux/1/S/Q/J/1/xubuntuinstall8.png) - -Choose your keyboard layout. - -To do this select the language of your keyboard in the left hand pane and then choose the exact layout in the right pane such as dialect, number of keys etc. - -You can click the "Detect Keyboard Layout" button to automatically select the best keyboard layout. - -To make sure the keyboard layout is set correctly enter text into the "Type here to test your keyboard". Pay close attention to function keys and symbols such as pound and dollar symbols. - -Don't worry if you don't get this right during installation. You can set the keyboard layout again within Xubuntu's system settings post installation. - -### Add A User ### - -![](http://f.tqn.com/y/linux/1/S/R/J/1/xubuntuinstall9.png) - -n order to use Xubuntu you will need to have at least one user set up and so the installer requires you to create a default user. - -Enter your name and a name to distinguish the computer into the first two boxes. - -Choose a username and [set up a password][8] for the user. You will need to type the password in twice to make sure you have set the password correctly. - -If you want Xubuntu to automatically login without having to enter a password check the box marked "Log in automatically". Personally I would never recommend doing this though. - -The better option is to check the "Require my password to log in" radio button and if you want to be completely secure check the "Encrypt my home folder" option. - -Click "Continue" to move on. - -### Wait For Installation To Complete ### - -![](http://f.tqn.com/y/linux/1/S/S/J/1/xubuntuinstall10.png) - -The files will now be copied to your computer and Xubuntu will be installed. - -During this process you will see a short slide show. You can go and [make some coffee][9] at this point and relax. - -A message will appear stating that you can continue to try Xubuntu or reboot to start using the newly installed Xubuntu. - -When you are ready, reboot and remove the USB drive. - -Note: To install Xubuntu on a UEFI based machine requires some extra steps not included here. These instructions will be added as a separate guide - -via : http://linux.about.com/od/howtos/ss/A-Step-By-Step-Guide-To-Installing-Xubuntu-Linux.htm#step-heading - -作者：[Gary Newell][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linux.about.com/bio/Gary-Newell-132058.htm -[1]:http://windows.about.com/od/maintainandfix/a/8ways2speedup.htm -[2]:http://linux.about.com/od/howtos/ss/How-To-Create-A-Persistent-Bootable-Xubuntu-Linux-USB-Drive.htm -[3]:http://netforbeginners.about.com/od/basicinternethardware/f/Why-Internet-Connections-Can-Be-Slow.htm -[4]:http://netforbeginners.about.com/b/2011/09/07/test-your-internet-connection-speed-here.htm -[5]:http://mp3.about.com/od/freebies/tp/freemusictp.htm -[6]:http://animation.about.com/od/2danimationtutorials/ss/2d_fla_lesson1.htm -[7]:http://www.everydaylinuxuser.com/2014/11/ubuntu-mate-vs-lubuntu-on-old-netbook.html -[8]:http://netsecurity.about.com/cs/generalsecurity/a/aa112103b.htm -[9]:http://coffeetea.about.com/od/preparationandrecipes/ \ No newline at end of file From 79a6d05c27969d5bdf0d8d7139faf65c30b5187e Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Mon, 19 Jan 2015 14:36:42 +0800 Subject: [PATCH 087/215] add sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md --- ...50119 Ubuntu With XFCE vs Xubuntu Linux.md | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md diff --git a/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md b/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md new file mode 100644 index 0000000000..d7ed8f0011 --- /dev/null +++ b/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md @@ -0,0 +1,159 @@ +Ubuntu With XFCE vs Xubuntu Linux +========================================================= + +Ubuntu vs Xubuntu. Ubuntu has a classy desktop experience and great applications. Xubuntu is lightweight, fast and customisable. Which is best for you. +--------------------------------------------------------- + +![](http://f.tqn.com/y/linux/1/W/T/J/1/ubuntudesktop.png) + +This isn't a straight forward Ubuntu is better than Xubuntu or Xubuntu is better than Ubuntu article. + +This article will also show Ubuntu users how to get to a base XFCE desktop and also how to install the complete Xubuntu desktop. + +[Ubuntu][1] and [Xubuntu][2] are created for different purposes and what I aim to highlight here is when and why you would use Ubuntu and when you would use Xubuntu. + +The way I like to make the comparison is by comparing [a Rolls Royce][3] with [a Porsche][4]. Both are very good cars but if you gave a Rolls Royce to a petrol head they would probably sell it and buy something different. Similarly, giving Porsches to people like Lord Sugar and Hugh Heffner is likely to put their backs out. + +Ubuntu has a one size fits all desktop environment called Unity as well as the best applications that Linux has to offer installed by default, including Rhythmbox and [LibreOffice][5]. Ubuntu is much like a Rolls Royce. It is built for comfort and it is built to get from A to B in the most stylish way possible. + +As a Ubuntu user you are much like the passenger in a car. You can get things done whilst the journey is taking place and everything is nice and easy going. + +Xubuntu on the other hand utilises the lightweight [XFCE desktop environment][6]. The applications are also lightweight in nature and whilst they get the job done they aren't as complete as the ones that are installed with Ubuntu. + +The XFCE desktop environment is highly customisable making it possible to pimp your desktop to be anything you want it to be. + +Xubuntu is therefore much like a custom made sports car. You make it everything you want it to be and instead of being a passenger you are very much a driver making sweeping turns and caressing your way around tight corners. + +If you aren't that bothered about making your desktop prettier and customising your desktop and you find that Ubuntu does everything you want it to do then there is no need to switch to Xubuntu. + +If however you find Unity to not be everything that you require or you find that your computer is lagging under the strain a little bit then Xubuntu is definitely something to consider. + +I released an article last week showing how to create a Xubuntu USB drive and I also created a Xubuntu installation guide. + +If you have already installed Ubuntu you do not need to follow either of those guides. Instead you just need to read on and you will be able to install a more suitable solution from within Ubuntu. + +So what should you do if you have Ubuntu and you wish to switch to Xubuntu? + +You have a choice to make. Is the issue that you just want the more lightweight and customisable XFCE desktop or do you want the lightweight applications that come with Xubuntu as well? + +Lets deal with the applications. Here are a list of applications that come with Ubuntu and Xubuntu. If you only need a couple of the Xubuntu applications then I would recommend just installing XFCE and then installing the applications separately. If you need more than half of the applications install the entire Xubuntu desktop environment. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Ubuntu vs Xubuntu Applications +
Application TypeUbuntuXubuntu
AudioRhythmboxgmusicbrowser
VideoTotemParole
Photo ManagerShotwellRistretto
OfficeLibreOfficeAbiword/Gnumeric
Web BrowserFireFoxFireFox
Email Thunderbird
Instant MessengingEmpathyPidgin
+ +### How To Install The XFCE Desktop Environment Using Ubuntu ### + +![Default XFCE Desktop](http://f.tqn.com/y/linux/1/W/U/J/1/xfce1.png) + +The method I am going to show for installing the XFCE desktop within Ubuntu is by using the command line tool [apt-get][7]. + +Open a terminal window within Unity by either searching for "TERM" via [the Dash][8] or by pressing CTRL + ALT + T. + +Installing the XFCE desktop is simply a case of typing the following commands: + +>sudo apt-get update +>sudo apt-get install xfce4 + +To switch to [the XFCE desktop environment][9], click your username in the top right corner and log out. + +When you reach the login screen click the little Ubuntu icon next to your username and there will now be options for the Unity desktop and the XFCE desktop. Change the desktop to XFCE and log in normally. + +A message will appear asking whether you want the default panel arrangement or whether you want a single panel. + +[The latest version of Xubuntu][10] has a single panel at the top but I still prefer the 2 panel setup, a standard panel at the top and a docking panel with my favourite applications at the bottom. + +Note that the menu system that comes with the XFCE desktop is different to the one that comes with Xubuntu and until you [install a better menu system][11] the 2 panel setup is probably a better choice. + +It is up to you as to which option you select but rest assured it is easy to change your mind at a later point. XFCE is highly customisable. + +### How To Switch From Ubuntu To Xubuntu Without Reinstalling From Scratch ### + +![Switch From Ubuntu To Xubuntu.](http://f.tqn.com/y/linux/1/W/W/J/1/xfce3.png) + +If you want everything that comes with Xubuntu but you don't want to go through the hassle of reinstalling from scratch follow these instructions. + +Open a terminal window by searching for "TERM" in the Dash or by pressing CTRL + ALT + T. + +Enter the following commands into the terminal window: + +>sudo apt-get update +>sudo apt-get install xubuntu-desktop + +This will take longer than installing just the XFCE desktop but will be quicker than reinstalling Xubuntu from scratch. + +After the installation has completed click on your username in the top right corner and log out. + +From the login box click on the Ubuntu symbol. There should now be options for Unity and Xubuntu. Click on Xubuntu and log in as normal. + +The Xubuntu desktop will now be shown. + +There will be some differences. The menu will still be the standard XFCE menu and not the Xubuntu menu. Some of the icons will not appear on the top panel. None of these things are reasons to spend the time uninstalling Ubuntu and reinstalling Xubuntu. + +In the next guide I will show you how to customise Xubuntu and the XFCE desktop. + + +via : http://linux.about.com/od/dist/fl/Ubuntu-With-XFCE-vs-Xubuntu-Linux.htm + +作者：[Gary Newell][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linux.about.com/bio/Gary-Newell-132058.htm +[1]:http://www.everydaylinuxuser.com/2014/11/an-everyday-linux-user-review-of-ubuntu.html +[2]:http://www.everydaylinuxuser.com/2015/01/an-everyday-linux-user-review-of.html +[3]:http://exoticcars.about.com/od/overviewsofmaker1/p/RollsHistory.htm +[4]:http://exoticcars.about.com/od/overviewsofmaker1/p/PorscheHistory.htm +[5]:http://office.about.com/od/FreeOpenSourceOfficeSoftware/a/All-About-Libreoffice-4-0.htm +[6]:http://linux.about.com/cs/linux101/g/xfce.htm +[7]:http://linux.about.com/od/ubusrv_doc/a/ubusg11t01.htm +[8]:http://linux.about.com/od/howtos/fl/Learn-Ubuntu-The-Unity-Dash.htm +[9]:http://linux.about.com/cs/linux101/g/xfce.htm +[10]:http://www.everydaylinuxuser.com/2015/01/an-everyday-linux-user-review-of.html +[11]:http://xubuntugeek.blogspot.co.uk/2013/12/how-to-install-whisker-menu-in-xubuntu.html From e0d0557fa4b4945487ae3a4d8363e430bb125b35 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Mon, 19 Jan 2015 16:10:28 +0800 Subject: [PATCH 088/215] translating by zhouj-sh --- sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md b/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md index d7ed8f0011..5b93ac0b9a 100644 --- a/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md +++ b/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md @@ -1,3 +1,5 @@ +translating by zhouj-sh + Ubuntu With XFCE vs Xubuntu Linux ========================================================= From f1336ab9e6b9d601737220a06b08c4e90a610408 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Mon, 19 Jan 2015 17:50:28 +0800 Subject: [PATCH 089/215] translating sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md --- ...tweight And Persistent Xubuntu Linux USB Drive.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md diff --git a/sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md b/sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md new file mode 100644 index 0000000000..05f307c9d5 --- /dev/null +++ b/sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md @@ -0,0 +1,12 @@ +3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive +================================================================================ + +via : http://linux.about.com/od/howtos/ss/How-To-Create-A-Persistent-Bootable-Xubuntu-Linux-USB-Drive.htm + + + +作者：[Gary Newell][a] +译者：[zhouj-sh](https://github.com/Zhouj-sh) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 \ No newline at end of file From 8bae3c1a249e51dd003a2b2ce507fef4ce802874 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Mon, 19 Jan 2015 17:51:07 +0800 Subject: [PATCH 090/215] translate complete. delete sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md --- ...50119 Ubuntu With XFCE vs Xubuntu Linux.md | 161 ------------------ 1 file changed, 161 deletions(-) delete mode 100644 sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md diff --git a/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md b/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md deleted file mode 100644 index 5b93ac0b9a..0000000000 --- a/sources/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md +++ /dev/null @@ -1,161 +0,0 @@ -translating by zhouj-sh - -Ubuntu With XFCE vs Xubuntu Linux -========================================================= - -Ubuntu vs Xubuntu. Ubuntu has a classy desktop experience and great applications. Xubuntu is lightweight, fast and customisable. Which is best for you. ---------------------------------------------------------- - -![](http://f.tqn.com/y/linux/1/W/T/J/1/ubuntudesktop.png) - -This isn't a straight forward Ubuntu is better than Xubuntu or Xubuntu is better than Ubuntu article. - -This article will also show Ubuntu users how to get to a base XFCE desktop and also how to install the complete Xubuntu desktop. - -[Ubuntu][1] and [Xubuntu][2] are created for different purposes and what I aim to highlight here is when and why you would use Ubuntu and when you would use Xubuntu. - -The way I like to make the comparison is by comparing [a Rolls Royce][3] with [a Porsche][4]. Both are very good cars but if you gave a Rolls Royce to a petrol head they would probably sell it and buy something different. Similarly, giving Porsches to people like Lord Sugar and Hugh Heffner is likely to put their backs out. - -Ubuntu has a one size fits all desktop environment called Unity as well as the best applications that Linux has to offer installed by default, including Rhythmbox and [LibreOffice][5]. Ubuntu is much like a Rolls Royce. It is built for comfort and it is built to get from A to B in the most stylish way possible. - -As a Ubuntu user you are much like the passenger in a car. You can get things done whilst the journey is taking place and everything is nice and easy going. - -Xubuntu on the other hand utilises the lightweight [XFCE desktop environment][6]. The applications are also lightweight in nature and whilst they get the job done they aren't as complete as the ones that are installed with Ubuntu. - -The XFCE desktop environment is highly customisable making it possible to pimp your desktop to be anything you want it to be. - -Xubuntu is therefore much like a custom made sports car. You make it everything you want it to be and instead of being a passenger you are very much a driver making sweeping turns and caressing your way around tight corners. - -If you aren't that bothered about making your desktop prettier and customising your desktop and you find that Ubuntu does everything you want it to do then there is no need to switch to Xubuntu. - -If however you find Unity to not be everything that you require or you find that your computer is lagging under the strain a little bit then Xubuntu is definitely something to consider. - -I released an article last week showing how to create a Xubuntu USB drive and I also created a Xubuntu installation guide. - -If you have already installed Ubuntu you do not need to follow either of those guides. Instead you just need to read on and you will be able to install a more suitable solution from within Ubuntu. - -So what should you do if you have Ubuntu and you wish to switch to Xubuntu? - -You have a choice to make. Is the issue that you just want the more lightweight and customisable XFCE desktop or do you want the lightweight applications that come with Xubuntu as well? - -Lets deal with the applications. Here are a list of applications that come with Ubuntu and Xubuntu. If you only need a couple of the Xubuntu applications then I would recommend just installing XFCE and then installing the applications separately. If you need more than half of the applications install the entire Xubuntu desktop environment. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Ubuntu vs Xubuntu Applications -
Application TypeUbuntuXubuntu
AudioRhythmboxgmusicbrowser
VideoTotemParole
Photo ManagerShotwellRistretto
OfficeLibreOfficeAbiword/Gnumeric
Web BrowserFireFoxFireFox
Email Thunderbird
Instant MessengingEmpathyPidgin
- -### How To Install The XFCE Desktop Environment Using Ubuntu ### - -![Default XFCE Desktop](http://f.tqn.com/y/linux/1/W/U/J/1/xfce1.png) - -The method I am going to show for installing the XFCE desktop within Ubuntu is by using the command line tool [apt-get][7]. - -Open a terminal window within Unity by either searching for "TERM" via [the Dash][8] or by pressing CTRL + ALT + T. - -Installing the XFCE desktop is simply a case of typing the following commands: - ->sudo apt-get update ->sudo apt-get install xfce4 - -To switch to [the XFCE desktop environment][9], click your username in the top right corner and log out. - -When you reach the login screen click the little Ubuntu icon next to your username and there will now be options for the Unity desktop and the XFCE desktop. Change the desktop to XFCE and log in normally. - -A message will appear asking whether you want the default panel arrangement or whether you want a single panel. - -[The latest version of Xubuntu][10] has a single panel at the top but I still prefer the 2 panel setup, a standard panel at the top and a docking panel with my favourite applications at the bottom. - -Note that the menu system that comes with the XFCE desktop is different to the one that comes with Xubuntu and until you [install a better menu system][11] the 2 panel setup is probably a better choice. - -It is up to you as to which option you select but rest assured it is easy to change your mind at a later point. XFCE is highly customisable. - -### How To Switch From Ubuntu To Xubuntu Without Reinstalling From Scratch ### - -![Switch From Ubuntu To Xubuntu.](http://f.tqn.com/y/linux/1/W/W/J/1/xfce3.png) - -If you want everything that comes with Xubuntu but you don't want to go through the hassle of reinstalling from scratch follow these instructions. - -Open a terminal window by searching for "TERM" in the Dash or by pressing CTRL + ALT + T. - -Enter the following commands into the terminal window: - ->sudo apt-get update ->sudo apt-get install xubuntu-desktop - -This will take longer than installing just the XFCE desktop but will be quicker than reinstalling Xubuntu from scratch. - -After the installation has completed click on your username in the top right corner and log out. - -From the login box click on the Ubuntu symbol. There should now be options for Unity and Xubuntu. Click on Xubuntu and log in as normal. - -The Xubuntu desktop will now be shown. - -There will be some differences. The menu will still be the standard XFCE menu and not the Xubuntu menu. Some of the icons will not appear on the top panel. None of these things are reasons to spend the time uninstalling Ubuntu and reinstalling Xubuntu. - -In the next guide I will show you how to customise Xubuntu and the XFCE desktop. - - -via : http://linux.about.com/od/dist/fl/Ubuntu-With-XFCE-vs-Xubuntu-Linux.htm - -作者：[Gary Newell][a] -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[a]:http://linux.about.com/bio/Gary-Newell-132058.htm -[1]:http://www.everydaylinuxuser.com/2014/11/an-everyday-linux-user-review-of-ubuntu.html -[2]:http://www.everydaylinuxuser.com/2015/01/an-everyday-linux-user-review-of.html -[3]:http://exoticcars.about.com/od/overviewsofmaker1/p/RollsHistory.htm -[4]:http://exoticcars.about.com/od/overviewsofmaker1/p/PorscheHistory.htm -[5]:http://office.about.com/od/FreeOpenSourceOfficeSoftware/a/All-About-Libreoffice-4-0.htm -[6]:http://linux.about.com/cs/linux101/g/xfce.htm -[7]:http://linux.about.com/od/ubusrv_doc/a/ubusg11t01.htm -[8]:http://linux.about.com/od/howtos/fl/Learn-Ubuntu-The-Unity-Dash.htm -[9]:http://linux.about.com/cs/linux101/g/xfce.htm -[10]:http://www.everydaylinuxuser.com/2015/01/an-everyday-linux-user-review-of.html -[11]:http://xubuntugeek.blogspot.co.uk/2013/12/how-to-install-whisker-menu-in-xubuntu.html From a75a14f9fa77c5e1f666976a5bfb352fe38495be Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Mon, 19 Jan 2015 18:03:58 +0800 Subject: [PATCH 091/215] translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md --- ...50119 Ubuntu With XFCE vs Xubuntu Linux.md | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md diff --git a/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md b/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md new file mode 100644 index 0000000000..05d9007df6 --- /dev/null +++ b/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md @@ -0,0 +1,160 @@ +Ubuntu With XFCE vs Xubuntu Linux +========================================================= + +Ubuntu vs Xubuntu。Ubuntu拥有漂亮的桌面体验以及强大的应用程序。Xubuntu轻量、快速并且可定制，哪个更适合你？ +--------------------------------------------------------- + +![](http://f.tqn.com/y/linux/1/W/T/J/1/ubuntudesktop.png) + +首先，这篇文章不是用来说明Ubuntu比Xubuntu更好或者Xubuntu比Ubuntu更好之类的东西。 + +同时，我也会在这篇文章中介绍Ubuntu用户如何获取基本的XFCE桌面，以及如何安装完整的Xubuntu桌面。 + +[Ubuntu][1]以及[Xubuntu][2]是针对不同目的开发的操作系统，为什么我会强调这一点，是为了说明什么时候或者为什么你应该使用Ubuntu以及什么时候应该使用Xubuntu。 + +比较这两个操作系统就像比较[劳斯莱斯][3]与[保时捷][4]。它们两个都是好车，但是如果把劳斯莱斯送给一个车迷，他们也许会卖掉它买个其他的车，同样的，如果把保时捷给舒格勋爵或者休·海夫纳这类人，is likely to put their backs out. + +Ubuntu拥有一个适用性很强的桌面环境，叫做Unity，并且默认会安装一些很棒的Linux应用程序，包括Rhythmbox以及[LibreOffic][5]。Ubuntu就像是劳斯莱斯。它为舒适而造，并且尽可能的提供从A到B的最时髦的方法。 + +作为一个Ubuntu用户，就像汽车里面的乘客。你在到达目的地的过程中就可以同时把事情搞定，并且所有的事看起来都很漂亮并且很简单。 + +另一方面，Xubuntu采用了轻量的[XFCE桌面环境][6]。内置的应用自然也是轻量级的，使用它们也可以完成工作，但是不像Ubuntu自带的应用那么完整。 + +XFCE桌面环境可以高度定制化，你可以把你的桌面搞成任何你想要的形式。 + +Xubuntu就像一个改装的跑车。你可以把它改装成任何你想要的样子。但不是做为一名乘客，而更像是驾驶员开着它快速漂移过弯，或者小心翼翼的通过狭小的弯角。 + +如果你不关心如何美化或者定制桌面，并且你发现Ubuntu用起来很顺手，那么你没必要切换到Xubuntu。 + +但是，如果你发现Unity没办法满足你的要求，并且感觉你的计算机在运行Ubuntu时或多或少有一些性能压力，那么当然就可以考虑考虑Xubuntu。 + +上周我发了一篇文章介绍怎么创建Xubuntu启动优盘，并且也写了一篇[安装Xubuntu的教程][b]。 + +不过，如果你已经安装了Ubuntu，就不用这么费事照着教程再来一遍了。你只需要继续读完这篇文章，就可以在Ubuntu里面安装一个更合适的解决方案。 + +那么如果你已经装了Ubuntu，如何切换到Xubuntu呢？ + +你需要做一个选择题。问题是，你是仅仅需要一个更轻量的、可定制化的XFCE桌面，还是同时也需要那些Xubuntu内置的轻量级应用。 + +先来看看这些应用吧。下面有一个列表，列出了Ubuntu和Xubuntu内置的应用程序。如果你只需要几个Xubuntu应用程序，那么我建议你只安装XFCE然后单独安装这些应用。如果你需要一半以上的应用，那就安装整个Xubuntu桌面环境吧。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Ubuntu与Xubuntu内置应用对比 +
应用类型UbuntuXubuntu
音频Rhythmboxgmusicbrowser
视频TotemParole
照片管理ShotwellRistretto
办公LibreOfficeAbiword/Gnumeric
浏览器FireFoxFireFox
Email Thunderbird
即时通讯EmpathyPidgin
+ +### 如何在Ubuntu安装XFCE桌面环境 ### + +!默认的XFCE桌面](http://f.tqn.com/y/linux/1/W/U/J/1/xfce1.png) + +接下来，我会使用命令行工具[apt-get][7]介绍在Ubuntu安装XFCE桌面的方法。 + +打开一个终端窗口，在Unity环境，你可以在[Dash][8]中搜索“TERM”，或者使用组合键 CTRL+ALT+T。 + +安装XFCE桌面十分简单，输入下列命令就可以了： + +>sudo apt-get update +>sudo apt-get install xfce4 + +点击右上角设置图标然后登出，来切换到[XFCE桌面环境][9]。 + +切换到登入界面以后，点击在你用户名旁边的小Ubuntu图标，就会出现Unity桌面和XFCE桌面的选项。切换到XFCE然后正常登录。 + +系统会显示一个消息，提示你是否使用默认的面板布局或者使用单独的面板。 + +[最新版本的Xubuntu][10]在顶部包含一个单独的面板，不过我更喜欢两个面板，顶部一个标准面板，底部一个常用程序的停靠面板。 + +需要注意的是，XFCE桌面菜单系统和Xubuntu的菜单有些差异，除非你安装[一个更好的菜单系统][11]，设置两个面板或许是个更好的选择。 + +这取决与选择的是哪个选项，不过没关系，如果后面你改变了主意，也可以很容易重新设置。XFCE可以进行深度的自定义。 + +### 不重新安装的情况下，如何从Ubuntu切换到Xubuntu ### + +![从Ubuntu切换到Xubuntu](http://f.tqn.com/y/linux/1/W/W/J/1/xfce3.png) + +如果你想全都使用Xubuntu的东西，但是又不想按照那些介绍重新安装系统的话，看看下面的东西。 + +通过搜索“TERM”，或者组合键CTRL+ALT+T，打开一个终端窗口。 + +在终端输入如下命令： + +>sudo apt-get update +>sudo apt-get install xubuntu-desktop + +花费的时间会比安装XFCE桌面长一些，但是要比重新安装Xubuntu系统要快。 + +安装完成以后，点击右上角图标，然后登出。 + +在登录界面，点击Ubuntu图标。会出现Unity和Xubuntu选项。点击Xubuntu，然后正常登入。 + +Xubuntu桌面就会显示出来啦。 + +这里会有一些差异。菜单仍然是XFCE菜单，而不是Xubuntu菜单。某些图标也不会出现在顶部面板中。但是这些问题都不足以让我们花时间卸载Ubuntu然后重装Xubuntu。 + +下一篇文章中，我会介绍如何自定义Xubuntu以及XFCE桌面。 + + +via : http://linux.about.com/od/dist/fl/Ubuntu-With-XFCE-vs-Xubuntu-Linux.htm + +作者：[Gary Newell][a] +译者：[zhouj-sh](https://github.com/Zhouj-sh) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linux.about.com/bio/Gary-Newell-132058.htm +[b]:https://github.com/ZhouJ-sh/TranslateProject/commit/0c4ad0bc8e79e28c1f7f8ccf805708829baa8ea9 +[1]:http://www.everydaylinuxuser.com/2014/11/an-everyday-linux-user-review-of-ubuntu.html +[2]:http://www.everydaylinuxuser.com/2015/01/an-everyday-linux-user-review-of.html +[3]:http://exoticcars.about.com/od/overviewsofmaker1/p/RollsHistory.htm +[4]:http://exoticcars.about.com/od/overviewsofmaker1/p/PorscheHistory.htm +[5]:http://office.about.com/od/FreeOpenSourceOfficeSoftware/a/All-About-Libreoffice-4-0.htm +[6]:http://linux.about.com/cs/linux101/g/xfce.htm +[7]:http://linux.about.com/od/ubusrv_doc/a/ubusg11t01.htm +[8]:http://linux.about.com/od/howtos/fl/Learn-Ubuntu-The-Unity-Dash.htm +[9]:http://linux.about.com/cs/linux101/g/xfce.htm +[10]:http://www.everydaylinuxuser.com/2015/01/an-everyday-linux-user-review-of.html +[11]:http://xubuntugeek.blogspot.co.uk/2013/12/how-to-install-whisker-menu-in-xubuntu.html From 110ad520ff023e1204aa6192bda34821254ef9d8 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Mon, 19 Jan 2015 18:39:31 +0800 Subject: [PATCH 092/215] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20150119 Ubuntu With XFCE vs Xubuntu Linux.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md b/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md index 05d9007df6..25396e1798 100644 --- a/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md +++ b/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md @@ -8,13 +8,13 @@ Ubuntu vs Xubuntu。Ubuntu拥有漂亮的桌面体验以及强大的应用程序 首先，这篇文章不是用来说明Ubuntu比Xubuntu更好或者Xubuntu比Ubuntu更好之类的东西。 -同时，我也会在这篇文章中介绍Ubuntu用户如何获取基本的XFCE桌面，以及如何安装完整的Xubuntu桌面。 +并且，我同时也会在这篇文章中介绍Ubuntu用户如何获取基本的XFCE桌面，以及如何安装完整的Xubuntu桌面。 [Ubuntu][1]以及[Xubuntu][2]是针对不同目的开发的操作系统，为什么我会强调这一点，是为了说明什么时候或者为什么你应该使用Ubuntu以及什么时候应该使用Xubuntu。 -比较这两个操作系统就像比较[劳斯莱斯][3]与[保时捷][4]。它们两个都是好车，但是如果把劳斯莱斯送给一个车迷，他们也许会卖掉它买个其他的车，同样的，如果把保时捷给舒格勋爵或者休·海夫纳这类人，is likely to put their backs out. +比较这两个操作系统就像比较[劳斯莱斯][3]与[保时捷][4]。这两个都是很棒的车，但是如果把劳斯莱斯给一个车迷，他们也许会卖掉它买个其他的车，同样，如果把保时捷给舒格勋爵或者休·海夫纳这类人可能也不那么合适。 -Ubuntu拥有一个适用性很强的桌面环境，叫做Unity，并且默认会安装一些很棒的Linux应用程序，包括Rhythmbox以及[LibreOffic][5]。Ubuntu就像是劳斯莱斯。它为舒适而造，并且尽可能的提供从A到B的最时髦的方法。 +Ubuntu拥有一个适用性很强的桌面环境，叫做Unity，并且默认会安装一些很棒的Linux应用程序，包括Rhythmbox以及[LibreOffic][5]。Ubuntu就像是劳斯莱斯。它为舒适而生，并且尽可能的提供从A到B的最时髦的方法。 作为一个Ubuntu用户，就像汽车里面的乘客。你在到达目的地的过程中就可以同时把事情搞定，并且所有的事看起来都很漂亮并且很简单。 @@ -22,13 +22,13 @@ Ubuntu拥有一个适用性很强的桌面环境，叫做Unity，并且默认会 XFCE桌面环境可以高度定制化，你可以把你的桌面搞成任何你想要的形式。 -Xubuntu就像一个改装的跑车。你可以把它改装成任何你想要的样子。但不是做为一名乘客，而更像是驾驶员开着它快速漂移过弯，或者小心翼翼的通过狭小的弯角。 +Xubuntu就像一个改装过的跑车。你可以把它改装成任何你想要的样子。但不是做为一名乘客，而更像是驾驶员开着它快速漂移过弯，或者小心翼翼的通过狭小的弯角。 如果你不关心如何美化或者定制桌面，并且你发现Ubuntu用起来很顺手，那么你没必要切换到Xubuntu。 但是，如果你发现Unity没办法满足你的要求，并且感觉你的计算机在运行Ubuntu时或多或少有一些性能压力，那么当然就可以考虑考虑Xubuntu。 -上周我发了一篇文章介绍怎么创建Xubuntu启动优盘，并且也写了一篇[安装Xubuntu的教程][b]。 +上周我发了一篇文章介绍怎么创建Xubuntu启动优盘（译者注：翻译ing），并且也写了一篇[安装Xubuntu的教程][b]（译者注：已经完成翻译，链接为github地址）。 不过，如果你已经安装了Ubuntu，就不用这么费事照着教程再来一遍了。你只需要继续读完这篇文章，就可以在Ubuntu里面安装一个更合适的解决方案。 @@ -88,7 +88,7 @@ Xubuntu就像一个改装的跑车。你可以把它改装成任何你想要的 ### 如何在Ubuntu安装XFCE桌面环境 ### -!默认的XFCE桌面](http://f.tqn.com/y/linux/1/W/U/J/1/xfce1.png) +![默认的XFCE桌面](http://f.tqn.com/y/linux/1/W/U/J/1/xfce1.png) 接下来，我会使用命令行工具[apt-get][7]介绍在Ubuntu安装XFCE桌面的方法。 @@ -146,7 +146,7 @@ via : http://linux.about.com/od/dist/fl/Ubuntu-With-XFCE-vs-Xubuntu-Linux.htm 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [a]:http://linux.about.com/bio/Gary-Newell-132058.htm -[b]:https://github.com/ZhouJ-sh/TranslateProject/commit/0c4ad0bc8e79e28c1f7f8ccf805708829baa8ea9 +[b]:https://github.com/ZhouJ-sh/TranslateProject/blob/0c4ad0bc8e79e28c1f7f8ccf805708829baa8ea9/translated/share/20150116%20A%20Step%20By%20Step%20Guide%20To%20Installing%20Xubuntu%20Linux.md [1]:http://www.everydaylinuxuser.com/2014/11/an-everyday-linux-user-review-of-ubuntu.html [2]:http://www.everydaylinuxuser.com/2015/01/an-everyday-linux-user-review-of.html [3]:http://exoticcars.about.com/od/overviewsofmaker1/p/RollsHistory.htm From 8dd8c387bd862de9f683fadf99cea96bb38b13c6 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 19 Jan 2015 22:22:41 +0800 Subject: [PATCH 093/215] =?UTF-8?q?20150119-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inally Lets You Set Menus ToAlways Show.md | 41 +++++++++++++ ...ng Session Icons to Ubuntu Login Screen.md | 58 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 sources/talk/20150119 Ubuntu 15.04 Finally Lets You Set Menus ToAlways Show.md create mode 100644 sources/tech/20150119 Unity Greeter Badges Brings Missing Session Icons to Ubuntu Login Screen.md diff --git a/sources/talk/20150119 Ubuntu 15.04 Finally Lets You Set Menus ToAlways Show.md b/sources/talk/20150119 Ubuntu 15.04 Finally Lets You Set Menus ToAlways Show.md new file mode 100644 index 0000000000..346937d2b9 --- /dev/null +++ b/sources/talk/20150119 Ubuntu 15.04 Finally Lets You Set Menus ToAlways Show.md @@ -0,0 +1,41 @@ +Ubuntu 15.04 Finally Lets You Set Menus To ‘Always Show’ +================================================================================ +**If you hate the way that Unity’s global menus fade out of view after you mouse away, Ubuntu 15.04 has a little extra to win you around.** + +![](http://www.omgubuntu.co.uk/wp-content/uploads/2014/02/locally-integrated-menus-in-ubuntu.png) + +The latest build of Unity for Ubuntu 15.04, currently sitting in the ‘proposed’ channel, offers an option to **make app menus visible in Ubuntu**. + +No fading, no timeout, no missing menus. + +The drawback for now is that it can currently only be enabled through a dconf switch and not a regular user-facing option. + +I’d hope (if not expect) that an option to set the feature is added to the Ubuntu System Settings > Appearance section as development continues. + +Right now, if you’re on Ubuntu 15.04 and have the “Proposed” update channel enabled, you should find this switch waiting in **com > canonical > unity >** ‘always show menus’. + +### Better Late Than Never? ### + +Developers plan to backport the option to Ubuntu 14.04 LTS in the next SRU (assuming nothing unexpected crops up during testing). + +Locally Integrated Menus (LIM) debuted in Ubuntu 14.04 LTS to much appreciation, being widely seen as the best compromise between those who liked the simplicity of the “hidden” approach and those who disliked the mouse and trackpad aerobics using it required. + +While locally integrated menus brought us half way to silencing the criticisms levelled at this aspect of Unity, the default “fade in/fade out” behaviour left an itch unscratched. + +The past few releases of Ubuntu has seen proactive addressing of concerns and issues experienced by its earlier UX decisions. After several years on the ‘to do’ list [we finally got Locally Integrated Menus last year][1], as well as an unsupported [option to minimise and restore apps to the Unity Launcher][2] by clicking on their icon. + +A year on from that we finally get an option to make application menus always show, no matter where our mouse is. Better late than never, right? + +-------------------------------------------------------------------------------- + +via: http://www.omgubuntu.co.uk/2015/01/ubuntu-15-04-always-show-menu-bar-option + +作者：[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]:http://www.omgubuntu.co.uk/2014/02/locally-integrated-menus-ubuntu-14-04 +[2]:http://www.omgubuntu.co.uk/2014/03/minimize-click-launcher-option-ubuntu-14-04 \ No newline at end of file diff --git a/sources/tech/20150119 Unity Greeter Badges Brings Missing Session Icons to Ubuntu Login Screen.md b/sources/tech/20150119 Unity Greeter Badges Brings Missing Session Icons to Ubuntu Login Screen.md new file mode 100644 index 0000000000..1aac09e11a --- /dev/null +++ b/sources/tech/20150119 Unity Greeter Badges Brings Missing Session Icons to Ubuntu Login Screen.md @@ -0,0 +1,58 @@ +‘Unity Greeter Badges’ Brings Missing Session Icons to Ubuntu Login Screen +================================================================================ +![](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/unity-greeter-badges-750x321.jpg) + +**A new package available in Ubuntu 15.04 solves a petty gripe I have with the Unity Greeter: the lack of branded icons for alternative desktop sessions like Cinnamon.** + +I know it’s a minor quibble; it’s a visual paper cut with minimal impact for most. But the inconsistency niggles me because Ubuntu ships with icons for a number of sessions, including Unity, GNOME and KDE. Other DEs, including some of its own flavors like Xubuntu, default to showing a plain white dot in the session switcher list and the main user pod. + +The inconsistency these dots create jars, even if it is only for a fleeting moment, not just in design. It’s in usability too. Branded glyphs are helpful in letting us know what session we’re about to log in to. + +For instance, can you tell what session this is? + +![](http://www.omgubuntu.co.uk/wp-content/uploads/2015/01/what-session-is-this-750x247.jpg) + +Budgie? Maybe MATE? Could be Cinnamon…I’d have to click on it and check first. + +It doesn’t have to be this way. The Unity Greeter is built such that the developers of desktop environments can ship badges that appear in the Greeter (and some do). But in many cases, like MATE whose packages are imported from upstream Debian, the inclination to carry an “Ubuntu-specific patch” is either not desirable or not possible. + +### A Solution Is Badged ### + +Experienced Debian maintainer [Doug Torrance][1] has a solution to fix this usability paper cut. Rather than rely on desktop makers themselves to add branded badges to their packages, and rather than burden Ubuntu with the responsibility of maintaining it, Torrance has created a separate ‘unity-greeter-badges’ package to house them. + +In assuming responsibility for providing the session glyphs directly, this package ensure that new and old window managers, session and desktops alike are catered for. + +Among the 30 or so desktop environments it bundles new session badges for are: + +- Xubuntu +- Cinnamon +- MATE +- Cairo-Dock +- Xmonad +- Awesome +- OpenBox +- Pantheon + +The best part is that ‘**Unity-Greeter-Badges**’ has been accepted into Ubuntu 15.04. That means Torrance’s package will be available to install directly, no PPAs or downloads needed. In not being part of a core package like the Unity Greeter it can be updated with newer icons in a more efficient and timely manner. + +If you’re running Ubuntu 15.04 you will find the package available to install from the Software Center in the coming days. + +Don’t want to wait until 15.04? Torrance has made .deb installers for Ubuntu 14.04 LTS and Ubuntu 14.10 users. + +- [Download unity-greeter-badges for Ubuntu 14.04][2] +- [Download unity-greeter-badges for Ubuntu 14.10][3] + +-------------------------------------------------------------------------------- + +via: http://www.omgubuntu.co.uk/2015/01/unity-greeter-badges-brings-missing-session-icons-ubuntu-login-screen + +作者：[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://launchpad.net/~profzoom +[2]:https://launchpad.net/~profzoom/+archive/ubuntu/misc/+files/unity-greeter-badges_0.1-0ubuntu1%7E201412111501%7Eubuntu14.04.1_all.deb +[3]:https://launchpad.net/~profzoom/+archive/ubuntu/misc/+files/unity-greeter-badges_0.1-0ubuntu1%7E201412111501%7Eubuntu14.10.1_all.deb \ No newline at end of file From 2d08d1cdd3663bb88c20de5b86c520c50b4dab47 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 19 Jan 2015 22:32:09 +0800 Subject: [PATCH 094/215] =?UTF-8?q?20150119-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Lightweight Web Server on Ubuntu 14.04.md | 87 +++++++++++++++++ ...tore Running Applications on Next Logon.md | 97 +++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 sources/tech/20150119 How to Install Cherokee Lightweight Web Server on Ubuntu 14.04.md create mode 100644 sources/tech/20150119 How to Remember and Restore Running Applications on Next Logon.md diff --git a/sources/tech/20150119 How to Install Cherokee Lightweight Web Server on Ubuntu 14.04.md b/sources/tech/20150119 How to Install Cherokee Lightweight Web Server on Ubuntu 14.04.md new file mode 100644 index 0000000000..1e2ba90d6e --- /dev/null +++ b/sources/tech/20150119 How to Install Cherokee Lightweight Web Server on Ubuntu 14.04.md @@ -0,0 +1,87 @@ +How to Install Cherokee Lightweight Web Server on Ubuntu 14.04 +================================================================================ +**Cherokee** is an free and open source high performance, lightweight, full-featured web server and running on major platform (Linux, Mac OS X, Solaris, and BSD). It is compatible with TLS/SSL,FastCGI, SCGI, PHP, uWSGI, SSI, CGI, LDAP, HTTP proxying, video streaming, content caching, traffic shaping, virtual hosts, Apache compatible log files, and load balancing. + +Today we'll explains how to install and configure the Light Weight Cherokeeweb server on Ubuntu Server edition 14.04 LTS (Trusty) and should also work with 12.04, 12.10 and 13. 04, just skip the modification of source list. + +Step by step install and configure the Cherokee web server on Ubuntu Server edition + +### 1. Updating Ubuntu Package Index ### + +First, Login into Ubuntu Server and make sure your ubuntu server update, run the following commands one by one, and install any available updates: + + sudo apt-get update + + sudo apt-get upgrade + +### 2. Adding PPA ### + +Add the PPA cherokee webserver. by running the following commands + + sudo add-apt-repository ppa:cherokee-webserver + + sudo apt-get update + +Now, only for servers running Ubuntu 14.04 LTS (Trusty) follow this step below + + cd /etc/apt/sources.list.d + + nano cherokee-webserver-ppa-trusty.list + + replace: + + deb http://ppa.launchpad.net/cherokee-webserver/ppa/ubuntu trusty main + + to: + + deb http://ppa.launchpad.net/cherokee-webserver/ppa/ubuntu saucy main + +**then again run:** + + sudo apt-get update + +### 3. Installing Cherokee Web Server using apt-get ### + +Enter the following command to install the Cherokee web server including Module SSL + + sudo apt-get install cherokee cherokee-admin cherokee-doc libcherokee-mod-libssl libcherokee-mod-streaming libcherokee-mod-rrd + +### 4. Configuring Cherokee ### + + sudo service cherokee start + +The best part about using its Web Server is being able to manage all of its configurations through a simple to use web interface. This interface, known as cherokee-admin, is the recommended means of administering cherokee web server through web browser. Start cherokee-admin by running the following command: + + sudo cherokee-admin + +**Note: The cherokee-admin will display the administration user name, One-time Password and administration web interface.** + +**Note down your One-Time password. You will need this when you login to its admin web interface.** + +By default, cherokee-admin can only accessed from localhost. If you need to access the admin for other network address using the parameter ‘**-b**’. If you doesn’t mention any ip address, it will automatically listen to all network interfaces. Then you can connect to cherokee-admin from other network address. + + sudo cherokee-admin -b + +If you need to access its admin from specific network address + + sudo cherokee-admin -b 192.168.1.102 + +### 5. Browse your Cherokee Admin Panel ### + +Now you can access the administration panel from you favorite browser by typing http://hostname_or_IP:9090/ for me its http://127.0.0.1:9090/, it will appear on your browser like this: + +![cherokee-admin-panel](http://blog.linoxide.com/wp-content/uploads/2014/12/cherokee-admin.png) + +Hurray, we have successfully installed and configured Cherokee Web Server in our Ubuntu Server. + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/ubuntu-how-to/install-cherokee-lightweight-web-server-ubuntu-14-04/ + +作者：[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/ \ No newline at end of file diff --git a/sources/tech/20150119 How to Remember and Restore Running Applications on Next Logon.md b/sources/tech/20150119 How to Remember and Restore Running Applications on Next Logon.md new file mode 100644 index 0000000000..457d6788e2 --- /dev/null +++ b/sources/tech/20150119 How to Remember and Restore Running Applications on Next Logon.md @@ -0,0 +1,97 @@ +How to Remember and Restore Running Applications on Next Logon +================================================================================ +You have made some apps running in your Ubuntu and don't want to stop the process, just managed your windows and opened your stuffs needed to work. Then, something else demands your attention or you have battery low in your machine and you have to shut down. No worries. You can have Ubuntu remember all your running applications and restore them the next time you log in. + +Now, to make our Ubuntu remember the applications you have running in our current session and restore them the next time our log in, We will use the dconf-editor. This tool replaces the gconf-editor available in previous versions of Ubuntu but is not available by default. To install the dconf-editor, you need to run sudo apt-get install dconf-editor. + + $ sudo apt-get install dconf-tools + +Once the dconf-editor is installed, you can open dconf-editor from Application Menu. Or you can run it from terminal or run command (alt+f2): + + $ dconf-editor + +In the “dconf Editor” window, click the right arrow next to “org” in the left pane to expand that branch of the tree. + +![Dconf Editor Apps, org](http://blog.linoxide.com/wp-content/uploads/2015/01/dconf-editor-clicking-org-300x146.png) + +Under “org”, click the right arrow next to “gnome.” + +![dconf editor clicking gnome](http://blog.linoxide.com/wp-content/uploads/2015/01/dconf-editor-clicking-gnome.png) + +Under “gnome,” click “gnome-session”. In the right pane, select the “auto-save-session” check box to turn on the option. + +![dconf-editor selecting auto save session](http://blog.linoxide.com/wp-content/uploads/2015/01/dconf-editor_selecting_auto_save_session.png) + +After you check or tick it, close the “Dconf Editor” by clicking the close button (X) in the upper-left corner of the window which is by default. + +![dconf-editor closing dconf editor](http://blog.linoxide.com/wp-content/uploads/2015/01/dconf-editor_closing_dconf_editor.png) + +The next time you log out and log back in, all of your running applications will be restored. + +Hurray, we have successfully configured our Ubuntu 14.04 LTS "Trusty" to remember automatically running applications from our last session. + +Now, on this same tutorial, we'll gonna also learn **how to enable hibernation in our Ubuntu 14.04 LTS**: + +Before getting started, press Ctrl+ALt+T on your keyboard to open the terminal. When it opens, run: + + sudo pm-hibernate + +After your computer turns off, switch it back on. Did your open applications re-open? If hibernate doesn’t work, check if your swap partition is at least as large as your available RAM. + +You can check your Swap Area Partition Size from System Monitor, you can get it from the App Menu or run command in terminal. + + $ gnome-system-monitor + +### Enable Hibernate in System Tray Menu: ### + +The indicator-session was updated to use logind instead of upower. Hibernate is disabled by default in both upower and logind. + +To re-enable hibernate, run the commands below one by one to edit the config file: + + sudo -i + + cd /var/lib/polkit-1/localauthority/50-local.d/ + + gedit com.ubuntu.enable-hibernate.pkla + +**Tips: if the config file does not work for you, try another one by changing /var/lib to /etc in the code.** + +Copy and paste below lines into the file and save it. + + [Re-enable hibernate by default in upower] + Identity=unix-user:* + Action=org.freedesktop.upower.hibernate + ResultActive=yes + + [Re-enable hibernate by default in logind] + Identity=unix-user:* + Action=org.freedesktop.login1.hibernate + ResultActive=yes + +Restart your computer and done. + +### Hibernate your laptop when lid is closed: ### + +1.Edit “/etc/systemd/logind.conf” via command: + + $ sudo nano /etc/systemd/logind.conf + +2. Change the line **#HandleLidSwitch=suspend to HandleLidSwitch=hibernate** and save the file. + +3. Run command below or just restart your computer to apply changes: + + $ sudo restart systemd-logind + +That’s it. Enjoy! Now, we have both dconf and hibernation on :) Now, your Ubuntu will completely remember your opened apps and stuffs. + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/ubuntu-how-to/remember-running-applications-ubuntu/ + +作者：[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/ \ No newline at end of file From 77c1b7baf03cedf96e0cf245ab74f7097f255db9 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 19 Jan 2015 22:44:19 +0800 Subject: [PATCH 095/215] =?UTF-8?q?20150119-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Better Telegram Client For GNU or Linux.md | 76 +++++++++++++++ ...0150119 How To Disable IPv6 In CentOS 7.md | 95 +++++++++++++++++++ ...ip--How To Restart Cinnamon After Crash.md | 33 +++++++ 3 files changed, 204 insertions(+) create mode 100644 sources/share/20150119 Cutegram--A Better Telegram Client For GNU or Linux.md create mode 100644 sources/tech/20150119 How To Disable IPv6 In CentOS 7.md create mode 100644 sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md diff --git a/sources/share/20150119 Cutegram--A Better Telegram Client For GNU or Linux.md b/sources/share/20150119 Cutegram--A Better Telegram Client For GNU or Linux.md new file mode 100644 index 0000000000..7a051be4fc --- /dev/null +++ b/sources/share/20150119 Cutegram--A Better Telegram Client For GNU or Linux.md @@ -0,0 +1,76 @@ +Cutegram: A Better Telegram Client For GNU/Linux +================================================================================ +No need for a introduction to **Telegram**, right? Telegram is a popular free Instant messenger application that can be used to chat with your friends all over the world. Unlike Whatsapp, Telegram is free forever, no ads, no subscription fees. And, the Telegram client is open source too. Telegram is available for many different platforms, including Linux, Android, iOS, Windows Phone, Windows, and Mac OS X. The messages which are sending using telegram are highly encrypted and self-destructive. It is very secure, and there is no limit on the size of your media and chats. + +You can install and use Telegram desktop on your Debian/Ubuntu systems as mentioned in [our previous tutorial][1]. However, a new telegram client called **Cutegram** is available now to make your chat experience more fun and easy. + +### What is Cutegram? ### + +Cutegram is a free and opensource telegram clients for GNU/Linux focusing on user friendly, compatibility with Linux desktop environments and easy to use. Cutegram using Qt5, QML, libqtelegram, libappindication, AsemanQtTools technologies and Faenza icons and Twitter emojies graphic sets. It’s free and released under GPLv3 license. + +### Install Cutegram ### + +Head over to the Cutegram homepage and download the latest version of your distribution’s choice. As I use Ubuntu 64 bit, I downloaded the .deb file. + + wget http://aseman.co/downloads/cutegram/cutegram_1.0.2-1-amd64.deb + +Now, Install Cutegram as shown below. + + sudo apt-get install gdebi + sudo gdebi cutegram_1.0.2-1-amd64.deb + +For other distributions, run the following commands. + +**64bit:** + + wget http://aseman.co/downloads/cutegram/cutegram-1.0.2-linux-x64-installer.run + +**32 bit:** + + wget http://aseman.co/downloads/cutegram/cutegram-1.0.2-linux-installer.run + +Set executable permission: + + chmod + cutegram-1.0.2-linux*.run + +And, install it as shown below. + + sudo ./cutegram-1.0.2-linux*.run + +### Usage ### + +Launch Cutegram either from Menu or Unity dash. From the login screen, select your country, and enter your mobile number, finally click **Login**. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Cutegram_005.png) + +A code will be sent to your mobile number. Enter the code and click **Sign in**. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Cutegram_002.png) + +There you go. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Cutegram_003.png) + +Start Chatting! + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Cutegram_004.png) + +And, you can set a profile picture, start new chat/group chat, or secret chat from using the buttons on the left pane. + +Stay happy! Cheers!! + +For more details, check the [Cutegram website][2]. + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/cutegram-better-telegram-client-gnulinux/ + +作者：[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/install-telegram-desktop-via-ppa/ +[2]:http://aseman.co/en/products/cutegram/ \ No newline at end of file diff --git a/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md b/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md new file mode 100644 index 0000000000..c3c4d42703 --- /dev/null +++ b/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md @@ -0,0 +1,95 @@ +How To Disable IPv6 In CentOS 7 +================================================================================ +Recently, one of my friend asked me how to disable IPv6. After searching a bit, I found the following solution. Here is the steps that I followed to disable IPv6 in my CentOS 7 minimal server. + +You can do it in two methods. + +### Method 1 ### + +Edit file **/etc/sysctl.conf**, + + vi /etc/sysctl.conf + +Add the following lines: + + net.ipv6.conf.all.disable_ipv6 = 1 + net.ipv6.conf.default.disable_ipv6 = 1 + +If you want to disable IPV6 for particular network card, for example enp0s3, add the following entry. + + net.ipv6.conf.enp0s3.disable_ipv6 = 1 + +Save and exit the file. + +Execute the following command to reflect the changes. + + sysctl -p + +### Method 2: ### + +To IPv6 disable in the running system, enter the following commands one by one: + + echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6 + echo 1 > /proc/sys/net/ipv6/conf/default/disable_ipv6 + +or, + + sysctl -w net.ipv6.conf.all.disable_ipv6=1 + sysctl -w net.ipv6.conf.default.disable_ipv6=1 + +That’s it. Now IPv6 has been disabled. + +### What If I get issues after disabling IPv6? ### + +You may get problems after disabling IPv6. + +#### Issue 1: #### + +if you get issues with SSH after disabling IPv6, do the following. + +Edit **/etc/ssh/sshd_config** file, + +vi /etc/ssh/sshd_config + +Find the line; + + #AddressFamily any + +And. change it to: + + AddressFamily inet + +or, + +Remove the hash mark **(#)** in front of the line: + + #ListenAddress 0.0.0.0 + +Then, restart ssh to reflect the changes. + + systemctl restart sshd + +#### Issue 2: #### + +If you get problems with starting postfix after disabling IPv6, edit **/etc/postfix/main.cf** file; + + vi /etc/postfix/main.cf + +and comment out the localhost part of the config and use ipv4 loopback. + + #inet_interfaces = localhost + inet_interfaces = 127.0.0.1 + +That’s it. Cheers! + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/disable-ipv6-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/20150119 Quick Tip--How To Restart Cinnamon After Crash.md b/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md new file mode 100644 index 0000000000..653c5667c6 --- /dev/null +++ b/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md @@ -0,0 +1,33 @@ +[Quick Tip] How To Restart Cinnamon After Crash +================================================================================ +Cinnamon is a Linux desktop environment which provides advanced innovative features and a traditional user experience. The desktop layout is similar to Gnome 2. The underlying technology is similar from Gnome Shell. The emphasis is put on making users feel at home and providing them with an easy to use and comfortable desktop experience. + +In this post, we’re going to look at a quick way to restart Cinnamon without logging out or rebooting when it crashes. + +The image below is an example of Cinnamon crashed desktop where text and icons vanish from Menu and panel. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/cinnamon_crash.png) + +To restart Cinnamon + +Press **Alt + F2** this brings out a command menu. Type **r** and press Enter. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/type_r.png) + +Cinnamon should restart displaying icons and text in panel and menu. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/linux_mint_cinnamon_menu.png) + +Enjoy! + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/quick-tip-restart-cinnamon-crash/ + +作者：[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 From fa817dfe19628deb9fc32f06c8edc71b844fe52a Mon Sep 17 00:00:00 2001 From: H-mudcup Date: Mon, 19 Jan 2015 22:47:42 +0800 Subject: [PATCH 096/215] Update 20140819 Top 4 Linux download managers.md --- sources/share/20140819 Top 4 Linux download managers.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/share/20140819 Top 4 Linux download managers.md b/sources/share/20140819 Top 4 Linux download managers.md index 1d3e1d27a6..0282a2e91c 100644 --- a/sources/share/20140819 Top 4 Linux download managers.md +++ b/sources/share/20140819 Top 4 Linux download managers.md @@ -1,3 +1,5 @@ +Translating By H-mudcup + Top 4 Linux download managers ================================================================================ **Improve and better manage your web downloads for mirroring, mass grabs or just better control over your files** @@ -145,4 +147,4 @@ via: http://www.linuxuser.co.uk/reviews/top-4-linux-download-managers [1]:http://bit.ly/1mx4Uwz [2]:http://bit.ly/1lilqU9 [3]:http://bit.ly/1lilqU9 -[4]:http://bit.ly/1lilymS \ No newline at end of file +[4]:http://bit.ly/1lilymS From 7248f8228ce3303fc78518d2cc2c538ba4b4614d Mon Sep 17 00:00:00 2001 From: DeadFire Date: Mon, 19 Jan 2015 22:48:00 +0800 Subject: [PATCH 097/215] =?UTF-8?q?20150119-4=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...about diversity niceness in open source.md | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 sources/talk/20150119 Linus Torvalds responds to Ars about diversity niceness in open source.md diff --git a/sources/talk/20150119 Linus Torvalds responds to Ars about diversity niceness in open source.md b/sources/talk/20150119 Linus Torvalds responds to Ars about diversity niceness in open source.md new file mode 100644 index 0000000000..b98e27eacf --- /dev/null +++ b/sources/talk/20150119 Linus Torvalds responds to Ars about diversity niceness in open source.md @@ -0,0 +1,44 @@ +Linus Torvalds responds to Ars about diversity, niceness in open source +================================================================================ +> Acknowledges diversity factors, says "we're different in so many other ways." + +![See, sometimes Linus isn't flicking people off.](http://cdn.arstechnica.net/wp-content/uploads/2013/09/linus-torvalds.jpg) +See, sometimes Linus isn't flicking people off. + +Athanasios Kasampalis + +On Thursday, Linux legend Linus Torvalds sent a lengthy statement to Ars Technica responding to [statements he made in Auckland, New Zealand earlier that day about diversity and "niceness"][2] in the open source sector. + +"What I wanted to say [at the keynote]—and clearly must have done very badly—is that one of the great things about open source is exactly the fact that different people are so different," Torvalds wrote via e-mail. "I think people sometimes look at it as being just 'programmers,' which is not true. It's about all the people who are more oriented toward commercial things, too. It's about all those people who are interested in legal issues—and the social ones, too!" + +Torvalds spoke to what he thought was a larger concept of "diversity" than what has been mentioned a lot in recent stories on the topic, including economic disparity, language, and culture (even between neighboring European countries). "There's a lot of talk about gender and sexual preferences and race, but we're different in so many other ways, too," he wrote. + +"'Open source' as a term and as a movement hasn't been about 'you have to be a believer,'" Torvalds added. "It's not a religion. It's not an 'us vs them' thing. We've been able to work with all those 'evil commercial interests' and companies who also do proprietary software. And I think that was one of the things that the Linux community (and others—don't get me wrong, it's not unique to us) did and does well." + +Torvalds also talked about progress since the GPL vs. BSD "flame wars" from the '80s and early '90s, saying that the open source movement brought more technology and less "ideology" to the sector. "Which is not to say that a lot of people aren't around because they believe it's the 'ethical' thing to do (I do myself too)," Torvalds added, "but you don't have to believe that, and you can just do it because it's the most fun, or the most efficient way to do technology development." + +### “This ‘you have to be nice’ seems very popular in the US” ### + +He then sent a second e-mail to Ars about the topic of "niceness" that came up during the keynote. He said that his return to his Auckland hotel was delayed by "like three hours" because of hallway conversations about this very topic. + +"I don't know where you happen to be based, but this 'you have to be nice' seems to be very popular in the US," Torvalds continued, calling the concept an "ideology." + +"The same way we have developers and marketing people and legal people who speak different languages, I think we can have some developers who are used to—and prefer—a more confrontational style, and still **also** have people who don't," he wrote. + +He lambasted the "brainstorming" model of having a criticism-free bubble to bounce ideas off of. "Maybe it works for some people, but I happen to simply not believe in it," he said. "I'd rather be really confrontational, and bad ideas should be [taken] down aggressively. Even good ideas need to be vigorously defended." + +"Maybe it's just because I like arguing," Torvalds added. "I'm just not a huge believer in politeness and sensitivity being preferable over bluntly letting people know your feelings. But I also understand that other people are driven away by cursing and crass language when it all gets a bit too carried away." To that point, Torvalds said that the open source movement might simply need more "people who are good at mediating," as opposed to asking developers to calm their own tone or attitude. + +-------------------------------------------------------------------------------- + +via: http://arstechnica.com/business/2015/01/linus-torvalds-responds-to-ars-about-diversity-niceness-in-open-source/ + +作者：[Sam Machkovech][a] +译者：[译者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/samred/ +[1]:https://secure.flickr.com/photos/12693492@N04/1338136415/in/photolist-33fikv-3jXFce-3ALpLy-4m6Shj-4pADUg-4pHwcW-4rNTR7-4GMhKc-4HM2qp-4JSHKa-4PomQo-4SKxMo-58LBYf-5iVNX6-5tXbB8-5xi67A-5A8rRc-5C8fAT-5Ccxjw-5EcYvx-5UoNTc-5UoVJK-5Uti6q-5UuiX2-5UuE2B-5UyEJu-5UyHMf-5UyJ2G-5UFbXP-5UFg8Z-5UFhwV-5UKDkG-5UKDP9-5UTHGv-5XM2s2-5YFmLu-65N31L-6pSwh7-6trmfx-6H2uZP-6JVV4V-71qkot-71BBbk-72vuYo-73j9yB-79aQ2a-79bfqe-79EKPH-79EXvD-79PuG5-7a4BxF +[2]:http://arstechnica.com/business/2015/01/linus-torvalds-on-why-he-isnt-nice-i-dont-care-about-you/ \ No newline at end of file From 637598d6a8bcf23692ca448412c14e1867add9cf Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Tue, 20 Jan 2015 09:43:03 +0800 Subject: [PATCH 098/215] translating --- .../20150119 Quick Tip--How To Restart Cinnamon After Crash.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md b/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md index 653c5667c6..f1b59a8206 100644 --- a/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md +++ b/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md @@ -1,3 +1,5 @@ +Translating---geekpi + [Quick Tip] How To Restart Cinnamon After Crash ================================================================================ Cinnamon is a Linux desktop environment which provides advanced innovative features and a traditional user experience. The desktop layout is similar to Gnome 2. The underlying technology is similar from Gnome Shell. The emphasis is put on making users feel at home and providing them with an easy to use and comfortable desktop experience. From 06dedaca1de4aeb018a4d81b5d6cf5046b43e6d6 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Tue, 20 Jan 2015 09:53:28 +0800 Subject: [PATCH 099/215] translated --- ...ip--How To Restart Cinnamon After Crash.md | 35 ------------------- ...ip--How To Restart Cinnamon After Crash.md | 33 +++++++++++++++++ 2 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md create mode 100644 translated/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md diff --git a/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md b/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md deleted file mode 100644 index f1b59a8206..0000000000 --- a/sources/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md +++ /dev/null @@ -1,35 +0,0 @@ -Translating---geekpi - -[Quick Tip] How To Restart Cinnamon After Crash -================================================================================ -Cinnamon is a Linux desktop environment which provides advanced innovative features and a traditional user experience. The desktop layout is similar to Gnome 2. The underlying technology is similar from Gnome Shell. The emphasis is put on making users feel at home and providing them with an easy to use and comfortable desktop experience. - -In this post, we’re going to look at a quick way to restart Cinnamon without logging out or rebooting when it crashes. - -The image below is an example of Cinnamon crashed desktop where text and icons vanish from Menu and panel. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/cinnamon_crash.png) - -To restart Cinnamon - -Press **Alt + F2** this brings out a command menu. Type **r** and press Enter. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/type_r.png) - -Cinnamon should restart displaying icons and text in panel and menu. - -![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/linux_mint_cinnamon_menu.png) - -Enjoy! - --------------------------------------------------------------------------------- - -via: http://www.unixmen.com/quick-tip-restart-cinnamon-crash/ - -作者：[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/translated/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md b/translated/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md new file mode 100644 index 0000000000..eee9d41d0c --- /dev/null +++ b/translated/tech/20150119 Quick Tip--How To Restart Cinnamon After Crash.md @@ -0,0 +1,33 @@ +如何在崩溃后重启Cinnamon +================================================================================ +Cinnamon是一个提供了高级创新特性和传统用户体验的Linux桌面环境。桌面布局和Gnome 2相似。底层的技术与Gnome Shell相似。它的重点是让用户有宾至如归的感觉并提供一个简单和舒适的桌面体验。 + +本篇中我们会展示一个快速的方法来重启Cinnamon而不用在崩溃后登出或者重启。 + +下图是Cinnamon桌面崩溃后，文本和图标从菜单和面板消失了。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/cinnamon_crash.png) + +要重启Cinnamon + +按下**Alt + F2** 将会打开一个命令菜单，输入**r**并按下回车。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/type_r.png) + +Cinnamon应该会重新在面板和菜单中显示图标和文本了。 + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/linux_mint_cinnamon_menu.png) + +享受吧！ + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/quick-tip-restart-cinnamon-crash/ + +作者：[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 From f155e6d8fa0ae090b51e4df91296cca3923dbe45 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Tue, 20 Jan 2015 09:55:27 +0800 Subject: [PATCH 100/215] translating --- sources/tech/20150119 How To Disable IPv6 In CentOS 7.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md b/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md index c3c4d42703..4bdf54cc8f 100644 --- a/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md +++ b/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md @@ -1,3 +1,5 @@ +Translating----geekpi + How To Disable IPv6 In CentOS 7 ================================================================================ Recently, one of my friend asked me how to disable IPv6. After searching a bit, I found the following solution. Here is the steps that I followed to disable IPv6 in my CentOS 7 minimal server. From ca2eb1e0b8a4d06d4522b5c04a6b93fcf43fa9dc Mon Sep 17 00:00:00 2001 From: runningwater Date: Tue, 20 Jan 2015 10:50:16 +0800 Subject: [PATCH 101/215] =?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 --- ...n Source Has Won, But It Isn't Finished.md | 48 ------------------- ...n Source Has Won, But It Isn't Finished.md | 47 ++++++++++++++++++ 2 files changed, 47 insertions(+), 48 deletions(-) delete mode 100644 sources/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md create mode 100644 translated/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md diff --git a/sources/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md b/sources/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md deleted file mode 100644 index 8afdfc1132..0000000000 --- a/sources/talk/20150106 2015--Open Source Has Won, But It Isn't Finished.md +++ /dev/null @@ -1,48 +0,0 @@ -(translating by runningwater) -2015: Open Source Has Won, But It Isn't Finished -================================================================================ -> After the wins of 2014, what's next? - -At the beginning of a new year, it's traditional to look back over the last 12 months. But as far as this column is concerned, it's easy to summarise what happened then: open source has won. Let's take it from the top: - -**Supercomputers**. Linux is so dominant on the Top 500 Supercomputers lists it is almost embarrassing. The [November 2014 figures][1] show that 485 of the top 500 systems were running some form of Linux; Windows runs on just one. Things are even more impressive if you look at the numbers of cores involved. Here, Linux is to be found on 22,851,693 of them, while Windows is on just 30,720; what that means is that not only does Linux dominate, it is particularly strong on the bigger systems. - -**Cloud computing**. The Linux Foundation produced an interesting [report][2] last year, which looked at the use of Linux in the cloud by large companies. It found that 75% of them use Linux as their primary platform there, against just 23% that use Windows. It's hard to translate that into market share, since the mix between cloud and non-cloud needs to be factored in; however, given the current popularity of cloud computing, it's safe to say that the use of Linux is high and increasing. Indeed, the same survey found Linux deployments in the cloud have increased from 65% to 79%, while those for Windows have fallen from 45% to 36%. Of course, some may not regard the Linux Foundation as totaly disinterested here, but even allowing for that, and for statistical uncertainties, it's pretty clear which direction things are moving in. - -**Web servers**. Open source has dominated this sector for nearly 20 years - an astonishing record. However, more recently there's been some interesting movement in market share: at one point, Microsoft's IIS managed to overtake Apache in terms of the total number of Web servers. But as Netcraft explains in its most recent [analysis][3], there's more than meets the eye here: - -> This is the second month in a row where there has been a large drop in the total number of websites, giving this month the lowest count since January. As was the case in November, the loss has been concentrated at just a small number of hosting companies, with the ten largest drops accounting for over 52 million hostnames. The active sites and web facing computers metrics were not affected by the loss, with the sites involved being mostly advertising linkfarms, having very little unique content. The majority of these sites were running on Microsoft IIS, causing it to overtake Apache in the July 2014 survey. However the recent losses have resulted in its market share dropping to 29.8%, leaving it now over 10 percentage points behind Apache. - -As that indicates, Microsoft's "surge" was more apparent than real, and largely based on linkfarms with little useful content. Indeed, Netcraft's figures for active sites paints a very different picture: Apache has 50.57% market share, with nginx second on 14.73%; Microsoft IIS limps in with a rather feeble 11.72%. This means that open source has around 65% of the active Web server market - not quite at the supercomputer level, but pretty good. - -**Mobile systems**. Here, the march of open source as the foundation of Android continues. Latest figures show that Android accounted for [83.6%][4] of smartphone shipments in the third quarter of 2014, up from 81.4% in the same quarter the previous year. Apple achieved 12.3%, down from 13.4%. As far as tablets are concerned, Android is following a similar trajectory: for the second quarter of 2014, Android notched up around [75% of global tablet sales][5], while Apple was on 25%. - -**Embedded systems**. Although it's much harder to quantify the market share of Linux in the important embedded system market, but figures from one 2013 study indicated that around [half of planned embedded systems][6] would use it. - -**Internet of Things**. In many ways this is simply another incarnation of embedded systems, with the difference that they are designed to be online, all the time. It's too early to talk of market share, but as I've [discussed][7] recently, AllSeen's open source framework is coming on apace. What's striking by their absence are any credible closed-source rivals; it therefore seems highly likely that the Internet of Things will see supercomputer-like levels of open source adoption. - -Of course, this level of success always begs the question: where do we go from here? Given that open source is approaching saturation levels of success in many sectors, surely the only way is down? In answer to that question, I recommend a thought-provoking essay from 2013 written by Christopher Kelty for the Journal of Peer Production, with the intriguing title of "[There is no free software.][8]" Here's how it begins: - -> Free software does not exist. This is sad for me, since I wrote a whole book about it. But it was also a point I tried to make in my book. Free software—and its doppelganger open source—is constantly becoming. Its existence is not one of stability, permanence, or persistence through time, and this is part of its power. - -In other words, whatever amazing free software 2014 has already brought us, we can be sure that 2015 will be full of yet more of it, as it continues its never-ending evolution. - --------------------------------------------------------------------------------- - -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/ 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 new file mode 100644 index 0000000000..1646773bb5 --- /dev/null +++ b/translated/talk/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) +校对：[校对者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 0aac3e8dafbcda297145ba6625e7cee42d099ced Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Tue, 20 Jan 2015 10:57:34 +0800 Subject: [PATCH 102/215] translated --- ...0150119 How To Disable IPv6 In CentOS 7.md | 97 ------------------- ...0150119 How To Disable IPv6 In CentOS 7.md | 96 ++++++++++++++++++ 2 files changed, 96 insertions(+), 97 deletions(-) delete mode 100644 sources/tech/20150119 How To Disable IPv6 In CentOS 7.md create mode 100644 translated/tech/20150119 How To Disable IPv6 In CentOS 7.md diff --git a/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md b/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md deleted file mode 100644 index 4bdf54cc8f..0000000000 --- a/sources/tech/20150119 How To Disable IPv6 In CentOS 7.md +++ /dev/null @@ -1,97 +0,0 @@ -Translating----geekpi - -How To Disable IPv6 In CentOS 7 -================================================================================ -Recently, one of my friend asked me how to disable IPv6. After searching a bit, I found the following solution. Here is the steps that I followed to disable IPv6 in my CentOS 7 minimal server. - -You can do it in two methods. - -### Method 1 ### - -Edit file **/etc/sysctl.conf**, - - vi /etc/sysctl.conf - -Add the following lines: - - net.ipv6.conf.all.disable_ipv6 = 1 - net.ipv6.conf.default.disable_ipv6 = 1 - -If you want to disable IPV6 for particular network card, for example enp0s3, add the following entry. - - net.ipv6.conf.enp0s3.disable_ipv6 = 1 - -Save and exit the file. - -Execute the following command to reflect the changes. - - sysctl -p - -### Method 2: ### - -To IPv6 disable in the running system, enter the following commands one by one: - - echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6 - echo 1 > /proc/sys/net/ipv6/conf/default/disable_ipv6 - -or, - - sysctl -w net.ipv6.conf.all.disable_ipv6=1 - sysctl -w net.ipv6.conf.default.disable_ipv6=1 - -That’s it. Now IPv6 has been disabled. - -### What If I get issues after disabling IPv6? ### - -You may get problems after disabling IPv6. - -#### Issue 1: #### - -if you get issues with SSH after disabling IPv6, do the following. - -Edit **/etc/ssh/sshd_config** file, - -vi /etc/ssh/sshd_config - -Find the line; - - #AddressFamily any - -And. change it to: - - AddressFamily inet - -or, - -Remove the hash mark **(#)** in front of the line: - - #ListenAddress 0.0.0.0 - -Then, restart ssh to reflect the changes. - - systemctl restart sshd - -#### Issue 2: #### - -If you get problems with starting postfix after disabling IPv6, edit **/etc/postfix/main.cf** file; - - vi /etc/postfix/main.cf - -and comment out the localhost part of the config and use ipv4 loopback. - - #inet_interfaces = localhost - inet_interfaces = 127.0.0.1 - -That’s it. Cheers! - --------------------------------------------------------------------------------- - -via: http://www.unixmen.com/disable-ipv6-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/translated/tech/20150119 How To Disable IPv6 In CentOS 7.md b/translated/tech/20150119 How To Disable IPv6 In CentOS 7.md new file mode 100644 index 0000000000..080799f17c --- /dev/null +++ b/translated/tech/20150119 How To Disable IPv6 In CentOS 7.md @@ -0,0 +1,96 @@ +如何在CentOS 7中禁止IPv6 +================================================================================ +最近，我的一位朋友问我该如何禁止IPv6。在搜索了一番之后，我找到了下面的方案。下面就是我在CentOS 7迷你版中禁止IPv6的方法。 + +你可以用两个方法做到这个。 + +### 方法 1 ### + +编辑文件**/etc/sysctl.conf**， + + vi /etc/sysctl.conf + +添加下面的行： + + net.ipv6.conf.all.disable_ipv6 = 1 + net.ipv6.conf.default.disable_ipv6 = 1 + +如果你想要为特定的网卡禁止IPv6，比如，对于enp0s3，添加下面的行。 + + net.ipv6.conf.enp0s3.disable_ipv6 = 1 + +保存并退出文件。 + +执行下面的命令来使设置生效。 + + sysctl -p + +### 方法 2 ### + +要在运行的系统中禁止IPv6，依次输入下面的命令： + + echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6 + echo 1 > /proc/sys/net/ipv6/conf/default/disable_ipv6 + +或者， + + sysctl -w net.ipv6.conf.all.disable_ipv6=1 + sysctl -w net.ipv6.conf.default.disable_ipv6=1 + +就是这样。现在IPv6已经禁止了。 + +### 我在禁止IPv6后遇到问题怎么办 ### + +You may get problems after disabling IPv6. +你可能在禁止IPv6后遇到一些问题 + +#### 问题1： #### + +如果你在禁止IPv6后SSH遇到问题，按照下面的做。 + +编辑 **/etc/ssh/sshd_config** 文件 + +vi /etc/ssh/sshd_config + +找到下面的行： + + #AddressFamily any + +把它改成： + + AddressFamily inet + +或者， + +在这行的前面去掉注释**(#)**： + + #ListenAddress 0.0.0.0 + +接着重启ssh来使改变生效。 + + systemctl restart sshd + +#### 问题2： #### + +如果你在禁止Ipv6后启动postfix遇到问题，编辑**/etc/postfix/main.cf**： + + vi /etc/postfix/main.cf + +注释掉配置中的localhost部分，并且使用ipv4回环。 + + #inet_interfaces = localhost + inet_interfaces = 127.0.0.1 + +就是这样，干杯！ + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/disable-ipv6-centos-7/ + +作者：[SK][a] +译者：[geekpi](https://github.com/geekpi) +校对：[校对者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 c4526a6717a525da0030a0f01e9533d1663c9f57 Mon Sep 17 00:00:00 2001 From: runningwater Date: Tue, 20 Jan 2015 14:47:16 +0800 Subject: [PATCH 103/215] =?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 --- ...pact Text Editors Great for Remote Editing and Much More.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/share/20141013 Compact Text Editors Great for Remote Editing and Much More.md b/sources/share/20141013 Compact Text Editors Great for Remote Editing and Much More.md index 19f1bbb475..42b2700b49 100644 --- a/sources/share/20141013 Compact Text Editors Great for Remote Editing and Much More.md +++ b/sources/share/20141013 Compact Text Editors Great for Remote Editing and Much More.md @@ -1,3 +1,4 @@ +(translating by runningwater) Compact Text Editors Great for Remote Editing and Much More ================================================================================ A text editor is software used for editing plain text files. This type of software has many different uses including modifying configuration files, writing programming language source code, jotting down thoughts, or even making a grocery list. Given that editors can be used for such a diverse range of activities, it is worth spending the time finding an editor that best suites your preferences. @@ -207,7 +208,7 @@ nano, like Pico, is keyboard-oriented, controlled with control keys. via: http://www.linuxlinks.com/article/20141011073917230/TextEditors.html 作者：Frazer Kline -译者：[译者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/) 荣誉推出 From 9922596791a0c4222418c2c0edbfe8e947100123 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 21 Jan 2015 16:18:33 +0800 Subject: [PATCH 104/215] =?UTF-8?q?20150121-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...age effects to pictures on Raspberry Pi.md | 69 ++++++ ...Sync Files or Folders Between Computers.md | 207 ++++++++++++++++++ 2 files changed, 276 insertions(+) create mode 100644 sources/tech/20150121 How to apply image effects to pictures on Raspberry Pi.md create mode 100644 sources/tech/20150121 Syncthing--A Private And Secure Tool To Sync Files or Folders Between Computers.md diff --git a/sources/tech/20150121 How to apply image effects to pictures on Raspberry Pi.md b/sources/tech/20150121 How to apply image effects to pictures on Raspberry Pi.md new file mode 100644 index 0000000000..920f542832 --- /dev/null +++ b/sources/tech/20150121 How to apply image effects to pictures on Raspberry Pi.md @@ -0,0 +1,69 @@ +How to apply image effects to pictures on Raspberry Pi +================================================================================ +Like a common pocket camera which has a built-in function to add various effects on captured photos, [Raspberry Pi camera board][1] ("raspi cam") can actually do the same. With the help of raspistill camera control options, we can add the image effects function like we have in a pocket camera. + +There are [three comman-line applications][2] which can be utilized for [taking videos or pictures][3] with raspi cam, and one of them is the raspistill application. The raspistill tool offers various camera control options such as sharpness, contrast, brightness, saturation, ISO, exposure, automatic white balance (AWB), image effects. + +In this article I will show how to apply exposure, AWB, and other image effects with raspistill while capturing pictures using raspi cam. To automate the process, I wrote a simple Python script which takes pictures and automatically applies a series of image effects to the pictures. The raspi cam documentation describes available types of the exposure, AWB, and image effects. In total, the raspi cam offers 16 types of image effects, 12 types of exposure, and 10 types of AWB values. + +The simple Python script looks like the following. + + #!/usb/bin/python + import os + import time + import subprocess + list_ex=['auto','night'] + list_awb=['auto','cloud',flash'] + list_ifx=['blur','cartoon','colourswap','emboss','film','gpen','hatch','negative','oilpaint','posterise','sketch','solarise','watercolour'] + x=0 + for ex in list_ex: + for awb in list_awb: + for ifx in list_ifx: + x=x+1 + filename='img_'+ex+'_'+awb+'_'+ifx+'.jpg' + cmd='raspistill -o '+filename+' -n -t 1000 -ex '+ex+' -awb '+awb+' -ifx '+ifx+' -w 640 -h 480' + pid=subprocess.call(cmd,shell=True) + print "["+str(x)+"]-"+ex+"_"+awb+"_"+ifx+".jpg" + time.sleep(0.25) + print "End of image capture" + +The Python script operates as follows. First, create three array/list variable for the exposure, AWB and image effects. In the example, we use 2 types of exposure, 3 types of AWB, and 13 types of image effects values. Then make nested loops for applying the value of the three variables that we have. Inside the nested loop, execute the raspistill application. We specify (1) the output filename; (2) exposure value; (3) AWB value; (4) image effect value; (5) the time to take a photo, which is set to 1 second; and (6) the size of the photo, which is set to 640x480px. This Python script will create 78 different versions of a captured photo with a combination of 2 types of exposure, 3 types of AWB, and 13 types of image effects. + +To execute the Python script, simply type: + + $ python name_of_this_script.py + +Here is the first round of the sample result. + +![](https://farm8.staticflickr.com/7483/16134215939_c93291158a_c.jpg) + +### Bonus ### + +For those who are more interested, there is another way to access and control the raspi cam besides raspistill. [Picamera][4] a pure Python interface which provides APIs for accessing and controlling raspi cam, so that one can build a complex program for utilizing raspi cam according to their needs. If you are skilled at Python, picamera is a good feature-complete interface for implementing your raspi cam project. The picamera interface is included by default in the recent image of Raspbian. If your [Raspberry Pi][5] operating system is not new or not Raspbian, you can install it on your system as follows. + +First, install pip on your system by following [this guideline][6]. + +Then, install picamera as follows. + + $ sudo pip install picamera + +Refer to the [official documentation][7] on how to use picamera. + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/apply-image-effects-pictures-raspberrypi.html + +作者：[Kristophorus Hadiono][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/kristophorus +[1]:http://xmodulo.com/go/picam +[2]:http://www.raspberrypi.org/documentation/usage/camera/raspicam/ +[3]:http://xmodulo.com/install-raspberry-pi-camera-board.html +[4]:https://pypi.python.org/pypi/picamera +[5]:http://xmodulo.com/go/raspberrypi +[6]:http://ask.xmodulo.com/install-pip-linux.html +[7]:http://picamera.readthedocs.org/ \ No newline at end of file diff --git a/sources/tech/20150121 Syncthing--A Private And Secure Tool To Sync Files or Folders Between Computers.md b/sources/tech/20150121 Syncthing--A Private And Secure Tool To Sync Files or Folders Between Computers.md new file mode 100644 index 0000000000..8a4aff4dfb --- /dev/null +++ b/sources/tech/20150121 Syncthing--A Private And Secure Tool To Sync Files or Folders Between Computers.md @@ -0,0 +1,207 @@ +Syncthing: A Private, And Secure Tool To Sync Files/Folders Between Computers +================================================================================ +### Introduction ### + +**Syncthing** is a free, Open Source tool that can be used to sync files/folders between your networked computers. Unlike other sync tools, such as **BitTorrent Sync** or **Dropbox**, Syncthing transfers data directly from one system to another system, and It is completely open source, secure and private. All of your precious data will be stored in your system so that you can have full control over your files and folders, and none of them are stored in any third party systems. Also, you deserve to choose where it is stored, if it is shared with some third party and how it’s transmitted over the Internet. + +All communication is encrypted using TLS, so your data is very secure from the prying eyes. Syncthing has a responsive and powerful WebGUI which will help the users to easily add, delete and manage directories to be synced over network. Using Syncthing, you can sync multiple folders to multiple systems at a time. Syncthing is very simple, portable, yet powerful tool in terms of installation and usage. Since all files/folders are directly transferred from one computer to another computer, you don’t have to worry about purchasing extra space from your Cloud provider. All you need is very stable LAN/WAN connection and enough disk space on your systems. It supports all modern operating systems, including GNU/Linux, Windows, Mac OS X, and ofcourse Android. + +### Installation ### + +For the purpose of this tutorial, We will be using two systems, one is running with Ubuntu 14.04 LTS, and another one is running with Ubuntu 14.10 server. To easily recognize these two systems, we will be calling them using names **system1**, and **system2**. + +### System1 Details: ### + +- **OS**: Ubuntu 14.04 LTS server; +- **Hostname**: server1.unixmen.local; +- **IP Address**: 192.168.1.150. +- **System user**: sk (You can use your own) +- **Sync Directory**: /home/Sync/ (Will be created by default by Syncthing) + +### System2 Details: ### + +- **OS**: Ubuntu 14.10 server; +- **Hostname**: server.unixmen.local; +- **IP Address**: 192.168.1.151. +- **System user**: sk (You can use your own) +- **Sync Directory**: /home/Sync/ (Will be created by default by Syncthing) + +### Creating User For Syncthing On System 1 & System2: ### + +Run the following commands on both system to create the user for Syncthing and the directory to be synced between two systems: + + sudo useradd sk + sudo passwd sk + +### Install Syncthing On System1 And System2: ### + +You should do the following steps on both System 1 and System 2. + +Download the latest version from the [official download page][1]. As I am using 64bit system, I downloaded the 6bbit package. + + wget https://github.com/syncthing/syncthing/releases/download/v0.10.20/syncthing-linux-amd64-v0.10.20.tar.gz + +Extract the download file: + + tar xzvf syncthing-linux-amd64-v0.10.20.tar.gz + +Cd to the extracted folder: + + cd syncthing-linux-amd64-v0.10.20/ + +Copy the excutable file “syncthing” to **$PATH**: + + sudo cp syncthing /usr/local/bin/ + +Now, run the following command to run the syncthing for the first time. + + syncthing + +When you run the above command, syncthing will generate a configuration and some keys and then start the admin GUI in your browser. You should see something like below. + +Sample output: + + [monitor] 15:40:27 INFO: Starting syncthing + 15:40:27 INFO: Generating RSA key and certificate for syncthing... + [BQXVO] 15:40:34 INFO: syncthing v0.10.20 (go1.4 linux-386 default) unknown-user@syncthing-builder 2015-01-13 16:27:47 UTC + [BQXVO] 15:40:34 INFO: My ID: BQXVO3D-VEBIDRE-MVMMGJI-ECD2PC3-T5LT3JB-OK4Z45E-MPIDWHI-IRW3NAZ + [BQXVO] 15:40:34 INFO: No config file; starting with empty defaults + [BQXVO] 15:40:34 INFO: Edit /home/sk/.config/syncthing/config.xml to taste or use the GUI + [BQXVO] 15:40:34 INFO: Starting web GUI on http://127.0.0.1:8080/ + [BQXVO] 15:40:34 INFO: Loading HTTPS certificate: open /home/sk/.config/syncthing/https-cert.pem: no such file or directory + [BQXVO] 15:40:34 INFO: Creating new HTTPS certificate + [BQXVO] 15:40:34 INFO: Generating RSA key and certificate for server1... + [BQXVO] 15:41:01 INFO: Starting UPnP discovery... + [BQXVO] 15:41:07 INFO: Starting local discovery announcements + [BQXVO] 15:41:07 INFO: Starting global discovery announcements + [BQXVO] 15:41:07 OK: Ready to synchronize default (read-write) + [BQXVO] 15:41:07 INFO: Device BQXVO3D-VEBIDRE-MVMMGJI-ECD2PC3-T5LT3JB-OK4Z45E-MPIDWHI-IRW3NAZ is "server1" at [dynamic] + [BQXVO] 15:41:07 INFO: Completed initial scan (rw) of folder default + +Syncthing has been successfully initialized, and the Web admin interface can be accessed using URL: **http://localhost:8080** from your browser. As you see in the above output, syncthing has automatically created a folder called **default** for you, in a directory called **Sync** in your **home** directory. + +By default, Syncthing WebGUI will only be accessed from the localhost itself. To access the WebGUI from the remote systems, you need to do the following changes on both systems. + +First, stop the Syncthing initialization process by pressing the CTRL+C. Now, you will be returned back to the Terminal. + +Edit file **config.xml**, + + sudo nano ~/.config/syncthing/config.xml + +Find this directive: + + [...] + +
127.0.0.1:8080
+ -Su9v0lW80JWybGjK9vNK00YDraxXHGP + + [...] + +In the **
** field, change **127.0.0.1:8080** to **0.0.0.0:8080**. So, your config.xml will look like below. + + +
0.0.0.0:8080
+ -Su9v0lW80JWybGjK9vNK00YDraxXHGP + + +Save and close the file. + +Now, start again the Syncthing initialization on both systems by entering the following command: + + syncthing + +### Access the WebGUI ### + +Now, open your browser **http://ip-address:8080/**. You will see the following screen, + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Syncthing-server1-Mozilla-Firefox_001.png) + +The WebGUI has two panes. In the left pane, you may see the list of folders to be synced. As I mentioned before, the folder **default** has been automatically created for you while initializing Syncthing. If you want to sync more folders, you can add using **Add Folder** button. + +In the right pane, you see the number of devices connected. Currently there is only one device, the computer you are running this on. + +### Configure Syncthing Web GUI ### + +For the security enhancement, let us enable TLS, and setup administrative user and password to access the WebGUI. To od that, click on the gear button and select **Settings** on the top right corner. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Menu_002.png) + +Enter the admin username/password. In my case it is admin/ubuntu. You should use some strong password. And, check the box that says: **Use HTTPS for GUI**. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Syncthing-server1-Mozilla-Firefox_004.png) + +Click Save button. Now, you’ll be asked to restart the Syncthing to activate the changes. Click Restart. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Selection_005.png) + +Selection_005Refresh you web browser. You’ll see the SSL warning like below. Click on the button that says: **I understand the Risks**. And, click Add Exception button to add this page to the browser trusted lists. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Untrusted-Connection-Mozilla-Firefox_006.png) + +Enter the administrative user and password which we configured in the previous steps. In my case it’s **admin/ubuntu**. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Authentication-Required_007.png) + +We have secured the WebGUI now. Don’t forget to do the same steps on both server. + +### Connect Servers To Each Other ### + +To sync folders between systems, you must told them about each other. This is accomplished by exchanging “device IDs”. You can find it in the web GUI by selecting the “gear menu” (top right) and “Show ID”. + +For example, here is my System 1 ID. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Syncthing-server1-Mozilla-Firefox_008.png) + +Copy the ID, and go to the another system (system 2) WebGUI. From the second system (system 2) WebGUI window, click on the Add Device on the right side. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Syncthing-server-Mozilla-Firefox_010.png) + +The following screen should appear. Paste the **System 1 ID** in the Device section. Enter the Device name(optional). In the Addresses field, you can either enter the IP address of the other system or leave it as default. The default value is **dynamic**. Finally, select the folder to be synced. In our case, the sync folder is **default**. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Syncthing-server-Mozilla-Firefox_009.png) + +Once you done, click on the save button. You’ll be asked to restart the Syncthing. Click Restart button to activate the changes. + +Now, go to the **System 1** WebUI, you’ll see a request has been sent from the System 2 to connect and sync. Click **Add** button. Now, the System 2 will ask the System 1 to share and sync the folder called “default”. Click **Share** button. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Selection_013.png) + +Next restart the Syncthing service on the System 1 to activate the changes. + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Selection_014.png) + +Wait for few seconds, approximately 60 seconds, and you’ll see the two systems have been successfully connected and synced to each other. + +You can verify it under the Add Device section of the WebGUI. + +System 1 WebGUI console after adding System 2: + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Syncthing-server-Mozilla-Firefox_016.png) + +System 2 WebGUI console after adding System 1: + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Syncthing-server-Mozilla-Firefox_018.png) + +![](http://180016988.r.cdn77.net/wp-content/uploads/2015/01/Syncthing-server-Mozilla-Firefox_018.png) + +Now, put any file or folder in any one of the systems “**default**” folder. You may see the file/folder will be synced to the other system automatically. + +That’s it! Happy Sync’ing!! + +Cheers!!! + +- [Syncthing Website][2] + +-------------------------------------------------------------------------------- + +via: http://www.unixmen.com/syncthing-private-secure-tool-sync-filesfolders-computers/ + +作者：[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]:https://github.com/syncthing/syncthing/releases/tag/v0.10.20 +[2]:http://syncthing.net/ \ No newline at end of file From 4fc1280f935e85a2a830e75faed1dd7b72a83291 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 21 Jan 2015 16:30:21 +0800 Subject: [PATCH 105/215] =?UTF-8?q?20150121-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nitor Network Usage with nload in Linux.md | 206 ++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 sources/tech/20150121 How to Monitor Network Usage with nload in Linux.md diff --git a/sources/tech/20150121 How to Monitor Network Usage with nload in Linux.md b/sources/tech/20150121 How to Monitor Network Usage with nload in Linux.md new file mode 100644 index 0000000000..afbfa4eab6 --- /dev/null +++ b/sources/tech/20150121 How to Monitor Network Usage with nload in Linux.md @@ -0,0 +1,206 @@ +How to Monitor Network Usage with nload in Linux +================================================================================ +nload is a free linux utility that can help the linux user or sysadmin to monitor network traffic and bandwidth usage in real time by providing two simple graphs: one per incoming traffic and one for outgoing traffic. + +I really like to use **nload** to display information on my screen about the current download speed, the total incoming traffic, and the average download speed. The graphs reported by nload tool are very easy to interpret and what is the most important thing they are very helpful. + +According to the manual pages it monitors all network devices by default, but you can easily specify the device you want to monitor and also switch between different network devices using the arrow keys. There are many options avaliable such as -t to determine refresh interval of the display in milliseconds (the default value of interval is 500), -m to show multiple devices at the same time(traffic graphs are not shown when this option is used), -u to set the type of unit used for the display of traffic numbers and many others that we are going to explore and practise in this tutorial. + +### How to install nload on your linux machine ### + +**Ubuntu** and **Fedora** users can easily install nload from the default repositories. + +Install nload on Ubuntu by using the following command. + + sudo apt-get install nload + +Install nload on Fedora by using the following command. + + sudo yum install nload + +What about **CentOS** users? Just type the following command on your machine and you will get nload installed. + + sudo yum install nload + +The following command will help you to install nload on OpenBSD systems. + + sudo pkg_add -i nload + +A very effective way to install software on linux machine is to compile by source as you can download and install the latest version which usually means better performance, cool features and less bugs. + +### How to install nload from source ### + +The first thing you need to do before installing nload from source you need to download it and to do this I like to use the wget uility which is available by default on many linux machines. This free utility helps linux users to download files from the web in a non-interactive way and has support for the following protocols. + +- HTTP +- HTTPS +- FTP + +Change directory to **/tmp** by using the following command. + + cd /tmp + +Now type the following command in your terminal to download the latest version of nload on your linux machine. + + wget http://www.roland-riegel.de/nload/nload-0.7.4.tar.gz + +If you don't like to use the linux wget utility you can easily download it from the [official][1] source by just a mouse click. + +The download will finish in no time as it is a small software. The next step is to untar the file you downloaded with the help of the **tar** utility. + +The tar archiving utility can be used to store and extract files from a tape or disk archive. There are many options available in this tool but we need the followings to perform our operation: + +1. **-x** to extract files from an archive +1. **-v** to run in verbose mode +1. **-f** to specify the files + +For example: + + tar xvf example.tar + +Now that you learned how to use the tar utility I am very sure you know how to untar .tar archives from the commandline. + + tar xvf nload-0.7.4.tar.gz + +Then use the cd command to change directory to nload*. + + cd nload* + +It looks like this on my system. + + oltjano@baby:/tmp/nload-0.7.4$ + +Now run the command + + ./configure + +to to configure the package for your system. + + ./configure + +Alot of stuff is going to be displayed on your screen. The following screenshot demonstrates how it is going to look like. + +![configuring packages for nload](http://blog.linoxide.com/wp-content/uploads/2015/01/nload1.png) + +Then compile the nload with the following command. + + make + +![compiling nload](http://blog.linoxide.com/wp-content/uploads/2015/01/nload2.png) + +And finally install nload on your linux machine with the following command. + + sudo make install + +![installing nload from source](http://blog.linoxide.com/wp-content/uploads/2015/01/nload3.png) + +Now that the installation of nload is finished it is time for you to learn how to use it. + +### How to use nload ### + +I like to explore so type the following command on your terminal. + + nload + +What do you see? + +I get the following. + +![running nload](http://blog.linoxide.com/wp-content/uploads/2015/01/nload4.png) + +As you can see from the above screenshot I get information on: + +### Incoming Traffic ### + +#### Current download speed #### + +![nload running on linux](http://blog.linoxide.com/wp-content/uploads/2015/01/nload4.1.png) + +#### Average download speed #### + +![nload running on linux](http://blog.linoxide.com/wp-content/uploads/2015/01/nload4.2.png) + +#### Minimum download speed #### + +![nload running on linux](http://blog.linoxide.com/wp-content/uploads/2015/01/nload4.3.png) + +#### Maximum download speed #### + +![nload running on linux](http://blog.linoxide.com/wp-content/uploads/2015/01/nload4.4.png) + +#### Total incoming traffic in bytes by default #### + +![](http://blog.linoxide.com/wp-content/uploads/2015/01/nload4.5.png) + +### Outgoing Traffic ### + +The same goes for outgoing traffic. + +#### Some useful options of nload #### + +Use the option + + -u + +to set set the type of unit used for the display of traffic numbers. + +The following command will help you to use the MBit/s unit. + + nload -u m + +The following screenshot shows the result of the above command. + +![nload running on linux](http://blog.linoxide.com/wp-content/uploads/2015/01/nload5.png) + +Try the following command and see the results. + + nload -u g + +![nload running on linux](http://blog.linoxide.com/wp-content/uploads/2015/01/nload6.png) + +There is also the option **-U**. According to the manual pages it is same as the option -u but only for an amount of data. I tested this option and to be honest it very helpful when you want to check the total amount of traffic be it incoming or outgoing. + + nload -U G + +![nload running on linux](http://blog.linoxide.com/wp-content/uploads/2015/01/nload7.png) + +As you can see from the above screenshot the command **nload -U G** helps to display the total amount of data (incoming or outgoing) in Gbyte. + +Another useful option I like to use with nload is the option **-t**. This option is used to refresh interval of display in milliseconds which is 500 by default. + +I like to experiment a little by using the following command. + + nload -t 130 + +So what the above command does is that it sets the display to refresh every 130 milliseconds. It is recommended to no specify refresh intervals shorter than about 100 milliseconds as nload will generate reports with mistakes during the calculations. + +Another option is **-a**. It is used when you want to set the length in seconds of the time window for average calculation which is 300 seconds by default. + +What if you want to monitor a specific network device? It is very easy to do that, just specify the device or the list of devices you want to monitor like shown below. + + nload wlan0 + +![nload monitoring wlan0 on linux](http://blog.linoxide.com/wp-content/uploads/2015/01/nload8.png) + +The following syntax can help to monitor specific multiple devices. + + nload [options] device1 device2 devicen + +For example use the following command to monitor eth0 and wlan0. + + nload wlan0 eth0 + +And if you run the command nload without any option it will monitor all auto-detected devices, you can display graphs for each one of them by using the right and left arrow keys. + +-------------------------------------------------------------------------------- + +via: http://linoxide.com/monitoring-2/monitor-network-usage-nload/ + +作者：[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/ +[1]:http://www.roland-riegel.de/nload/nload-0.7.4.tar.gz \ No newline at end of file From 55f0d498d452142ec6eee955a3e5ff05905c341e Mon Sep 17 00:00:00 2001 From: DeadFire Date: Wed, 21 Jan 2015 16:51:17 +0800 Subject: [PATCH 106/215] =?UTF-8?q?20150121-3=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...t into command line on Ubuntu or Debian.md | 64 +++++++ ...Answers--How to check CPU info on Linux.md | 115 +++++++++++++ ...eck disk space on Linux with df command.md | 157 ++++++++++++++++++ 3 files changed, 336 insertions(+) create mode 100644 sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md create mode 100644 sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md create 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 boot into command line on Ubuntu or Debian.md b/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md new file mode 100644 index 0000000000..606fb655e8 --- /dev/null +++ b/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md @@ -0,0 +1,64 @@ +Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian +================================================================================ +> **Question**: I am running Ubuntu desktop, but I want to boot straight into text-mode console temporarily. What is a convenient way to disable desktop GUI and boot into a terminal? + +Linux desktop comes with a display manager (e.g., GDM, KDM, LightDM), which lets the desktop machine automatically boot into a GUI-based login environment. However, what if you want to disable GUI and boot straight into a text-mode console? For example, you are troubleshooting desktop related issues, or want to run a heavy-duty application that does not require desktop GUI. + +Note that you can temporarily switch from desktop GUI to a virtual console by pressing Ctrl+Alt+F1 to F6. However, in this case your desktop GUI will be still running in the background, and thus is different from pure text-mode booting. + +On Ubuntu or Debian desktop, you can enable text-mode booting by passing appropriate kernel parameters. + +### Boot into Command-line Temporarily ### + +If you want to disable desktop GUI and boot in text-mode just one-time, you can use GRUB menu interface. + +First, power on your desktop. When you see the initial GRUB menu, press 'e'. + +![](https://farm8.staticflickr.com/7490/16112246542_bc1875a397_z.jpg) + +This will lead you to the next screen, where you can modify kernel booting parameters. Scroll down the screen to look for a line that begins with "linux", which indicates a list of kernel parameters. Remove from the list "quiet" and "splash". Add "text" in the list instead. + +![](https://farm8.staticflickr.com/7471/15493282603_8a70f70af2_z.jpg) + +The updated kernel parameter list looks like the following. Press Ctrl+x to continue booting. This will enable one-time console booting in verbose mode. + +![](https://farm8.staticflickr.com/7570/15925676530_b11af59243_z.jpg) + +Boot into Command-line Permanently + +If you want to boot into command-line permanently, you need to [update GRUB configuration][1] which defines kernel booting parameters. + +Open a default GRUB config file with a text editor. + + $ sudo vi /etc/default/grub + +Look for a line that starts with GRUB_CMDLINE_LINUX_DEFAULT, and comment out that line by prepending # sign. This will disable the initial splash screen, and enable verbose mode (i.e., showing the detailed booting procedure). + +Then change GRUB_CMDLINE_LINUX="" to: + + GRUB_CMDLINE_LINUX="text" + +Next, uncomment the line that says "#GRUB_TERMINAL=console". + +The updated GRUB defult configuration looks like the following. + +![](https://farm9.staticflickr.com/8673/16107564442_9345d94491_b.jpg) + +Finally, invoke update-grub command to re-generate a GRUB2 config file under /boot, based on these changes. + + $ sudo update-grub + +At this point, your desktop should be switched from GUI booting to console booting. Verify this by rebooting. + +![](https://farm8.staticflickr.com/7518/16106378151_81ac6b5a49_b.jpg) + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/boot-into-command-line-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://xmodulo.com/add-kernel-boot-parameters-via-grub-linux.html \ No newline at end of file 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 new file mode 100644 index 0000000000..b9a9712a49 --- /dev/null +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check CPU info on Linux.md @@ -0,0 +1,115 @@ +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? + +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. + +### 1. /proc/cpuinfo ### + +The simpliest method is to check /proc/cpuinfo. This virtual file shows the configuration of available CPU hardware. + + $ more /proc/cpuinfo + +![](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. + +### 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 -c 0 + +![](https://farm8.staticflickr.com/7484/16094667926_d979240081_c.jpg) + +### 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 + +![](https://farm9.staticflickr.com/8563/15500753923_6f1b25e8e9_c.jpg) + +### 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. + + $ sudo dmidecode + +![](https://farm8.staticflickr.com/7503/16094667836_825b61d0e5_b.jpg) + +### 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 + +![](https://farm8.staticflickr.com/7482/15933041268_40ccc17407_b.jpg) + +### 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. + + $ sudo i7z + +![](https://farm8.staticflickr.com/7546/15534687744_1968dc2b18_c.jpg) + +### 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). + +![](https://farm8.staticflickr.com/7511/15934711707_5dc0793599_b.jpg) + +### 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 + +![](https://farm8.staticflickr.com/7501/15933173470_69e53b3021_b.jpg) + +### 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. + + $ sudo lshw -class processor + +![](https://farm9.staticflickr.com/8649/15498132484_a47c4e8cb3_c.jpg) + +### 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 + +![](https://farm8.staticflickr.com/7490/15934399829_4012213734_z.jpg) + +### 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. + + $ numactl --hardware + +![](https://farm8.staticflickr.com/7553/16094667876_9d7daa77a1_b.jpg) + +### 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 --all + +![](https://farm8.staticflickr.com/7522/16131238626_d8a703c060_c.jpg) + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/check-cpu-info-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/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 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 new file mode 100644 index 0000000000..5f58df570b --- /dev/null +++ b/sources/tech/20150121 Linux FAQs with Answers--How to check disk space on Linux with df command.md @@ -0,0 +1,157 @@ +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? + +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 \ No newline at end of file From d91316c19c6668b82cfabf9f89e4ad07c7193202 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Wed, 21 Jan 2015 18:09:27 +0800 Subject: [PATCH 107/215] translated 20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md --- ... And Persistent Xubuntu Linux USB Drive.md | 174 ++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 translated/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md diff --git a/translated/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md b/translated/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md new file mode 100644 index 0000000000..8025e91aa1 --- /dev/null +++ b/translated/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md @@ -0,0 +1,174 @@ +3种创建轻量、持久化的Xubuntu Linux USB系统盘的方法 +================================================================================ + +### 使用Universal USB Install创建持久化USB Xubuntu系统盘 ### + +![](http://f.tqn.com/y/linux/1/S/2/J/1/xubuntudesktop.png) + +这个教程为你介绍如何使用Xubuntu Linux创建一个轻量并且[持久化][1]的Linux USB系统盘。 + +> 译者注：持久化Linux USB系统盘（Persistent Linux USB drive），安装在优盘的Linux系统，允许用户保存数据到优盘而不是仅仅将这些修改留在内存中。这些数据可以在重启后恢复并且重新使用，甚至是在其他的机器上面启动也没有关系。一般情况下，持久化系统盘会安装一个压缩过的Linux操作系统。 + +为什么你需要做这些事情呢，这里有5个很好的理由： + +1. 你想要在你的电脑上安装一个轻量的并且功能完善的Linux版本。 +2. 你的电脑没有硬盘，那么一个Linux USB系统盘就可以让这台电脑摆脱被扔到垃圾堆的命运。 +3. 你想体验一下Linux，但是你却不想花太多的时间去准备。 +4. 你想创建一个USB系统恢复盘，并且在优盘上安装一些特定的应用程序。 +5. 你想要一个可以装在屁股口袋或者可以挂在钥匙圈上面的可定制的Linux版本。 + +现在，我们有了充足的理由，那么开始做一些准备工作吧。 + +如果你使用的是Windows： + +1. 下载Xubuntu。 +2. 下载Universal USB Installer。 +3. 插入一个空的优盘。 +4. 使用Universal USB Installer创建一个常驻系统启动盘。 + +如果你使用的是Ubuntu： + +1. 下载Xubuntu。 +2. 使用Ubuntu Startup Creator。 + +如果你使用的是其他版本的Linux： + +1. 下载Xubuntu。 +2. 使用UNetbootin。 + +还有一些场景，可能需要使用命令行，会更难一些，但是上面列的三种应该已经可以满足大部分的情况。 + +### 下载Xubuntu和Universal USB Installer ### + +![](http://f.tqn.com/y/linux/1/S/G/J/1/xubuntuwebsite.JPG) + +访问[Xubuntu网站][2]，然后选一个你喜欢的版本下载。 + +目前有两个版本可供使用： + +- [Trusty Tahr (14.04 LTS)][3] +- [Utopic Unicorn (14.10)][4] + +14.04版是一个长期维护的版本，维护周期会持续3年。14.10是最新版本，但是只提供9个月的维护。 + +你选择了下载站点以后，会提示你选择32位版本或者64位版本。如果你的电脑是32位，就选32位版本，同样，如果你的电脑是64位选64位版本就行了。 + +[点击这里，有一个教程来教你辨别你的电脑是32位还是64位][5]。 + +可以从[Pendrive Linux网站][6]下载Universal USB Installer，点击download链接，过一会下载页面就会弹出来了。 + +### 使用Universal USB Installer创建一个Xubuntu启动优盘 ### + +![](http://f.tqn.com/y/linux/1/S/-/J/1/uui1l.JPG) + +下载完Universal USB Installer和Xubuntu以后，运行Universal USB Installer，出现安全警告时，点击“Accept”。 + +Universal USB Installer用来创建一个持久化的Xubuntu启动优盘。 + +第一屏是许可协议。点击“I Agree”继续。 + +![](http://f.tqn.com/y/linux/1/S/0/J/1/uui2l.JPG) + +Universal USB Installer主界面出现以后，从下拉列表中选择你想要的配置（i.e Xubuntu），第二步，点击“Browse”选择你下载的ISO文件的路径。 + +在电脑上插入一个空的优盘，然后选中“Showing all drives”复选框。 + +在下拉列表中选中你的优盘（一定要确定选的是正确的盘符哦）。如果优盘不是空的，选中格式化复选框。 + +> 注：格式化优盘会清除优盘上的所有数据，首先一定要确认是否以及备份过相关的数据。 + +在第四步中选择用于保存“持久化”系统数据的存储空间大小。 + +点击“Create”按钮继续。 + +![](http://f.tqn.com/y/linux/1/S/1/J/1/uu3l.JPG) + +最后一个界面提示你如果点击“Yes”，那么将会直接应用你的配置。 + +这是停止安装的最后一个机会，一定要确定你选了正确的优盘盘符，并且优盘上没有需要备份的其他文件。 + +点击“Yes”，然后耐心等待优盘创建完成。 + +> 注：创建持久化保存空间会花费一些时间，并且这时候进度条不会继续滚动。 + +这个过程完成以后，重启电脑，如果从优盘启动，就会加载Xubuntu。 + +### 使用Ubuntu的Startup Disk Creator创建Xubuntu启动优盘 ### + +![](http://f.tqn.com/y/linux/1/S/H/J/1/ubuntustartupdiskcreator.png) + +如果你已经安装了Ubuntu，那么创建持久化USB Xubuntu系统盘的最简单的办法就是使用Startup Disk Creator。 + +按下超级键（Windows键），打开Dash，搜索“Startup Disk Creator”，图标出现以后点击它。 + +如果你对Ubuntu Dash不太熟悉，你可以[点击这里，查看一个完整的教程][7]。 + +Startup Disk Creator使用起来很简单。 + +界面被划分成两个部分。在上面部分指定下载的系统盘路径，在下面指定安装的优盘。 + +首先，点击“Other”按钮，第二步，选择你所下载的Xubuntu ISO文件。 + +然后插入优盘，点击“Erase”按钮清除优盘数据。 + +> 注：点击“Erase”会删除优盘中所有的数据，记得先备份数据。 + +选中“Stored in reserved extra sapce”单选按钮，然后拖动“How much”来确定你想要用来存储“持久化”数据的空间。 + +点击“Make Startup Disk”。 + +你创建的过程中，你可能需要输入几次你的系统密码，USB系统盘创建完成以后，你就可以使用它启动到Xubuntu了。 + +### 使用UNetbootin创建持久化Xubuntu系统盘 ### + +![](http://f.tqn.com/y/linux/1/S/I/J/1/unetbootin1.png) + +我要介绍的最后一个工具是UNetbootin，这个工具在Windows和Linux上都可以使用。 + +个人来说，在Windows系统上面我喜欢用Universal USB Installer，但Linux的话，UNetbootin更合适一些。 + +> 注：UNetbootin并不是100%完美的，它并不支持所有的Linux发行版。 + +Windows平台可以点击[这里][8]下载UNetbootin。 + +Linux平台可以使用package manager安装UNetbootin。 + +确认你的优盘已经连接到电脑上，确认优盘已经格式化，并且在优盘上没有其他的数据。 + +在Windows平台上运行UNetbootin只需要双击可执行程序即可，在Linux运行的话则需要提升权限。 + +在Linux上如何运行取决于你使用的是何种桌面环境以及Linux发行版。从命令行运行的话，输入下列命令： + +> sudo unetbootin + +UNetbootin的界面分为两个部分。你可以在上面的部分选择一个Linux发行版，然后下载它，如果已经下载了某个发行版，可以在下半部分选择已经下载的系统盘。 + +点击“Diskimage”单选框，然后点击三个点的按钮。找到已经下载的Xubuntu ISO文件。路径会显示到按钮旁边的文本框里面。 + +修改“Space used to preserve files across reboots”的值，来指定你想要用来存储“持久化”数据的空间大小。 + +类型选择USB drive，然后选择优盘的盘符。 + +点击“OK”来创建一个持久化Xubuntu启动优盘。 + +创建的过程要花一些时间，创建完成以后，你就可以通过优盘启动到Xubuntu系统了。 + +如果你想要创建一个支持UEFI的Xubuntu启动优盘，[照着这个教程来做][8]，只需要把Ubuntu ISO替换为Xubuntu ISO就可以了。 + +via : http://linux.about.com/od/howtos/ss/How-To-Create-A-Persistent-Bootable-Xubuntu-Linux-USB-Drive.htm + +作者：[Gary Newell][a] +译者：[zhouj-sh](https://github.com/Zhouj-sh) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://linux.about.com/bio/Gary-Newell-132058.htm +[1]:http://www.pendrivelinux.com/what-is-persistent-linux/ +[2]:http://xubuntu.org/getxubuntu/ +[3]:http://www.dedoimedo.com/computers/xubuntu-trusty.html +[4]:http://www.dedoimedo.com/computers/xubuntu-utopic.html +[5]:http://pcsupport.about.com/od/fixtheproblem/f/32-bit-64-bit-windows.htm +[6]:http://www.pendrivelinux.com/universal-usb-installer-easy-as-1-2-3/ +[7]:http://linux.about.com/od/howtos/fl/Learn-Ubuntu-The-Unity-Dash.htm +[8]:http://linux.about.com/od/howtos/ss/How-To-Create-A-UEFI-Bootable-Ubuntu-USB-Drive-Using-Windows.htm \ No newline at end of file From 19aa9bc619e1668987695e831f1fd4a99a7903c3 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Wed, 21 Jan 2015 18:10:28 +0800 Subject: [PATCH 108/215] translate complete , delete sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md --- ...tweight And Persistent Xubuntu Linux USB Drive.md | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md diff --git a/sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md b/sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md deleted file mode 100644 index 05f307c9d5..0000000000 --- a/sources/share/20150119 3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive.md +++ /dev/null @@ -1,12 +0,0 @@ -3 Ways To Create A Lightweight And Persistent Xubuntu Linux USB Drive -================================================================================ - -via : http://linux.about.com/od/howtos/ss/How-To-Create-A-Persistent-Bootable-Xubuntu-Linux-USB-Drive.htm - - - -作者：[Gary Newell][a] -译者：[zhouj-sh](https://github.com/Zhouj-sh) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 \ No newline at end of file From a9683a8267858fa2ef06528f500897f3de4a1ea3 Mon Sep 17 00:00:00 2001 From: ZhouJ-sh <32321321@qq.com> Date: Wed, 21 Jan 2015 18:16:51 +0800 Subject: [PATCH 109/215] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md b/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md index 25396e1798..c739b3b702 100644 --- a/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md +++ b/translated/share/20150119 Ubuntu With XFCE vs Xubuntu Linux.md @@ -12,7 +12,7 @@ Ubuntu vs Xubuntu。Ubuntu拥有漂亮的桌面体验以及强大的应用程序 [Ubuntu][1]以及[Xubuntu][2]是针对不同目的开发的操作系统，为什么我会强调这一点，是为了说明什么时候或者为什么你应该使用Ubuntu以及什么时候应该使用Xubuntu。 -比较这两个操作系统就像比较[劳斯莱斯][3]与[保时捷][4]。这两个都是很棒的车，但是如果把劳斯莱斯给一个车迷，他们也许会卖掉它买个其他的车，同样，如果把保时捷给舒格勋爵或者休·海夫纳这类人可能也不那么合适。 +比较这两个操作系统就像比较[劳斯莱斯][3]与[保时捷][4]。这两个都是很棒的车，但是如果把劳斯莱斯给一个赛车迷，他们也许会卖掉它买个其他的车，同样，如果把保时捷给舒格勋爵或者休·海夫纳这类人可能也不那么合适。 Ubuntu拥有一个适用性很强的桌面环境，叫做Unity，并且默认会安装一些很棒的Linux应用程序，包括Rhythmbox以及[LibreOffic][5]。Ubuntu就像是劳斯莱斯。它为舒适而生，并且尽可能的提供从A到B的最时髦的方法。 @@ -28,7 +28,7 @@ Xubuntu就像一个改装过的跑车。你可以把它改装成任何你想要 但是，如果你发现Unity没办法满足你的要求，并且感觉你的计算机在运行Ubuntu时或多或少有一些性能压力，那么当然就可以考虑考虑Xubuntu。 -上周我发了一篇文章介绍怎么创建Xubuntu启动优盘（译者注：翻译ing），并且也写了一篇[安装Xubuntu的教程][b]（译者注：已经完成翻译，链接为github地址）。 +上周我发了一篇文章介绍怎么[创建Xubuntu启动优盘][c]，并且也写了一篇[安装Xubuntu的教程][b]（译者注：链接为github地址）。 不过，如果你已经安装了Ubuntu，就不用这么费事照着教程再来一遍了。你只需要继续读完这篇文章，就可以在Ubuntu里面安装一个更合适的解决方案。 @@ -147,6 +147,7 @@ via : http://linux.about.com/od/dist/fl/Ubuntu-With-XFCE-vs-Xubuntu-Linux.htm [a]:http://linux.about.com/bio/Gary-Newell-132058.htm [b]:https://github.com/ZhouJ-sh/TranslateProject/blob/0c4ad0bc8e79e28c1f7f8ccf805708829baa8ea9/translated/share/20150116%20A%20Step%20By%20Step%20Guide%20To%20Installing%20Xubuntu%20Linux.md +[c]:https://github.com/ZhouJ-sh/TranslateProject/blob/d91316c19c6668b82cfabf9f89e4ad07c7193202/translated/share/20150119%203%20Ways%20To%20Create%20A%20Lightweight%20And%20Persistent%20Xubuntu%20Linux%20USB%20Drive.md [1]:http://www.everydaylinuxuser.com/2014/11/an-everyday-linux-user-review-of-ubuntu.html [2]:http://www.everydaylinuxuser.com/2015/01/an-everyday-linux-user-review-of.html [3]:http://exoticcars.about.com/od/overviewsofmaker1/p/RollsHistory.htm From a2894417c911445cca786083971bc23aaa55706b Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Wed, 21 Jan 2015 18:44:31 +0800 Subject: [PATCH 110/215] =?UTF-8?q?=E9=80=89=E9=A2=98=20If=20a=2032-bit=20?= =?UTF-8?q?integer=20overflows,=20can=20we=20use=20a=2040-bit=20structure?= =?UTF-8?q?=20instead=20of=20a=2064-bit=20long=20one=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20150121 If a 32-bit integer overflows.md | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 sources/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 new file mode 100644 index 0000000000..3cff4cd3b8 --- /dev/null +++ b/sources/talk/20150121 If a 32-bit integer overflows.md @@ -0,0 +1,84 @@ +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). + +FROM:[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) \ No newline at end of file From 3679969319489cd184b9150bf6272c00869fd64f Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Wed, 21 Jan 2015 18:58:45 +0800 Subject: [PATCH 111/215] =?UTF-8?q?=E9=80=89=E9=A2=98=20Did=20this=20JavaS?= =?UTF-8?q?cript=20break=20the=20console=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/talk/20150121 Did this JavaScript break the console.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sources/talk/20150121 Did this JavaScript break the console.md diff --git a/sources/talk/20150121 Did this JavaScript break the console.md b/sources/talk/20150121 Did this JavaScript break the console.md new file mode 100644 index 0000000000..e69de29bb2 From 3f513acb8a34415513fe5db053d8de89ffcbdfba Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Wed, 21 Jan 2015 18:59:46 +0800 Subject: [PATCH 112/215] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...1 Did this JavaScript break the console.md | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/sources/talk/20150121 Did this JavaScript break the console.md b/sources/talk/20150121 Did this JavaScript break the console.md index e69de29bb2..4fede3babd 100644 --- a/sources/talk/20150121 Did this JavaScript break the console.md +++ b/sources/talk/20150121 Did this JavaScript break the console.md @@ -0,0 +1,82 @@ +Did this JavaScript break the console? +--------- + +#Q: + +Just doing some JavaScript stuff in google chrome (don't want to try in other browsers for now, in case this is really doing real damage) and I'm not sure why this seemed to break my console. + +```javascript +>var x = "http://www.foo.bar/q?name=%%this%%"; +x +``` + +After x (and enter) the console stops working... I restarted chrome and now when I do a simple + +```javascript +console.clear(); +``` + +It's giving me + +```javascript +Console was cleared +``` + +And not clearing the console. Now in my scripts console.log's do not register and I'm wondering what is going on. 99% sure it has to do with the double percent signs (%%). + +Anyone know what I did wrong or better yet, how to fix the console? + +[A bug report for this issue has been filed here.](https://code.google.com/p/chromium/issues/detail?id=446975) + +Edit: Feeling pretty dumb, but I had Preserve log checked... That's why the console wasn't clearing. + +#A: + +As discussed in the comments, there are actually many different ways of constructing a string that causes this issue, and it is not necessary for there to be two percent signs in most cases. + +```TXT +http://example.com/% +http://%%% +http://ab% +http://%ab +http://%zz +``` + +However, it's not just the presence of a percent sign that breaks the Chrome console, as when we enter the following well-formed URL, the console continues to work properly and produces a clickable link. + +```TXT +http://ab%20cd +``` + +Additionally, the strings `http://%`, and `http://%%` will also print properly, since Chrome will not auto-link a URL-link string unless the [`http://`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURI) is followed by at least 3 characters. + +From here I hypothesized that the issue must be in the process of linking a URL string in the console, likely in the process of decoding a malformed URL. I remembered that the JavaScript function `decodeURI` will throw an exception if given a malformed URL, and since Chrome's developer tools are largely written in JavaScript, could this be the issue that is evidently crashing the developer console? + +To test this theory, I ran Chrome by the command link, to see if any errors were being logged. + +Indeed, the same error you would see if you ran decodeURI on a malformed URL (i.e. decodeURI('http://example.com/%')) was being printed to the console: + +>[4810:1287:0107/164725:ERROR:CONSOLE(683)] "Uncaught URIError: URI malformed", source: chrome-devtools://devtools/bundled/devtools.js (683) +>So, I opened the URL 'chrome-devtools://devtools/bundled/devtools.js' in Chrome, and on line 683, I found the following. + +```javascript +{var parsedURL=new WebInspector.ParsedURL(decodeURI(url));var origin;var folderPath;var name;if(parsedURL.isValid){origin=parsedURL.scheme+"://"+parsedURL.host;if(parsedURL.port) +``` + +As we can see, `decodeURI(url)` is being called on the URL without any error checking, thus throwing the exception and crashing the developer console. + +A real fix for this issue will come from adding error handling to the Chrome console code, but in the meantime, one way to avoid the issue would be to wrap the string in a complex data type like an array to prevent parsing when logging. + +```javascript +var x = "http://example.com/%"; +console.log([x]); +``` + +Thankfully, the broken console issue does not persist once the tab is closed, and will not affect other tabs. + +###Update: + +Apparently, the issue can persist across tabs and restarts if Preserve Log is checked. Uncheck this if you are having this issue. + +FROM:[stackoverflow](http://stackoverflow.com/questions/27828804/did-this-javascript-break-the-console/27830948#27830948) \ No newline at end of file From 489b22badd6f189969741b530d99e3d9bb807ad9 Mon Sep 17 00:00:00 2001 From: Tao Meng Date: Wed, 21 Jan 2015 19:50:56 +0800 Subject: [PATCH 113/215] 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 --- ...nswers--How to check disk space on Linux with df command.md | 3 ++- 1 file changed, 2 insertions(+), 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 5f58df570b..ef10342238 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,3 +1,4 @@ +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? @@ -154,4 +155,4 @@ via: http://ask.xmodulo.com/check-disk-space-linux-df-command.html 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 -[1]:http://xmodulo.com/visualize-disk-usage-linux.html \ No newline at end of file +[1]:http://xmodulo.com/visualize-disk-usage-linux.html From 4885bae1f7c284ec27cdbfbc827b44b9214b20bd Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Wed, 21 Jan 2015 20:03:31 +0800 Subject: [PATCH 114/215] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...121 Did this JavaScript break the console.md | 17 +++++++++++++---- .../20150121 If a 32-bit integer overflows.md | 13 ++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/sources/talk/20150121 Did this JavaScript break the console.md b/sources/talk/20150121 Did this JavaScript break the console.md index 4fede3babd..72aff246d5 100644 --- a/sources/talk/20150121 Did this JavaScript break the console.md +++ b/sources/talk/20150121 Did this JavaScript break the console.md @@ -27,8 +27,7 @@ And not clearing the console. Now in my scripts console.log's do not register an Anyone know what I did wrong or better yet, how to fix the console? -[A bug report for this issue has been filed here.](https://code.google.com/p/chromium/issues/detail?id=446975) - +[A bug report for this issue has been filed here.][1] Edit: Feeling pretty dumb, but I had Preserve log checked... That's why the console wasn't clearing. #A: @@ -49,7 +48,7 @@ However, it's not just the presence of a percent sign that breaks the Chrome con http://ab%20cd ``` -Additionally, the strings `http://%`, and `http://%%` will also print properly, since Chrome will not auto-link a URL-link string unless the [`http://`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURI) is followed by at least 3 characters. +Additionally, the strings `http://%`, and `http://%%` will also print properly, since Chrome will not auto-link a URL-link string unless the [`http://`][2] is followed by at least 3 characters. From here I hypothesized that the issue must be in the process of linking a URL string in the console, likely in the process of decoding a malformed URL. I remembered that the JavaScript function `decodeURI` will throw an exception if given a malformed URL, and since Chrome's developer tools are largely written in JavaScript, could this be the issue that is evidently crashing the developer console? @@ -79,4 +78,14 @@ Thankfully, the broken console issue does not persist once the tab is closed, an Apparently, the issue can persist across tabs and restarts if Preserve Log is checked. Uncheck this if you are having this issue. -FROM:[stackoverflow](http://stackoverflow.com/questions/27828804/did-this-javascript-break-the-console/27830948#27830948) \ No newline at end of file +via:[stackoverflow](http://stackoverflow.com/questions/27828804/did-this-javascript-break-the-console/27830948#27830948) + +作者：[Alexander O'Mara][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/3155639/alexander-omara) +[1:](https://code.google.com/p/chromium/issues/detail?id=446975) +[2:](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURI) \ No newline at end of file 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 3cff4cd3b8..e517b12d03 100644 --- a/sources/talk/20150121 If a 32-bit integer overflows.md +++ b/sources/talk/20150121 If a 32-bit integer overflows.md @@ -81,4 +81,15 @@ What one can see is that the extra overhead of bitfields is neglegible, but the 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). -FROM:[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) \ No newline at end of file +------ + +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 From 1c9a86bf197214b3b0fb9ec92e811b4a59d9a557 Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Wed, 21 Jan 2015 20:03:31 +0800 Subject: [PATCH 115/215] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...121 Did this JavaScript break the console.md | 17 +++++++++++++---- .../20150121 If a 32-bit integer overflows.md | 13 ++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/sources/talk/20150121 Did this JavaScript break the console.md b/sources/talk/20150121 Did this JavaScript break the console.md index 4fede3babd..aab924ab33 100644 --- a/sources/talk/20150121 Did this JavaScript break the console.md +++ b/sources/talk/20150121 Did this JavaScript break the console.md @@ -27,8 +27,7 @@ And not clearing the console. Now in my scripts console.log's do not register an Anyone know what I did wrong or better yet, how to fix the console? -[A bug report for this issue has been filed here.](https://code.google.com/p/chromium/issues/detail?id=446975) - +[A bug report for this issue has been filed here.][1] Edit: Feeling pretty dumb, but I had Preserve log checked... That's why the console wasn't clearing. #A: @@ -49,7 +48,7 @@ However, it's not just the presence of a percent sign that breaks the Chrome con http://ab%20cd ``` -Additionally, the strings `http://%`, and `http://%%` will also print properly, since Chrome will not auto-link a URL-link string unless the [`http://`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURI) is followed by at least 3 characters. +Additionally, the strings `http://%`, and `http://%%` will also print properly, since Chrome will not auto-link a URL-link string unless the [`http://`][2] is followed by at least 3 characters. From here I hypothesized that the issue must be in the process of linking a URL string in the console, likely in the process of decoding a malformed URL. I remembered that the JavaScript function `decodeURI` will throw an exception if given a malformed URL, and since Chrome's developer tools are largely written in JavaScript, could this be the issue that is evidently crashing the developer console? @@ -79,4 +78,14 @@ Thankfully, the broken console issue does not persist once the tab is closed, an Apparently, the issue can persist across tabs and restarts if Preserve Log is checked. Uncheck this if you are having this issue. -FROM:[stackoverflow](http://stackoverflow.com/questions/27828804/did-this-javascript-break-the-console/27830948#27830948) \ No newline at end of file +via:[stackoverflow](http://stackoverflow.com/questions/27828804/did-this-javascript-break-the-console/27830948#27830948) + +作者：[Alexander O'Mara][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/3155639/alexander-omara +[1]:https://code.google.com/p/chromium/issues/detail?id=446975 +[2]:https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURI \ No newline at end of file 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 3cff4cd3b8..bf7c447f25 100644 --- a/sources/talk/20150121 If a 32-bit integer overflows.md +++ b/sources/talk/20150121 If a 32-bit integer overflows.md @@ -81,4 +81,15 @@ What one can see is that the extra overhead of bitfields is neglegible, but the 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). -FROM:[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) \ No newline at end of file +------ + +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 From 3469c614d6bf530b78f812acaefbf52c34b6ec92 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Wed, 21 Jan 2015 20:37:30 +0800 Subject: [PATCH 116/215] translating --- ...nswers--How to boot into command line on Ubuntu or Debian.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md b/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md index 606fb655e8..642f2142e6 100644 --- a/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md +++ b/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md @@ -1,3 +1,5 @@ +Translating----geekpi + Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian ================================================================================ > **Question**: I am running Ubuntu desktop, but I want to boot straight into text-mode console temporarily. What is a convenient way to disable desktop GUI and boot into a terminal? From 82545984d3934ade4d1d5c7faa0bf35e0e9c7415 Mon Sep 17 00:00:00 2001 From: Medusar <939958749@qq.com> Date: Wed, 21 Jan 2015 21:15:58 +0800 Subject: [PATCH 117/215] Update 20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md start translating --- ... To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md b/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md index 901dcd951c..4dfa716ed5 100644 --- a/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md +++ b/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md @@ -1,3 +1,5 @@ +Medusar translating + How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps ================================================================================ ### Introduction ### @@ -177,4 +179,4 @@ via: http://www.everydaylinuxuser.com/2015/01/how-to-recover-windows-7-and-delet 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 [1]:http://linux.about.com/od/LinuxNewbieDesktopGuide/ss/Create-A-Recovery-Drive-For-All-Versions-Of-Windows.htm -[2]:http://www.amazon.co.uk/gp/product/B0006L2HTK/ref=as_li_qf_sp_asin_il_tl?ie=UTF8&camp=1634&creative=6738&creativeASIN=B0006L2HTK&linkCode=as2&tag=evelinuse-21&linkId=3R363EA63XB4Z3IL \ No newline at end of file +[2]:http://www.amazon.co.uk/gp/product/B0006L2HTK/ref=as_li_qf_sp_asin_il_tl?ie=UTF8&camp=1634&creative=6738&creativeASIN=B0006L2HTK&linkCode=as2&tag=evelinuse-21&linkId=3R363EA63XB4Z3IL From f8f56a5a5be134027114a52d07053e4c52e3153a Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Wed, 21 Jan 2015 21:25:40 +0800 Subject: [PATCH 118/215] translated --- ...t into command line on Ubuntu or Debian.md | 66 ------------------- ...t into command line on Ubuntu or Debian.md | 64 ++++++++++++++++++ 2 files changed, 64 insertions(+), 66 deletions(-) delete mode 100644 sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md create mode 100644 translated/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md diff --git a/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md b/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md deleted file mode 100644 index 642f2142e6..0000000000 --- a/sources/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md +++ /dev/null @@ -1,66 +0,0 @@ -Translating----geekpi - -Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian -================================================================================ -> **Question**: I am running Ubuntu desktop, but I want to boot straight into text-mode console temporarily. What is a convenient way to disable desktop GUI and boot into a terminal? - -Linux desktop comes with a display manager (e.g., GDM, KDM, LightDM), which lets the desktop machine automatically boot into a GUI-based login environment. However, what if you want to disable GUI and boot straight into a text-mode console? For example, you are troubleshooting desktop related issues, or want to run a heavy-duty application that does not require desktop GUI. - -Note that you can temporarily switch from desktop GUI to a virtual console by pressing Ctrl+Alt+F1 to F6. However, in this case your desktop GUI will be still running in the background, and thus is different from pure text-mode booting. - -On Ubuntu or Debian desktop, you can enable text-mode booting by passing appropriate kernel parameters. - -### Boot into Command-line Temporarily ### - -If you want to disable desktop GUI and boot in text-mode just one-time, you can use GRUB menu interface. - -First, power on your desktop. When you see the initial GRUB menu, press 'e'. - -![](https://farm8.staticflickr.com/7490/16112246542_bc1875a397_z.jpg) - -This will lead you to the next screen, where you can modify kernel booting parameters. Scroll down the screen to look for a line that begins with "linux", which indicates a list of kernel parameters. Remove from the list "quiet" and "splash". Add "text" in the list instead. - -![](https://farm8.staticflickr.com/7471/15493282603_8a70f70af2_z.jpg) - -The updated kernel parameter list looks like the following. Press Ctrl+x to continue booting. This will enable one-time console booting in verbose mode. - -![](https://farm8.staticflickr.com/7570/15925676530_b11af59243_z.jpg) - -Boot into Command-line Permanently - -If you want to boot into command-line permanently, you need to [update GRUB configuration][1] which defines kernel booting parameters. - -Open a default GRUB config file with a text editor. - - $ sudo vi /etc/default/grub - -Look for a line that starts with GRUB_CMDLINE_LINUX_DEFAULT, and comment out that line by prepending # sign. This will disable the initial splash screen, and enable verbose mode (i.e., showing the detailed booting procedure). - -Then change GRUB_CMDLINE_LINUX="" to: - - GRUB_CMDLINE_LINUX="text" - -Next, uncomment the line that says "#GRUB_TERMINAL=console". - -The updated GRUB defult configuration looks like the following. - -![](https://farm9.staticflickr.com/8673/16107564442_9345d94491_b.jpg) - -Finally, invoke update-grub command to re-generate a GRUB2 config file under /boot, based on these changes. - - $ sudo update-grub - -At this point, your desktop should be switched from GUI booting to console booting. Verify this by rebooting. - -![](https://farm8.staticflickr.com/7518/16106378151_81ac6b5a49_b.jpg) - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/boot-into-command-line-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://xmodulo.com/add-kernel-boot-parameters-via-grub-linux.html \ No newline at end of file diff --git a/translated/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md b/translated/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md new file mode 100644 index 0000000000..64cb1b36e0 --- /dev/null +++ b/translated/tech/20150121 Linux FAQs with Answers--How to boot into command line on Ubuntu or Debian.md @@ -0,0 +1,64 @@ +Linux 有问必答：如何在Ubuntu或者Debian中启动进入命令行 +================================================================================ +> **提问**：我运行的是Ubuntu桌面，但是我希望启动后临时进入命令行。有什么简便的方法可以启动进入终端？ + +Linux桌面自带了一个显示管理器（比如：GDM、KDM、LightDM），它们可以让计算机启动自动进入一个基于GUI的登录环境。然而，如果你要直接启动进入终端怎么办？ 比如，你在排查桌面相关的问题或者想要运行一个不需要GUI的发行程序。 + +注意你可以通过按下Ctrl+Alt+F1到F6临时从桌面GUI切换到虚拟终端。然而，在本例中你的桌面GUI仍在后台运行，这不同于纯文本模式启动。 + +在Ubuntu或者Debian桌面中，你可以通过传递合适的内核参数在启动时启动文本模式。 + +### 启动临时进入命令行 ### + +如果你想要禁止桌面GUI并只有一次进入文本模式，你可以使用GRUB菜单。 + +首先，打开你的电脑。当你看到初始的GRUB菜单时，按下‘e’。 + +![](https://farm8.staticflickr.com/7490/16112246542_bc1875a397_z.jpg) + +接着会进入下一屏，这里你可以修改内核启动选项。向下滚动到以“linux”开始的行，这里就是内核参数的列表。删除列表中的“quiet”和“splash”。在列表中添加“text”。 + +![](https://farm8.staticflickr.com/7471/15493282603_8a70f70af2_z.jpg) + +升级的内核选项列表看上去像这样。按下Ctrl+x继续启动。这会一次性以详细模式启动控制台。 + +![](https://farm8.staticflickr.com/7570/15925676530_b11af59243_z.jpg) + +永久启动进入命令行。 + +如果你想要永久启动进入命令行，你需要[更新定义了内核启动参数GRUB设置][1]。 + +在文本编辑器中打开默认的GRUB配置文件。 + + $ sudo vi /etc/default/grub + +查找以GRUB_CMDLINE_LINUX_DEFAULT开头的行，并用“#”注释这行。这会禁止初始屏幕，而启动详细模式（也就是说显示详细的的启动过程）。 + +更改GRUB_CMDLINE_LINUX="" 成： + + GRUB_CMDLINE_LINUX="text" + +接下来取消“#GRUB_TERMINAL=console”的注释。 + +更新后的GRUB配置看上去像下面这样。 + +![](https://farm9.staticflickr.com/8673/16107564442_9345d94491_b.jpg) + +最后，使用update-grub命令来基于这些更改重新生成/boot下的GRUB2配置文件。 + + $ sudo update-grub + +这时，你的桌面应该从GUI启动切换到控制台启动了。可以通过重启验证。 + +![](https://farm8.staticflickr.com/7518/16106378151_81ac6b5a49_b.jpg) + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/boot-into-command-line-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://xmodulo.com/add-kernel-boot-parameters-via-grub-linux.html \ No newline at end of file From 785f7b7adeb375545dbbdc1232d02cc5ab9820af Mon Sep 17 00:00:00 2001 From: mtunique Date: Wed, 21 Jan 2015 22:26:43 +0800 Subject: [PATCH 119/215] 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 287baade1a07d54bcc2fdcc13af8666331fb9782 Mon Sep 17 00:00:00 2001 From: Medusar <939958749@qq.com> Date: Wed, 21 Jan 2015 23:29:30 +0800 Subject: [PATCH 120/215] Delete 20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md --- ...ows 7 And Delete Ubuntu In 3 Easy Steps.md | 182 ------------------ 1 file changed, 182 deletions(-) delete mode 100644 sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md diff --git a/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md b/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md deleted file mode 100644 index 4dfa716ed5..0000000000 --- a/sources/tech/20150114 How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md +++ /dev/null @@ -1,182 +0,0 @@ -Medusar translating - -How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps -================================================================================ -### Introduction ### - -This is a strange article for me to write as I am normally in a position where I would advocate installing Ubuntu and getting rid of Windows. - -What makes writing this article today doubly strange is that I am choosing to write it on the day that Windows 7 mainstream support comes to an end. - -So why am I writing this now? - -I have been asked on so many occasions now how to remove Ubuntu from a dual booting Windows 7 or a dual booting Windows 8 system and it just makes sense to write the article. - -I spent the Christmas period looking through the comments that people have left on articles and it is time to write the posts that are missing and update some of those that have become old and need attention. - -I am going to spend the rest of January doing just that. This is the first step. If you have Windows 7 dual booting with Ubuntu and you want Windows 7 back without restoring to factory settings follow this guide. (Note there is a separate guide required for Windows 8) - -### The Steps Required To Remove Ubuntu ### - -1. Remove Grub By Fixing The Windows Boot Record -1. Delete The Ubuntu Partitions -1. Expand The Windows Partition - -### Back Up Your System ### - -Before you begin I recommend taking a backup of your system. - -I also recommend not leaving this to chance nor Microsoft's own tools. - -[Click here for a guide showing how to backup your drive using Macrium Reflect.][1] - -If you have any data you wish to save within Ubuntu log into it now and back up the data to external hard drives, USB drives or DVDs. - -### Step 1 - Remove The Grub Boot Menu ### - -![](http://1.bp.blogspot.com/-arVqwMLpJRQ/VLWbHWkqYsI/AAAAAAAAHmw/kn3jDPOltX4/s1600/grubmenu.jpg) - -When you boot your system you will see a menu similar to the one in the image. - -To remove this menu and boot straight into Windows you have to fix the master boot record. - -To do this I am going to show you how to create a system recovery disk, how to boot to the recovery disk and how to fix the master boot record. - -![](http://2.bp.blogspot.com/-ML2JnNc8OWY/VLWcAovwGNI/AAAAAAAAHm4/KH778_MkU7U/s1600/recoverywindow1.PNG) - -Press the "Start" button and search for "backup and restore". Click the icon that appears. - -A window should open as shown in the image above. - -Click on "Create a system repair disc". - -You will need a [blank DVD][2]. - -![](http://2.bp.blogspot.com/-r0GUDZ4AAMI/VLWfJ0nuJLI/AAAAAAAAHnE/RloNqdXLLcY/s1600/recoverywindow2.PNG) - -Insert the blank DVD in the drive and select your DVD drive from the dropdown list. - -Click "Create Disc". - -Restart your computer leaving the disk in and when the message appears to boot from CD press "Enter" on the keyboard. - -![](http://2.bp.blogspot.com/-VPSD50bmk2E/VLWftBg7HxI/AAAAAAAAHnM/APVzvPg4rC0/s1600/recoveryoptionschooselanguage.jpg) - -A set of "Systems Recovery Options" screens will appear. - -You will be asked to choose your keyboard layout. - -Choose the appropriate options from the lists provided and click "Next". - -![](http://2.bp.blogspot.com/-klK4SihPv0E/VLWgLiPO1mI/AAAAAAAAHnU/DUgxH6N2SFE/s1600/RecoveryOptions.jpg) - -The next screen lets you choose an operating system to attempt to fix. - -Alternatively you can restore your computer using a system image saved earlier. - -Leave the top option checked and click "Next". - -![](http://2.bp.blogspot.com/-WOk-Unm6cCQ/VLWgvzoBgzI/AAAAAAAAHng/vfxm1jhW1Ms/s1600/RecoveryOptions2.jpg) - -You will now see a screen with options to repair your disk and restore your system etc. - -All you need to do is fix the master boot record and this can be done from the command prompt. - -Click "Command Prompt". - -![](http://4.bp.blogspot.com/-duT-EUC0yuo/VLWhHygCApI/AAAAAAAAHno/bO7UlouyR9M/s1600/FixMBR.jpg) - -Now simply type the following command into the command prompt: - - bootrec.exe /fixmbr - -A message will appear stating that the operation has completed successfully. - -You can now close the command prompt window. - -Click the "Restart" button and remove the DVD. - -Your computer should boot straight into Windows 7. - -### Step 2 - Delete The Ubuntu Partitions ### - -![](http://4.bp.blogspot.com/-1OM0b3qBeHk/VLWh89gtgVI/AAAAAAAAHn0/ECHIARNCRp8/s1600/diskmanagement1.PNG) - -To delete Ubuntu you need to use the "Disk Management" tool from within Windows. - -Press "Start" and type "Create and format hard disk partitions" into the search box. A window will appear similar to the image above. - -Now my screen above isn't going to be quite the same as yours but it won't be much different. If you look at disk 0 there is 101 MB of unallocated space and then 4 partitions. - -The 101 MB of space is a mistake I made when installing Windows 7 in the first place. The C: drive is Windows 7, the next partition (46.57 GB) is Ubuntu's root partition. The 287 GB partition is the /HOME partition and the 8 GB partition is the SWAP space. - -The only one we really need for Windows is the C: drive so the rest can be deleted. - -**Note: Be careful. You may have recovery partitions on the disk. Do not delete the recovery partitions. They should be labelled and will have file systems set to NTFS or FAT32** - -![](http://3.bp.blogspot.com/-8YUE2p5Fj8Q/VLWlHXst6JI/AAAAAAAAHoQ/BJC57d9Nilg/s1600/deletevolume.png) - -Right click on one of the partitions you wish to delete (i.e. the root, home and swap partitions) and from the menu click "Delete Volume". - -**(Do not delete any partitions that have a file system of NTFS or FAT32)** - -Repeat this process for the other two partitions. - -![](http://3.bp.blogspot.com/-IGbJLkc_soY/VLWk1Vh0XAI/AAAAAAAAHoA/v7TVFT0rC0E/s1600/diskmanagement2.PNG) - -After the partitions have been deleted you will have a large area of free space. Right click the free space and choose delete. - -![](http://4.bp.blogspot.com/-2xUBkWHpnC4/VLWk9cYXGZI/AAAAAAAAHoI/8F2ANkorGeM/s1600/diskmanagement3.PNG) - -Your disk will now contain your C drive and a large amount of unallocated space. - -### Step 3 - Expand The Windows Partition ### - -![](http://4.bp.blogspot.com/-pLV5L3CvQ1Y/VLWmh-5SKTI/AAAAAAAAHoc/7sJzITyvduo/s1600/diskmanagement4.png) - -The final step is to expand Windows so that it is one large partition again. - -To do this right click on the Windows partition (C: drive) and choose "Extend Volume". - -![](http://1.bp.blogspot.com/-vgmw_N2WZWw/VLWm7i5oSxI/AAAAAAAAHok/k0q_gnIik9A/s1600/extendvolume1.PNG) - -When the Window to the left appears click "Next", - -![](http://3.bp.blogspot.com/-WLA86V-Au8g/VLWnTq5RpAI/AAAAAAAAHos/6vzjLNkrwRQ/s1600/extendvolume2.PNG) - -The next screen shows a wizard whereby you can select the disks to expand to and change the size to expand to. - -By default the wizard shows the maximum amount of disk space it can claim from unallocated space. - -Accept the defaults and click "Next". - -![](http://4.bp.blogspot.com/-1rhTJvwem0k/VLWnvx7fWFI/AAAAAAAAHo0/D-4HA8E8y2c/s1600/extendvolume3.PNG) - -The final screen shows the settings that you chose from the previous screen. - -Click "Finish" to expand the disk. - -![](http://2.bp.blogspot.com/-CpuLXSYyPKY/VLWoEGU3sCI/AAAAAAAAHo8/7o5G4W4b7zU/s1600/diskmanagement5.PNG) - -As you can see from the image above my Windows partition now takes up the entire disk (except for the 101 MB that I accidentally created before installing Windows in the first place). - -### Summary ### - -![](http://1.bp.blogspot.com/-h1Flo2aGFcI/VLWogr2zfMI/AAAAAAAAHpE/2ypTSgR8_iM/s1600/fullwindowsscreen.PNG) - -That is all folks. A site dedicated to Linux has just shown you how to remove Linux and replace it with Windows 7. - -Any questions? Use the comments section below. - --------------------------------------------------------------------------------- - -via: http://www.everydaylinuxuser.com/2015/01/how-to-recover-windows-7-and-delete.html - -作者：Gary Newell -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://linux.about.com/od/LinuxNewbieDesktopGuide/ss/Create-A-Recovery-Drive-For-All-Versions-Of-Windows.htm -[2]:http://www.amazon.co.uk/gp/product/B0006L2HTK/ref=as_li_qf_sp_asin_il_tl?ie=UTF8&camp=1634&creative=6738&creativeASIN=B0006L2HTK&linkCode=as2&tag=evelinuse-21&linkId=3R363EA63XB4Z3IL From 933c579852d81f20024416a4047a179ccbe3a148 Mon Sep 17 00:00:00 2001 From: Medusar <939958749@qq.com> Date: Wed, 21 Jan 2015 23:36:16 +0800 Subject: [PATCH 121/215] Create How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps --- ...indows 7 And Delete Ubuntu In 3 Easy Steps | 181 ++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 translated/tech/How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps diff --git a/translated/tech/How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps b/translated/tech/How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps new file mode 100644 index 0000000000..9278bbd707 --- /dev/null +++ b/translated/tech/How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps @@ -0,0 +1,181 @@ +如何通过简单的3步恢复Windows7同时删除Ubuntu +================================================================================ +### 说明 ### + +写这篇文章对我来说是一件奇怪的事情，因为我通常都是提倡安装Ubuntu而卸载Windows的。 + +让今天写这篇文章更加奇怪的是，我决定在微软决定终止对Windows7的主流支持的这一天来写。 + +那么为什么我现在要写这篇文章呢？ + +到目前为止我曾经在很多场合被问到如何从一个装有Windows7或Windows8的双系统中删除Unbuntu系统，因此写这篇文章就变得有意义了。 + +我在圣诞节期间浏览了人们在我文章中的留言，感觉是时候把缺失的文章写完同时更新一下那些比较老的又需要关注的文章了。 + +我打算把一月份剩下的时间都用在这上面。这是第一步。如果你的电脑上安装了Windown7和Ubuntu双系统，同时你不想通过恢复出厂设置的方式恢复Windows7系统，那么请参考该教程。(注意：对于Windows8系统，有一个独立的教程) + +### 删除Ubuntu系统需要的步骤 ### + +1. 通过修复Windows启动项来删除Grub +1. 删除Ubuntu系统所在分区 +1. 扩展Windows系统分区 + +### 备份系统 ### + +在你开始之前，我建议为你的系统保留一个备份。 + +我也建议不要放弃这样的机会也不要使用微软自带的工具。 + +[点击查看如何使用Macrinum Reflect备份你的驱动][1] + + +如果Ubuntu中有你希望保存的数据，现在就登录进去然后将数据保存到外部硬盘驱动器，USB驱动器或者DVD中。 + +### 步骤1 - 删除Grub启动菜单 ### + +![](http://1.bp.blogspot.com/-arVqwMLpJRQ/VLWbHWkqYsI/AAAAAAAAHmw/kn3jDPOltX4/s1600/grubmenu.jpg) + +当你启动系统的时候你会看见一个与上图类似的菜单。 + +要想删除这个菜单直接进入Windows系统，你必须修复主引导记录。 + +要达到这个目的，我将向你展示如何创建一个系统恢复盘，如何从恢复盘中启动以及如何修复主引导记录。 + +![](http://2.bp.blogspot.com/-ML2JnNc8OWY/VLWcAovwGNI/AAAAAAAAHm4/KH778_MkU7U/s1600/recoverywindow1.PNG) + +按下“开始”按钮，搜索“备份和还原”。点击出现的图标。 + +将会打开一个与上图一样的窗口。 + +点击“创建系统修复光盘”。 + +你需要一个[空的DVD盘][2]。 + +![](http://2.bp.blogspot.com/-r0GUDZ4AAMI/VLWfJ0nuJLI/AAAAAAAAHnE/RloNqdXLLcY/s1600/recoverywindow2.PNG) + +将空的DVD盘插入到驱动器中然后从下拉列表中选择你的DVD驱动器。 + +点击“创建光盘”。 + +将光盘留在电脑中重启电脑，当出现从CD中启动的消息的时候按下键盘上的“回车”键。 + +![](http://2.bp.blogspot.com/-VPSD50bmk2E/VLWftBg7HxI/AAAAAAAAHnM/APVzvPg4rC0/s1600/recoveryoptionschooselanguage.jpg) + +屏幕上会出现“系统恢复选项”。 + +它会要求你选择你的键盘布局方式。 + +从列表中选择合适的选项，然后点击“下一步”。 + +![](http://2.bp.blogspot.com/-klK4SihPv0E/VLWgLiPO1mI/AAAAAAAAHnU/DUgxH6N2SFE/s1600/RecoveryOptions.jpg) + +下一个界面让你选择你想修复的操作系统。 + +或者你可以使用早先保存的系统镜像恢复系统。 + +选中上面的选项然后点击“下一步”。 + +![](http://2.bp.blogspot.com/-WOk-Unm6cCQ/VLWgvzoBgzI/AAAAAAAAHng/vfxm1jhW1Ms/s1600/RecoveryOptions2.jpg) + +现在你将会看到一个有修复硬盘和恢复您的系统等选项的界面。 + +你需要做的是修复主引导记录，而这可以通过领命提示符来完成。 + +点击“命令提示符”。 + +![](http://4.bp.blogspot.com/-duT-EUC0yuo/VLWhHygCApI/AAAAAAAAHno/bO7UlouyR9M/s1600/FixMBR.jpg) + +现在只需要把下面的命令输入到命令提示符中： + + bootrec.exe /fixmbr + +接下来将会出现一条消息，提示操作已经成功完成。 + +你现在就可以关闭命令提示符窗口了。 + +点击“重启”按钮然后取出DVD。 + +你的电脑就会直接启动进入Windows7系统了。 + +### 步骤 2 - 删除Ubuntu分区 ### + +![](http://4.bp.blogspot.com/-1OM0b3qBeHk/VLWh89gtgVI/AAAAAAAAHn0/ECHIARNCRp8/s1600/diskmanagement1.PNG) + +要删除Ubuntu你需要使用Windows系统提供的“磁盘管理”工具。 + +按下“开始”按钮然后在搜索框中输入“创建和格式化磁盘分区”。将会出现一个与上图类似的窗口。 + +现在上面我的屏幕将不再和你的一模一样了，不过也不会相差太多。你会看到第0块磁盘有101MB的未分配空间，另外还有4个分区。 + +这101MB的空间是之前我安装Windows7时犯的一个错误。驱动器C是Windows7系统，下一个分区(46.57GB)是Ubuntu的根分区。287G的分区是/HOME分区，8G的分区是交换空间。 + +对于Windows系统来说，我们真正需要的只有驱动器C，所以剩下的是可以删掉的。 + +**注意: 注意一下.你的磁盘上可能有恢复分区。 不要删除恢复分区.。它们应该会被标记，将文件系统设置为NTFS或FAT32** + +![](http://3.bp.blogspot.com/-8YUE2p5Fj8Q/VLWlHXst6JI/AAAAAAAAHoQ/BJC57d9Nilg/s1600/deletevolume.png) + +在你希望删除的分区上单击右键(例如：root,home和swap分区),然后从弹出的菜单中点击“删除卷”。 + +**(不要删除任何NTFS或者FAT32文件系统的分区)** + +对于剩下的两个分区重复执行上面的操作。 + +![](http://3.bp.blogspot.com/-IGbJLkc_soY/VLWk1Vh0XAI/AAAAAAAAHoA/v7TVFT0rC0E/s1600/diskmanagement2.PNG) + +分区被删除后你将会有很大的一片空闲区域。右键点击空闲区域然后选择删除。 + +![](http://4.bp.blogspot.com/-2xUBkWHpnC4/VLWk9cYXGZI/AAAAAAAAHoI/8F2ANkorGeM/s1600/diskmanagement3.PNG) + +现在你的磁盘将包含驱动器C和一大片没有分配的空间。 + +### 步骤 3 - 扩展Windows分区 ### + +![](http://4.bp.blogspot.com/-pLV5L3CvQ1Y/VLWmh-5SKTI/AAAAAAAAHoc/7sJzITyvduo/s1600/diskmanagement4.png) + +最后一步是扩展Windows以便于将它再变成一个大的分区。 +右键点击Windows分区(C盘)，然后选择“扩展卷”。 + +![](http://1.bp.blogspot.com/-vgmw_N2WZWw/VLWm7i5oSxI/AAAAAAAAHok/k0q_gnIik9A/s1600/extendvolume1.PNG) + +当出现左面的窗口的时候点击“下一步”, + +![](http://3.bp.blogspot.com/-WLA86V-Au8g/VLWnTq5RpAI/AAAAAAAAHos/6vzjLNkrwRQ/s1600/extendvolume2.PNG) + +接下来是一个向导界面，在这里你可以选择扩展到那个盘，同时修改扩展的大小。 + +默认情况下，向导界面将显示它能从未分配区域中获取的最大的磁盘空间数。 + +接受默认的选项，然后点击“下一步”。 + +![](http://4.bp.blogspot.com/-1rhTJvwem0k/VLWnvx7fWFI/AAAAAAAAHo0/D-4HA8E8y2c/s1600/extendvolume3.PNG) + +最后的界面展示了你在前一个界面中的选择结果。 + +点击“结束”进行磁盘扩展。 + +![](http://2.bp.blogspot.com/-CpuLXSYyPKY/VLWoEGU3sCI/AAAAAAAAHo8/7o5G4W4b7zU/s1600/diskmanagement5.PNG) + +从上图中你可以看到，我的Windows分区占据了整个磁盘(除了我之前安装Windows的时候偶然创建的101MB的空间)。 + +### 总结 ### + +![](http://1.bp.blogspot.com/-h1Flo2aGFcI/VLWogr2zfMI/AAAAAAAAHpE/2ypTSgR8_iM/s1600/fullwindowsscreen.PNG) + +这就是全部内容。一个致力于Linux的网站刚刚向你展示了如何移除Linux然后用Windows7取而代之。 + +有任何疑问可以在下面评论区留言。 +-------------------------------------------------------------------------------- + +via: http://www.everydaylinuxuser.com/2015/01/how-to-recover-windows-7-and-delete.html + +作者：Gary Newell +译者：[Medusar](https://github.com/Medusar) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://linux.about.com/od/LinuxNewbieDesktopGuide/ss/Create-A-Recovery-Drive-For-All-Versions-Of-Windows.htm +[2]:http://www.amazon.co.uk/gp/product/B0006L2HTK/ref=as_li_qf_sp_asin_il_tl?ie=UTF8&camp=1634&creative=6738&creativeASIN=B0006L2HTK&linkCode=as2&tag=evelinuse-21&linkId=3R363EA63XB4Z3IL + + From d368819a59fe09269cebdbb670493ebb9c7b8046 Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Thu, 22 Jan 2015 10:15:59 +0800 Subject: [PATCH 122/215] =?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 --- ...image audio and video formats on Ubuntu.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md b/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md index 8dee779cea..93d4a44f58 100644 --- a/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md +++ b/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md @@ -1,13 +1,13 @@ -如何在Ubuntu上转换图片音频和视频格式 +如何在Ubuntu上转换图像、音频和视频格式 ================================================================================ -如果你的工作中需要接触到各种不同编码格式的图片、音频和视频，那么你或许正在使用多个工具来转换这些不同的媒介格式。如果存在一个能够处理所有文件/音频/视频格式的多和一的转换工具，那就太好了。 +如果你的工作中需要接触到各种不同编码格式的图像、音频和视频，那么你很有可能正在使用多个工具来转换这些多种多样的媒介格式。如果存在一个能够处理所有图像/音频/视频格式的多和一转换工具，那就太好了。 -[Format Junkie][1] 就是这样一个有着极其友好的用户界面的多和一的媒介转换工具。更棒的是它是一个免费软件。你可以使用 Format Junkie 来转换几乎所有的流行格式的图像、音频、视频和归档文件（或称压缩文件），所有这些只需要简单地点击几下鼠标而已。 +[Format Junkie][1] 就是这样一个多和一的媒介转换工具，它有着极其友好的用户界面。更棒的是它是一个免费软件。你可以使用 Format Junkie 来转换几乎所有的流行格式的图像、音频、视频和归档文件（或称压缩文件），所有这些只需要简单地点击几下鼠标而已。 ### 在Ubuntu 12.04, 12.10 和 13.04 上安装 Format Junkie ### -Format Junkie 可以通过 Ubuntu PPA format-junkie-team 进行安装。这个PPA支持Ubuntu 12.04, 12.10 和 13.04。在以上任意一种Ubuntu版本中安装Format Junkie的话，简单的执行一下命令即可： +Format Junkie 可以通过 Ubuntu PPA format-junkie-team 进行安装。这个PPA支持Ubuntu 12.04, 12.10 和 13.04。在以上任意一种Ubuntu版本中安装Format Junkie的话，简单的执行以下命令即可： $ sudo add-apt-repository ppa:format-junkie-team/release $ sudo apt-get update @@ -16,7 +16,7 @@ Format Junkie 可以通过 Ubuntu PPA format-junkie-team 进行安装。这个PP ### 将 Format Junkie 安装到 Ubuntu 13.10 ### -如果你正在运行Ubuntu 13.10 (Saucy Salamander)，你可以按照以下步骤下载 .deb 安装包来进行安装。由于Format Junkie 的 .deb 安装包只有很少的依赖包，所以使用 [gdebi deb installer][2] 来按安装它。 +如果你正在运行Ubuntu 13.10 (Saucy Salamander)，你可以按照以下步骤下载 .deb 安装包来进行安装。由于Format Junkie 的 .deb 安装包只有很少的依赖包，所以使用 [gdebi deb installer][2] 来安装它。 在32位版Ubuntu 13.10上： @@ -30,9 +30,9 @@ Format Junkie 可以通过 Ubuntu PPA format-junkie-team 进行安装。这个PP $ sudo gdebi formatjunkie_1.07-1~raring0.2_amd64.deb $ sudo ln -s /opt/extras.ubuntu.com/formatjunkie/formatjunkie /usr/bin/formatjunkie -### 将 Format Junkie 安装到 Ubuntu 14.04 或 之后版本 ### +### 将 Format Junkie 安装到 Ubuntu 14.04 或之后版本 ### -现有的可供使用的官方 Format Junkie .deb 文件 需要 libavcodec-extra-53，这个东西从Ubuntu 14.04开始就已经过时了。所以如果你想在Ubuntu 14.04或之后版本上安装Format Junkie的话，可以使用以下的第三方PPA来代替。 +现有可供使用的官方 Format Junkie .deb 文件需要 libavcodec-extra-53，不过它从Ubuntu 14.04开始就已经过时了。所以如果你想在Ubuntu 14.04或之后版本上安装Format Junkie，可以使用以下的第三方PPA来代替。 $ sudo add-apt-repository ppa:jon-severinsson/ffmpeg $ sudo add-apt-repository ppa:noobslab/apps @@ -47,7 +47,7 @@ Format Junkie 可以通过 Ubuntu PPA format-junkie-team 进行安装。这个PP #### 使用 Format Junkie 来转换音频、视频、图像和归档格式 #### -就像下方展示的一样，Format Junkie 的用户界面简单而且直观。在音频、视频、图像和iso媒介之间进行选择，在顶部四个标签当中点击你需要的那个。你可以根据需要添加无限量的文件用于批量转换。添加文件后，选择输出格式，直接点击 "Start Converting" 按钮进行转换。 +就像下方展示的一样，Format Junkie 的用户界面简单而且直观。在顶部的音频、视频、图像和iso媒介四个标签当中点击你需要的那个。你可以根据需要添加无限量的文件用于批量转换。添加文件后，选择输出格式，直接点击 "Start Converting" 按钮进行转换。 ![](http://farm9.staticflickr.com/8107/8643695905_082b323059.jpg) @@ -70,7 +70,7 @@ Format Junkie支持以下媒介媒介媒介格式间的转换： 总而言之，Format Junkie 是一个非常易于使用和多才多艺的媒介转换工具。但也有一个缺陷，它不允许对转换进行任何定制化（例如：比特率，帧率，采样频率，图像质量，尺寸）。所以这个工具推荐正在寻找一个简单易用的媒介转换工具的新手使用。 -喜欢这篇文章吗？在facebook、twitter和google+上给我点赞吧。多谢！ +喜欢这篇文章吗？在facebook、twitter和google+上给我点赞/分享吧。多谢！ -------------------------------------------------------------------------------- @@ -78,7 +78,7 @@ via: http://xmodulo.com/how-to-convert-image-audio-and-video-formats-on-ubuntu.h 作者：[Dan Nanni][a] 译者：[Ping](https://github.com/mr-ping) -校对：[校对者ID](https://github.com/校对者ID) +校对：[Caroline](https://github.com/carolinewuyan) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From 4e1caae562f96bbc3f88a3349209c78e44d04829 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 22 Jan 2015 10:39:22 +0800 Subject: [PATCH 123/215] =?UTF-8?q?20150122-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Answers--How to add a cron job on Linux.md | 66 ++++++++ ...ers--How to check memory usage on Linux.md | 111 ++++++++++++++ ...gure a MySQL user from the command line.md | 106 +++++++++++++ ...nstall ixgbe driver on Ubuntu or Debian.md | 144 ++++++++++++++++++ ...How to set a custom HTTP header in curl.md | 44 ++++++ ...oad a RPM package without installing it.md | 56 +++++++ 6 files changed, 527 insertions(+) create mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md create mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md create 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 sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md create mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md create mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to use yum to download a RPM package without installing it.md diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md b/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md new file mode 100644 index 0000000000..a119537e74 --- /dev/null +++ b/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md @@ -0,0 +1,66 @@ +Linux FAQs with Answers--How to add a cron job on Linux +================================================================================ +> **Question**: I would like to schedule a task on my Linux box, so that the task runs periodically at fixed times. How can I add a cron job for this task on my Linux system? + +The cron utility is the default task scheduler used in Linux. Using cron, you can schedule a task (e.g., a command or a shell-script) to run it periodically or one-time at a specific time of hour, day, week, month, etc. The cron tool is useful when you schedule a variety of regular maintenance jobs, such as periodic backup, rotating logs, checking filesystem, monitoring disk space, and so on. + +### Add a Cron Job from the Command Line ### + +To add a cron job, you can use a command-line tool called crontab. + +Type the following command to create a new cron job to run as the current user. + + $ crontab -e + +If you want a cron job to run as any other user, type the following command instead. + + $ sudo crontab -u -e + +You will be presented with a text editor window, where you can add or edit cron jobs. By default, nano editor will be used. + +![](https://farm9.staticflickr.com/8586/16200331362_1385807ac0_b.jpg) + +Each cron job is formatted as follows. + + + +The first five elements specify the schedule for a task, and the last element is the (full-path) command or script to execute according to the schedule. + +![](https://farm8.staticflickr.com/7472/16199272841_dffe0b2873_b.jpg) + +Here are a few useful cron job examples. + +- *** * * * * /home/dan/bin/script.sh**: run every minute. +- **0 * * * * /home/dan/bin/script.sh**: run every hour. +- **0 0 * * * /home/dan/bin/script.sh**: run at 12am daily. +- **0 9,18 * * * /home/dan/bin/script.sh**: run at 9AM and 6PM twice a day. +- **0 9-18 * * * /home/dan/bin/script.sh**: run every hour from 9AM and 6PM. +- **0 9-18 * * 1-5 /home/dan/bin/script.sh**: run every hour from 9AM and 6PM every weekday. +- ***/10 * * * * /home/dan/bin/script.sh**: run every 10 minutes. + +Once you are done with setting up cron job(s), press Ctrl+X to save and quit the editor. At this point, newly added cron jobs should be activated. + +To browse existing cron jobs of yours, use the following command: + + $ crontab -l + +### Add a Cron Job from GUI ### + +If you are in Linux desktop environment, you can use a GUI fronend for crontab to add or edit a cron job via a more user-friendly interface. + +On GNOME desktop, there is GNOME Schedule (gnome-schedule package). + +![](https://farm8.staticflickr.com/7484/16015054699_d96f0e9b6a_c.jpg) + +On KDE desktop, there is Task Scheduler (kcron package). + +![](https://farm8.staticflickr.com/7473/16175298266_825376c901_c.jpg) + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/add-cron-job-linux.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/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 new file mode 100644 index 0000000000..ecd5ba10da --- /dev/null +++ b/sources/tech/20150122 Linux FAQs with Answers--How to check memory usage on Linux.md @@ -0,0 +1,111 @@ +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/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 new file mode 100644 index 0000000000..09f29434e4 --- /dev/null +++ b/sources/tech/20150122 Linux FAQs with Answers--How to create and configure a MySQL user from the command line.md @@ -0,0 +1,106 @@ +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/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 new file mode 100644 index 0000000000..238794a019 --- /dev/null +++ b/sources/tech/20150122 Linux FAQs with Answers--How to download and install ixgbe driver on Ubuntu or Debian.md @@ -0,0 +1,144 @@ +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 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 new file mode 100644 index 0000000000..37622009f1 --- /dev/null +++ b/sources/tech/20150122 Linux FAQs with Answers--How to set a custom HTTP header in curl.md @@ -0,0 +1,44 @@ +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/sources/tech/20150122 Linux FAQs with Answers--How to use yum to download a RPM package without installing it.md b/sources/tech/20150122 Linux FAQs with Answers--How to use yum to download a RPM package without installing it.md new file mode 100644 index 0000000000..f1663888c8 --- /dev/null +++ b/sources/tech/20150122 Linux FAQs with Answers--How to use yum to download a RPM package without installing it.md @@ -0,0 +1,56 @@ +Linux FAQs with Answers--How to use yum to download a RPM package without installing it +================================================================================ +> **Question**: I want to download a RPM package from Red Hat's standard repositories. Can I use yum command to download a RPM package without installing it? + +yum is the default package manager for Red Hat based systems, such as CentOS, Fedora or RHEL. Using yum, you can install or update a RPM package while resolving its package dependencies automatically. What if you want to download a RPM package without installing it on the system? For example, you may want to archive some RPM packages for later use or to install them on another machine. + +Here is how to download a RPM package from yum repositories. + +### Method One: Yum ### + +The yum command itself can be used to download a RPM package. The standard yum command offers '--downloadonly' option for this purpose. + + $ sudo yum install --downloadonly + +By default, a downloaded RPM package will be saved in: + + /var/cache/yum/x86_64/[centos/fedora-version]/[repository]/packages + +In the above, [repository] is the name of the repository (e.g., base, fedora, updates) from which the package is downloaded. + +If you want to download a package to a specific directory (e.g., /tmp): + + $ sudo yum install --downloadonly --downloaddir=/tmp + +Note that if a package to download has any unmet dependencies, yum will download all dependent packages as well. None of them will be installed. + +One important thing is that on CentOS/RHEL 6 or earlier, you will need to install a separate yum plugin (called yum-plugin-downloadonly) to be able to use '--downloadonly' command option: + + $ sudo yum install yum-plugin-downloadonly + +Without this plugin, you will get the following error with yum: + + Command line error: no such option: --downloadonly + +![](https://farm9.staticflickr.com/8627/15571201803_38390aae75_c.jpg) + +### Method Two: Yumdownloader ### + +Another method to download a RPM package is via a dedicated package downloader tool called yumdownloader. This tool is part of yum-utils package which contains a suite of helper tools for yum package manager. + + $ sudo yum install yum-utils + +To download a RPM package: + + $ sudo yumdownloader + +The downloaded package will be saved in the current directory. You need to use root privilege because yumdownloader will update package index files during downloading. Unlike yum command above, none of the dependent package(s) will be downloaded. + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/yum-download-rpm-package.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 88c2152c5884ebced13ddcd7b2b3a06482f1fe0d Mon Sep 17 00:00:00 2001 From: Medusar <939958749@qq.com> Date: Thu, 22 Jan 2015 12:10:50 +0800 Subject: [PATCH 124/215] 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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 命名错误，重新命名 --- ...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 => 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 b/translated/tech/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 rename to translated/tech/How To Recover Windows 7 And Delete Ubuntu In 3 Easy Steps.md From 68c1b1d6aca07856abfe3e68dcfcac413bb4fd64 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Thu, 22 Jan 2015 16:48:43 +0800 Subject: [PATCH 125/215] =?UTF-8?q?20150122-2=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... Top 10 FOSS legal developments of 2014.md | 72 ++++++++++ ...122 Top 10 open source projects of 2014.md | 126 ++++++++++++++++++ 2 files changed, 198 insertions(+) create mode 100644 sources/talk/20150122 Top 10 FOSS legal developments of 2014.md create mode 100644 sources/talk/20150122 Top 10 open source projects of 2014.md diff --git a/sources/talk/20150122 Top 10 FOSS legal developments of 2014.md b/sources/talk/20150122 Top 10 FOSS legal developments of 2014.md new file mode 100644 index 0000000000..a97e4910c6 --- /dev/null +++ b/sources/talk/20150122 Top 10 FOSS legal developments of 2014.md @@ -0,0 +1,72 @@ +Top 10 FOSS legal developments of 2014 +================================================================================ +![](http://opensource.com/sites/default/files/styles/image-full-size/public/images/law/LAW_PatentSpotlight_520x292_cm.png.png?itok=N-O9b4FW) + +Image by : opensource.com + +The year 2014 continued the trend of the increasing importance of legal issues for the FOSS community. Continuing [the tradition of looking back][1] over the top ten legal developments in FOSS, my selection of the top ten issues for 2014 is as follows: + +### 1. Courts interpret General Public License version 2 (GPLv2) ### + +The GPLv2 continues to be the most widely used and most important license for free and open source software. Black Duck Software estimates that 16 billion lines of code are licensed under the GPLv2. Despite its importance, the GPLv2 has been the subject of very few court decisions, and virtually all of the most important terms of the GPLv2 have not been interpreted by courts. This lack of court decisions is about to change due to the five interrelated cases arising from an attempt by Versata Software, Inc. (Versata) to terminate its software license to Ameriprise Financial, Inc. Versata’s product included software licensed by Ximpleware, Inc. (Ximpleware) under the GPLv2, but Versata had not complied with the terms of the GPLv2. Ximpleware sued Versata and eight of its customers for both copyright and patent infringement. (For a more detailed description of the facts [read this article][2].) This dispute is important because Ximpleware is the first commercial enforcer of the GPLv2 in which the courts are likely to issue decisions and Ximpleware is seeking monetary damages rather than compliance. + +### 2. GPL guides ### + +Two of the most important organizations enforcing the GPL family of licenses recently provided [guidance on compliance][3]: On October 31, the Software Freedom Law Center published the second version of their Practical Guide to GPL Compliance. Several days later, the Software Conservancy and the Free Software Foundation published the first version of their guide, the Copyleft, and the GNU General Public License: [A Comprehensive Tutorial and Guide][4]. These guides are required reading for anyone managing FOSS. + +### 3. EU Commission (EC) to revise FOSS policy ### + +Governments are one of the most important users of software but have had a mixed record in using and contributing to FOSS (free and open source software). The EC recently announced that it intends to remove the barriers that may hinder code contributions to FOSS projects. In particular, the EC wants to clarify legal aspects, including intellectual property rights, copyright, and which author or authors to name when submitting code to the upstream repositories. Pierre Damas, Head of Sector at the Directorate General for IT, [hopes that such clarification][5] will motivate many of the EC’s software developers and functionaries to promote the use of FOSS at the EC. + +### 4. Validation of FOSS business model by Hortonworks IPO ### + +Hortonworks provides services and support for the Hadoop data analysis software managed by the Apache Software Foundation. Hortonworks is one of three venture backed companies based on the Hadoop software. Hortonworks went public this fall and immediately rose 65% in share price, valuing the company at over $1 billion. The market for Hadoop products, software, and services is projected to reach $50.2 billion in 2020, up from $1.5 billion in 2012. + +### 5. Core Infrastructure Initiative ### + +The Linux Foundation put together [a consortium of companies][6] to support the many smaller open source projects that are critical to software ecosystem, such as OpenSSL. This effort was a response to the Heartbleed problem with OpenSSL in 2013, which I described in last year’s summary. This consortium is a great example of the ability of the FOSS community to come together to solve community problems. + +### 6. Linux SCO case terminated again ### + +The lawsuit by Santa Cruz Operations, Inc. (SCO) against IBM claiming that Linux includes Unix code was once a potentially major challenge to FOSS. Despite losing its suit against Novell, the bankruptcy court allowed SCO to continue its suit against IBM. I thought this case [had been concluded in 2008][7], but Judge Nuffer appears to have put the case to rest on December 15, 2014. He dismissed the case against IBM based on the decisions in the Novell case (although SCO could still appeal once again): + +*It is further ORDERED that, with respect to all remaining claims and counterclaims, SCO is bound by, and may not here re-litigate, the rulings in the Novell Judgment that Novell (not SCO) owns the copyrights to the pre-1996 UNIX source code, and that Novell waived SCO’s contract claims against IBM for alleged breaches of the licensing agreements pursuant to which IBM licensed such source code.* + +### 7. FOSS trademark issues ### + +The use of trademarks in FOSS projects continues to raise issues. This year brought the settlement of the dispute over the “Python” mark between the Python Software Foundation and Veber, a small hosting company in the UK. Veber had decided to use "Python" in branding certain of its products and services. In addition, the OpenStack Foundation is working through the application of trademarks to the OpenStack project through its [DefCore committee][8]. + +### 8. Use of FOSS by commercial companies expands ### + +We have discussed in the past how many large companies are using FOSS as an explicit strategy to build their software. Jim Zemlin, Executive Director of the Linux Foundation, has described this strategic use of FOSS as external “research and development.” His conclusions are supported by Gartner who noted that “the top tech companies are still spending tens of billions of dollars on software research and development, the smart ones are leveraging open source for 80 percent of the code and spending their money on the remaining 20 percent, which represents their program’s ‘special sauce.’” The scope of this trend was emphasized by Microsoft’s announcement that it was “open sourcing” the .NET software framework (this software is used by millions of developers to build and operate websites and other large online applications). + +### 9. Rockstar Consortium threat evaporates ### + +The Rockstar Consortium was formed by Microsoft, Blackberry, Ericsson, Sony, and Apple to exploit the 6,000 patents from Nortel Networks. The Rockstar Consortium sued Google for infringement of the Android operating system. This litigation was aimed at fundamental functions of the Android operating system and could have had a significant effect on the Android ecosystem. The Rockstar Consortium settled its litigation with Google this year, but then sold 4,000 of its patents to RPX, the patent defense firm (financed by a number of companies as well as RPX). The remaining patents were distributed to the members of the Rockstar Consortium. + +### 10. Android litigation ### + +The litigation surrounding Android continued this year, with significant developments in the patent litigation between Apple Computer, Inc. (Apple) and Samsung Electronics, Inc. (Samsung) and the copyright litigation over the Java APIs between Oracle Corporation (Oracle) and Google, Inc. (Google). Apple and Samsung have agreed to end patent disputes in nine countries, but they will continue the litigation in the US. As I stated last year, the Rockstar Consortium was a wild card in this dispute. However, the Rockstar Consortium settled its litigation with Google this year and sold off its patents, so it will no longer be a risk to the Android ecosystem. + +The copyright litigation regarding the copyrightability of the Java APIs was brought back to life by the Court of Appeals for the Federal Circuit (CAFC) decision which overturned [the District Court decision][9]. The District Court had found that Google was not liable for copyright infringement for its admitted copying of the Java APIs: the court found that the Java APIs were either not copyrightable or their use by Google was protected by various defenses to copyright. The CAFC overturned both the decision and the analysis and remanded the case to the District Court for a review of the fair use defense raised by Google. Subsequently, Google filed an appeal to the Supreme Court. The impact of a finding that Google was liable for copyright infringement in this case would have a dramatic effect on Android and, depending on the reasoning, would have a ripple effect across the interpretation of the scope of the “copyleft” terms of the GPL family of licenses which use APIs. + +-------------------------------------------------------------------------------- + +via: http://opensource.com/law/15/1/top-foss-legal-developments-2014 + +作者：[Mark Radcliffe][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://opensource.com/users/mradcliffe +[1]:http://lawandlifesiliconvalley.com/blog/?p=853 +[2]:http://opensource.com/law/14/12/gplv2-court-decisions-versata +[3]:http://www.softwarefreedom.org/resources/ +[4]:http://www.copyleft.org/guide/ +[5]:https://joinup.ec.europa.eu/community/osor/news/european-commission-update-its-open-source-policy +[6]:http://www.linuxfoundation.org/programs/core-infrastructure-initiative +[7]:http://lawandlifesiliconvalley.com/blog/?m=200812 +[8]:https://wiki.openstack.org/wiki/Governance/CoreDefinition +[9]:http://law.justia.com/cases/federal/appellate-courts/cafc/13-1021/13-1021-2014-05-09.html \ No newline at end of file diff --git a/sources/talk/20150122 Top 10 open source projects of 2014.md b/sources/talk/20150122 Top 10 open source projects of 2014.md new file mode 100644 index 0000000000..edc81938d6 --- /dev/null +++ b/sources/talk/20150122 Top 10 open source projects of 2014.md @@ -0,0 +1,126 @@ +Top 10 open source projects of 2014 +================================================================================ +![](http://opensource.com/sites/default/files/styles/image-full-size/public/images/life/top10_projects_lead.jpg?itok=tMZo2sYi) + +Image credits : [CC0 Public Domain][1], modifications by Jen Wike Huger + +Every year we collect the best of the best open source projects covered on Opensource.com. [Last year's list of 10 projects][2] guided people working and interested in tech throughout 2014. Now, we're setting you up for 2015 with a brand new list of accomplished open source projects. + +Some faces are new. Some have been around and just keep rocking it. Let's dive in! + +## Top 10 open source projects in 2014 ## + +### Docker ### + +[application container platform][3] + +"In the same way that power management and virtualisation has allowed us to get maximum engineering benefit from our server utilisation, the problem of how to really solve first world problems in virtualisation has remained prevalent. Docker's open sourcing in 2013 can really align itself with these pivotal moments in the evolution of open source—providing the extensible building blocks allowing us as engineers and architects to extend distributed platforms like never before." —Richard Morrell, [Senior software engineer Petazzoni on the breathtaking growth of Docker][4]. + +**Interview**: VP of Services for Docker talks to Jodi Biddle in [Why is Docker the new craze in virtualization and cloud computing?][5] "I think it's the lightweight nature of Docker combined with the workflow. It's fast, easy to use and a developer-centric DevOps-ish tool. Its mission is basically: make it easy to package and ship code." —James Turnbull. + +### Kubernetes ### + +[orchestration system for containers][6] + +"One of the projects you're starting to hear a lot about in the orchestration space is [Kubernetes][7], which came out of Google's internal container work. It aims to provide features such as high availability and replication, service discovery, and service aggregation." —Gordon Haff, [Open source accelerating the pace of software][8]. + +### Taiga ### + +[project management platform][9] + +"It’s almost always the case that the project management tool doesn’t reflect the actual project scenario. One solution to this is using a tool that is intuitive and fits alongside the developer's normal workflow. Additionally, a tool that is quick to update and attracts users to use it. [Taiga][10] is an open source project management tool that aims to solve the basic problem of software usability." —Nitish Tiwari, [Taiga, a new open source project management tool with focus on usability][11]. + +### Apache Mesos ### + +[cluster manager][12] + +"[Apache Mesos][13] is a cluster manager that provides efficient resource isolation and sharing across distributed applications or frameworks. It sits between the application layer and the operating system and makes it easier to deploy and manage applications in large-scale clustered environments more efficiently. It can run many applications on a dynamically shared pool of nodes. Prominent users of Mesos include Twitter, Airbnb, MediaCrossing, Xogito and Categorize. —Sachin P Bappalige, [Open source datacenter computing with Apache Mesos][14]. + +Interview: Head of Open Source at Twitter talks to Jason Hibbets in [Scale like Twitter with Apache Mesos][15]. "As of today, Twitter has over 270 million active users which produces 500+ million tweets a day, up to 150k+ tweets per second, and more than 100TB+ of compressed data per day. Architecturally, Twitter is mostly composed of services, mostly written in the open source project [Finagle][16], representing the core nouns of the platform such as the user service, timeline service, and so on. Mesos allows theses services to scale to tens of thousands of bare-metal machines and leverage a shared pool of servers across data centers." —Chris Aniszczyk + +### OpenStack ### + +[cloud computing platform][17] + +"As OpenStack continues to mature and slowly make its way into production environments, the focus on the user is continuing to grow. And so, to better meet the needs of users, the community is working hard to get users to meet the next step of engagement by highlighting those users who are change agents both in their organization and within the OpenStack community at large: the superusers." —Jason Baker, [What is an OpenStack superuser][18]? + +**Interview**: Infrastructure manager at CERN talks to Jason Hibbets in [How OpenStack powers the research at CERN][19]. "At CERN, the European Organization for Nuclear Research physicists and engineers are probing the fundamental structure of the universe. In order to do this, we use some of the world's largest and most complex scientific instruments such as the Large Hadron Collider, a 27 KM ring 100m underground on the border between France and Switzerland. OpenStack provides the infrastructure cloud which is used to provide much of the compute resources for this processing." —Tim Bell. + +### Ansible ### + +[IT automation tool][20] + +"A lot of what I want to do is enable people to not only have more free time for beer, but to have more free time for their own projects, their own ideas, and to do new an interesting things." —[Michael DeHaan, Making your IT infrastructure boring with Ansible][21]. + +**Interview**: CTO of Ansible talks to Jen Krieger in [Behind the scenes with CTO Michael DeHaan of Ansible][22]. "I like to quote Star Trek 2 a lot. We definitely optimize for 'the needs of the many'. I know Spock dies after he says that, but he does get to come back." —Michael DeHaan + +### ownCloud ### + +[cloud storage tool][23] + +"I was looking for an easy way how to have all my online storage services, such as Google Drive and Dropbox, integrated with my Linux desktop without using some nasty hack, and I finally have a solution that works. I'm here to share it with you. This is not rocket science really, all I did was a little bit of documentation reading, and a couple of clicks." —Jiri Folta, [Using ownCloud to integrate Dropbox, Google Drive, and more in Gnome][24]. + +**Listed**: Top 5 open source alternatives: "ownCloud does most everything that the proprietary names do and it keeps control of your information in your hands." —Scott Nesbitt, [Five open source alternatives to popular web apps][25]. + +### Apache Hadoop ### + +[framework for big data][26] + +"Apache Hadoop is an open source software framework for storage and large scale processing of data-sets on clusters of commodity hardware. Hadoop is an Apache top-level project being built and used by a global community of contributors and users. It is licensed under the Apache License 2.0." —Sachin P Bappalige, [An introduction to Apache Hadoop for big data][27]. + +### Drupal ### + +[content management system (CMS)][28] + +"When it was released in 2011, Drupal 7 was the most accessible open source content management system (CMS) available. I expect that this will be true until the release of Drupal 8. Web accessibility requires constant vigilance and will be something that will always need attention in any piece of software striving to meet the Web Content Accessibility Guidelines (WCAG) 2.0 guidelines." —Mike Gifford, [Drupal 8's accessibility advantage][29]. + +### OpenDaylight ### + +[foundation for software defined networking][30] + +"We are seeing more and more that the networking functions traditionally done in the datacenter by dedicated, almost exclusively proprietary hardware and software combinations, are now being defined through software. Leading that charge within the open source community has been the [OpenDaylight Project][31], a collaborative project through the [Linux Foundation][32] working to define the needs which software defined networking may fill and coordinating the efforts of individuals and companies worldwide to create an open source solution to software defined networking (SDN)." —Jason Baker, [Define your network in software with OpenDaylight][33]. + +-------------------------------------------------------------------------------- + +via: http://opensource.com/business/14/12/top-10-open-source-projects-2014 + +作者：[Jen Wike Huger][a] +译者：[译者ID](https://github.com/译者ID) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[a]:http://opensource.com/users/jen-wike +[1]:http://pixabay.com/en/lightbulb-lamp-light-hotspot-336193/ +[2]:http://opensource.com/life/13/12/top-open-source-projects-2013 +[3]:https://www.docker.com/ +[4]:http://opensource.com/business/14/7/interview-jerome-petazzoni-docker +[5]:https://opensource.com/business/14/7/why-docker-new-craze-virtualization-and-cloud-computing +[6]:http://kubernetes.io/ +[7]:https://cloud.google.com/compute/docs/containers +[8]:http://opensource.com/business/14/11/open-source-accelerating-pace-software +[9]:https://taiga.io/ +[10]:https://github.com/taigaio +[11]:https://opensource.com/business/14/10/taiga-open-source-project-management-tool +[12]:http://mesos.apache.org/ +[13]:http://mesos.apache.org/ +[14]:https://opensource.com/business/14/9/open-source-datacenter-computing-apache-mesos +[15]:https://opensource.com/business/14/8/interview-chris-aniszczyk-twitter-apache-mesos +[16]:https://twitter.github.io/finagle/ +[17]:http://www.openstack.org/ +[18]:https://opensource.com/business/14/5/what-is-openstack-superuser +[19]:https://opensource.com/business/14/10/interview-tim-bell-cern-it-operating-systems +[20]:http://www.ansible.com/home +[21]:https://opensource.com/business/14/12/ansible-it-infrastructure +[22]:https://opensource.com/business/14/10/interview-michael-dehaan-ansible +[23]:http://owncloud.org/ +[24]:https://opensource.com/life/14/12/using-owncloud-integrate-dropbox-google-drive-gnome +[25]:https://opensource.com/life/14/10/five-open-source-alternatives-popular-web-apps +[26]:http://hadoop.apache.org/ +[27]:http://opensource.com/life/14/8/intro-apache-hadoop-big-data +[28]:https://www.drupal.org/ +[29]:http://opensource.com/business/14/5/new-release-drupal-8-accessibility-advantage +[30]:http://www.opendaylight.org/ +[31]:http://www.opendaylight.org/ +[32]:http://www.linuxfoundation.org/ +[33]:http://opensource.com/business/14/5/defining-your-network-software-opendaylight From b9039a42d65b5e87e7f91c08d49a8ff8d0381a1e Mon Sep 17 00:00:00 2001 From: carolinewuyan <309866211@qq.com> Date: Thu, 22 Jan 2015 17:14:43 +0800 Subject: [PATCH 126/215] =?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 --- ...all New Fonts In Ubuntu 14.04 and 14.10.md | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/translated/tech/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md b/translated/tech/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md index fd108461d2..6838ea7df4 100644 --- a/translated/tech/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md +++ b/translated/tech/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md @@ -2,20 +2,19 @@ ================================================================================ ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/fonts.jpg) -Ubuntu默认自带了很多字体。但你或许对这些字体还不满意。因此，你可以做的是在**Ubuntu 14.04、 14.10或者像Linux Mint其他的系统中安装额外的字体**。 +Ubuntu默认自带了很多字体。但有时候你或许对这些字体还不满意。因此，你可以做的是在**Ubuntu 14.04、 14.10或者像Linux Mint之类的其它Linux系统中安装额外的字体**。 ### 第一步: 获取字体 ### -第一步也是最重要的，下载你选择的字体。现在你或许在考虑从哪里下载字体。不要担心，Google搜索可以给你提供几个免费的字体网站。你可以先去看看[ Lost Type 的字体][1]。[Squirrel的字体][2]同样也是一个下载字体的好地方。 +第一步也是最重要的一步，下载你选择的字体。现在你或许在考虑从哪里下载字体。不要担心，Google搜索可以给你提供几个免费的字体网站。你可以先去看看[ Lost Type 的字体][1]。[Squirrel][2]同样也是一个下载字体的好地方。 ### 第二步：在Ubuntu中安装新字体 ### -Font Viewer. In here, you can see the option to install the font in top right corner: -下载的字体文件可能是一个压缩包。先解压它。大多数字体文件的格式是[TTF][3] (TrueType Fonts) 或者[OTF][4] (OpenType Fonts)。无论是哪种，只要双击字体文件。它会自动用字体查看器打开。这里你可以在右上角看到安装安装选项。 +下载的字体文件可能是一个压缩包，先解压它。大多数字体文件的格式是[TTF][3] (TrueType字体) 或者[OTF][4] (OpenType字体)。无论是哪种，只要双击字体文件。它会自动用字体查看器打开。这里你可以在右上角看到安装选项。 ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Install_New_Fonts_Ubuntu.png) -在安装字体时不会看到其他信息。几秒钟后，你会看到状态变成已安装。不用猜，这就是已安装的字体。 +在安装字体时不会看到其他信息。几秒钟后，你会看到状态变成已安装。不用猜，字体已经安装完毕。 ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Install_New_Fonts_Ubuntu_1.png) @@ -23,20 +22,20 @@ Font Viewer. In here, you can see the option to install the font in top right co ### 第二步：在Linux上一次安装几个字体 ### -我没有打错。这仍旧是第二步但是只是是一个备选方案。我上面看到的在Ubuntu中安装字体的方法是不错的。但是这有一个小问题。当你有20个新字体要安装时。一个个单独双击即繁琐又麻烦。你不这么认为么？ +我没有打错。这仍旧是第二步但是只是一个备选方案。我们上面看到的在Ubuntu中安装字体的方法是不错的。但是这有一个小问题。当你有20个新字体要安装时。一个个单独双击即繁琐又麻烦。你不这么认为么？ -要在Ubuntu中一次安装几个字体，你要做的是创建一个.fonts文件夹，如果在你的家目录下还不存在这个目录的话。并把解压后的TTF和OTF文件复制到这个文件夹内。 +要在Ubuntu中一次安装几个字体，你唯一要做的是在你的家目录下创建一个.fonts文件夹，如果它不存在的话。并把解压后的TTF和OTF文件复制到这个文件夹内。 在文件管理器中进入家目录。按下Ctrl+H [显示Ubuntu中的隐藏文件][5]。 右键创建一个文件夹并命名为.fonts。 这里的点很重要。在Linux中，在文件的前面加上点意味在普通的视图中都会隐藏。 #### 备选方案： #### -另外你可以安装字体管理程序来以GUI的形式管理字体。要在Ubuntu中安装字体管理程序，打开终端并输入下面的命令： +另外你可以安装字体管理程序，在图形用户界面管理字体。要在Ubuntu中安装字体管理程序，打开终端并输入下面的命令： sudo apt-get install font-manager -Open the Font Manager from Unity Dash. You can see installed fonts and option to install new fonts, remove existing fonts etc here. -从Unity Dash中打开字体管理器。你可以看到已安装的字体和安装新字体、删除字体等选项。 + +从Unity Dash中打开字体管理器。在这里你可以看到已安装的字体和安装新字体、删除字体等选项。 ![](http://itsfoss.itsfoss.netdna-cdn.com/wp-content/uploads/2015/01/Font_Manager_Ubuntu.jpeg) @@ -44,7 +43,7 @@ Open the Font Manager from Unity Dash. You can see installed fonts and option to sudo apt-get remove font-manager -我希望这篇文章可以帮助你在Ubuntu或其他Linux系统上安装字体。如果你有任何问题或建议请让我知道。 +我希望这篇文章可以帮助你在Ubuntu或其它Linux系统上安装字体。如果你有任何问题或建议请在下方评论中告诉我。 -------------------------------------------------------------------------------- @@ -52,7 +51,7 @@ via: http://itsfoss.com/install-fonts-ubuntu-1404-1410/ 作者：[Abhishek][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/) 荣誉推出 @@ -61,4 +60,4 @@ via: http://itsfoss.com/install-fonts-ubuntu-1404-1410/ [2]:http://www.fontsquirrel.com/ [3]:http://en.wikipedia.org/wiki/TrueType [4]:http://en.wikipedia.org/wiki/OpenType -[5]:http://itsfoss.com/hide-folders-and-show-hidden-files-in-ubuntu-beginner-trick/ \ No newline at end of file +[5]:http://itsfoss.com/hide-folders-and-show-hidden-files-in-ubuntu-beginner-trick/ From ae6e08a3757da9deb6542a843556418df4bd1ae0 Mon Sep 17 00:00:00 2001 From: Stevearzh Date: Thu, 22 Jan 2015 20:04:55 +0800 Subject: [PATCH 127/215] Translating by Stevearzh --- sources/talk/20150114 Why Mac users don't switch to Linux.md | 1 + 1 file changed, 1 insertion(+) 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 index f0094f14d9..6a72276819 100644 --- 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 @@ -1,3 +1,4 @@ +[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? From 29e887d2951454e8f8ef77d9fb68cf96e0de83ed Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 22 Jan 2015 20:54:46 +0800 Subject: [PATCH 128/215] PUB:20141009 How to convert image audio and video formats on Ubuntu @mr-ping --- ...vert image audio and video formats on Ubuntu.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename {translated/tech => published}/20141009 How to convert image audio and video formats on Ubuntu.md (84%) diff --git a/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md b/published/20141009 How to convert image audio and video formats on Ubuntu.md similarity index 84% rename from translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md rename to published/20141009 How to convert image audio and video formats on Ubuntu.md index 93d4a44f58..93dd76f5a6 100644 --- a/translated/tech/20141009 How to convert image audio and video formats on Ubuntu.md +++ b/published/20141009 How to convert image audio and video formats on Ubuntu.md @@ -1,9 +1,9 @@ 如何在Ubuntu上转换图像、音频和视频格式 ================================================================================ -如果你的工作中需要接触到各种不同编码格式的图像、音频和视频，那么你很有可能正在使用多个工具来转换这些多种多样的媒介格式。如果存在一个能够处理所有图像/音频/视频格式的多和一转换工具，那就太好了。 +如果你的工作中需要接触到各种不同编码格式的图像、音频和视频，那么你很有可能正在使用多个工具来转换这些多种多样的媒体格式。如果存在一个能够处理所有图像/音频/视频格式的多合一转换工具，那就太好了。 -[Format Junkie][1] 就是这样一个多和一的媒介转换工具，它有着极其友好的用户界面。更棒的是它是一个免费软件。你可以使用 Format Junkie 来转换几乎所有的流行格式的图像、音频、视频和归档文件（或称压缩文件），所有这些只需要简单地点击几下鼠标而已。 +[Format Junkie][1] 就是这样一个多合一的媒体转换工具，它有着极其友好的用户界面。更棒的是它是一个免费软件。你可以使用 Format Junkie 来转换几乎所有的流行格式的图像、音频、视频和归档文件（或称压缩文件），所有这些只需要简单地点击几下鼠标而已。 ### 在Ubuntu 12.04, 12.10 和 13.04 上安装 Format Junkie ### @@ -47,11 +47,11 @@ Format Junkie 可以通过 Ubuntu PPA format-junkie-team 进行安装。这个PP #### 使用 Format Junkie 来转换音频、视频、图像和归档格式 #### -就像下方展示的一样，Format Junkie 的用户界面简单而且直观。在顶部的音频、视频、图像和iso媒介四个标签当中点击你需要的那个。你可以根据需要添加无限量的文件用于批量转换。添加文件后，选择输出格式，直接点击 "Start Converting" 按钮进行转换。 +就像下方展示的一样，Format Junkie 的用户界面简单而且直观。在顶部的音频、视频、图像和iso媒体四个标签当中点击你需要的那个。你可以根据需要添加任意数量的文件用于批量转换。添加文件后，选择输出格式，直接点击 "Start Converting" 按钮进行转换。 ![](http://farm9.staticflickr.com/8107/8643695905_082b323059.jpg) -Format Junkie支持以下媒介媒介媒介格式间的转换： +Format Junkie支持以下媒体格式间的转换： - **Audio**: mp3, wav, ogg, wma, flac, m4r, aac, m4a, mp2. - **Video**: avi, ogv, vob, mp4, 3gp, wmv, mkv, mpg, mov, flv, webm. @@ -60,7 +60,7 @@ Format Junkie支持以下媒介媒介媒介格式间的转换： #### 用 Format Junkie 进行字幕编码 #### -除了媒介转换，Format Junkie 可提供了字幕编码的图形界面。实际的字幕编码是由MEncoder来完成的。为了使用Format Junkie的字幕编码接口，首先你需要安装MEencoder。 +除了媒体转换，Format Junkie 可提供了字幕编码的图形界面。实际的字幕编码是由MEncoder来完成的。为了使用Format Junkie的字幕编码接口，首先你需要安装MEencoder。 $ sudo apt-get install mencoder @@ -68,9 +68,9 @@ Format Junkie支持以下媒介媒介媒介格式间的转换： ![](http://farm9.staticflickr.com/8100/8644791396_bfe602cd16.jpg) -总而言之，Format Junkie 是一个非常易于使用和多才多艺的媒介转换工具。但也有一个缺陷，它不允许对转换进行任何定制化（例如：比特率，帧率，采样频率，图像质量，尺寸）。所以这个工具推荐正在寻找一个简单易用的媒介转换工具的新手使用。 +总而言之，Format Junkie 是一个非常易于使用和多才多艺的媒体转换工具。但也有一个缺陷，它不允许对转换进行任何定制化（例如：比特率，帧率，采样频率，图像质量，尺寸）。所以这个工具推荐给正在寻找一个简单易用的媒体转换工具的新手使用。 -喜欢这篇文章吗？在facebook、twitter和google+上给我点赞/分享吧。多谢！ +喜欢这篇文章吗？请在下面发表评论吧。多谢！ -------------------------------------------------------------------------------- From 7c7ee6a171373f47c53b08cb1cbb174c2695402d Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 22 Jan 2015 21:01:22 +0800 Subject: [PATCH 129/215] PUB:20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10 @geekpi --- ...20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {translated/tech => published}/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md (100%) diff --git a/translated/tech/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md b/published/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md similarity index 100% rename from translated/tech/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md rename to published/20150106 How To Install New Fonts In Ubuntu 14.04 and 14.10.md From 704555fa869bc59295b3b7f2dfd8bc5403dd5b99 Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 22 Jan 2015 21:11:33 +0800 Subject: [PATCH 130/215] PUB:20141120 How to install an Opensource VPN Server on Linux @geekpi --- ...ow to install an Opensource VPN Server on Linux.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename {translated/tech => published}/20141120 How to install an Opensource VPN Server on Linux.md (85%) diff --git a/translated/tech/20141120 How to install an Opensource VPN Server on Linux.md b/published/20141120 How to install an Opensource VPN Server on Linux.md similarity index 85% rename from translated/tech/20141120 How to install an Opensource VPN Server on Linux.md rename to published/20141120 How to install an Opensource VPN Server on Linux.md index 2484c31700..49150565d8 100644 --- a/translated/tech/20141120 How to install an Opensource VPN Server on Linux.md +++ b/published/20141120 How to install an Opensource VPN Server on Linux.md @@ -2,17 +2,17 @@ ================================================================================ ![](http://techarena51.com/wp-content/uploads/2014/10/open-vpn.png) -我上网时最担心的一件事情是，我该如何确保我的数据安全和隐私。在搜索答案的过程中，我找到了很多保持匿名的方法，比如使用代理网站。但是使用第三方的服务不能完全保证。我需要的是有一款软件可以我自己安装并运行，那样我就能确保只有我才能访问数据。 +我上网时最担心的一件事情是，我该如何确保我的数据安全和隐私。在搜索答案的过程中，我找到了很多保持匿名的方法，比如使用代理网站。但是使用第三方的服务不能完全保证。我需要的是有一款软件可以让我自己安装并运行，那样我就能确保只有我才能访问数据。 这款软件叫什么呢？ 它叫VPN服务，就是虚拟隐私网络的简称。它允许访问时通过SSL加密你的数据。因为是加密的连接，所以你的ISP不能看到你的浏览信息。 -在本篇Linux教程中，我会在CentOS 7上安装一个OpenVPN服务。OpenVPN很容易使用，开源且拥有基于社区的支持。它的客户端有Windows、Android和Mac。 +在本篇Linux教程中，我会在CentOS 7上安装一个OpenVPN服务。OpenVPN很容易使用，开源且拥有社区的支持。它的客户端支持Windows、[Android][1]和Mac。 -### 第一步： 在你的Linux机器或者 [VPS][1]上安装OpenVPN服务 ### +### 第一步： 在你的Linux机器或者 VPS 上安装OpenVPN服务 ### -从https://openvpn.net/index.php/access-server/download-openvpn-as-sw.html下载安装包，Ubuntu用户也可以找到合适的安装包并安装。 +从 https://openvpn.net/index.php/access-server/download-openvpn-as-sw.html 下载安装包，Ubuntu用户也可以找到合适的安装包并安装。 [leo@vps ]$ cd /tmp [leo@vps tmp]$ wget http://swupdate.openvpn.org/as/openvpn-as-2.0.10-CentOS7.x86_64.rpm @@ -61,11 +61,10 @@ via: http://techarena51.com/index.php/how-to-install-an-opensource-vpn-server-on 作者：[Leo G][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/) 荣誉推出 [a]:http://techarena51.com/ [1]:https://play.google.com/store/apps/details?id=net.openvpn.openvpn&hl=en -[2]:http://supportinc.net/vps-hosting.php [3]:https://openvpn.net/index.php/access-server/docs/admin-guides-sp-859543150/howto-connect-client-configuration.html \ No newline at end of file From 7e2774538792356566132b26dc0c1241707c59e7 Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 22 Jan 2015 21:22:49 +0800 Subject: [PATCH 131/215] PUB:20141124 Linux blkid Command to Find Block Devices Details @felixonmars --- ...d Command to Find Block Devices Details.md | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 deletions(-) rename {translated/tech => published}/20141124 Linux blkid Command to Find Block Devices Details.md (81%) diff --git a/translated/tech/20141124 Linux blkid Command to Find Block Devices Details.md b/published/20141124 Linux blkid Command to Find Block Devices Details.md similarity index 81% rename from translated/tech/20141124 Linux blkid Command to Find Block Devices Details.md rename to published/20141124 Linux blkid Command to Find Block Devices Details.md index 720baf2b33..9a912daf7a 100644 --- a/translated/tech/20141124 Linux blkid Command to Find Block Devices Details.md +++ b/published/20141124 Linux blkid Command to Find Block Devices Details.md @@ -2,39 +2,27 @@ ================================================================================ 今天我们将会向你展示如何使用 **lsblk** 和 **blkid** 工具来查找关于块设备的信息，我们使用的是一台安装了 CentOS 7.0 的机器。 +## lsblk ## + **lsblk** 是一个 Linux 工具，它会显示有关你系统里所有可用块设备的信息。它从 [sysfs 文件系统][1] 中获取信息。默认情况下，这个工具将会以树状格式显示（除了内存虚拟磁盘外的）所有块设备。 ### lsblk 默认输出 ### 默认情况下 lsblk 会将块设备输出为树状格式： -**NAME** +- **NAME** —— 设备的名称 - —— 设备的名称 +- **MAJ:MIN** —— Linux 操作系统中的每个设备都以一个文件表示，对块（磁盘）设备来说，这里用主次设备编号来描述设备。 -**MAJ:MIN** +- **RM** —— 可移动设备。如果这是一个可移动设备将显示 1，否则显示 0。 - —— Linux 操作系统中的每个设备都以一个文件表示，对块（磁盘）设备来说，这里用主次设备编号来描述设备。 +- **TYPE** —— 设备的类型 -**RM** +- **MOUNTPOINT** —— 设备挂载的位置 - —— 可移动设备。如果这是一个可移动设备将显示 1，否则显示 0。 +- **RO** —— 对于只读文件系统，这里会显示 1，否则显示 0。 -**TYPE** - - —— 设备的类型 - -**MOUNTPOINT** - - —— 设备挂载的位置 - -**RO** - - —— 对于只读文件系统，这里会显示 1，否则显示 0。 - -**SIZE** - - —— 设备的容量 +- **SIZE** —— 设备的容量 ![](http://blog.linoxide.com/wp-content/uploads/2014/10/lsblk.jpg) @@ -54,12 +42,14 @@ ### 在脚本中使用 ### -高级技巧：如果你想要在脚本中使用而不希望表头被显示出来，你可以这样使用 -n 选项： +高级技巧：如果你想要在脚本中使用而希望剔除表头，你可以这样使用 -n 选项： lsblk -ln ![](http://blog.linoxide.com/wp-content/uploads/2014/10/lsblk-ln.jpg) +## blkid ## + **blkid** 命令是一个命令行工具，它可以显示关于可用块设备的信息。它可以识别一个块设备内容的类型（如文件系统、交换区）以及从内容的元数据（如卷标或 UUID 字段）中获取属性（如 tokens 和键值对）。它主要有两类作用：用指定的键值对搜索一个设备，或是显示一个或多个设备的键值对。 ### blkid 使用方法 ### @@ -84,7 +74,7 @@ ### 详细信息 ### -如果你想要获取更多详细信息，你可以使用 -p 和 -o udev 选项来将它们用漂亮的格式显示出来，像这样： +如果你想要获取更多详细信息，你可以使用 -p 和 -o udev 选项来将它们用整齐的格式显示出来，像这样： # blkid -po udev /dev/sda1 @@ -102,7 +92,7 @@ via: http://linoxide.com/linux-command/linux-command-lsblk-blkid/ 作者：[Adrian Dinu][a] 译者：[felixonmars](https://github.com/felixonmars) -校对：[校对者ID](https://github.com/校对者ID) +校对：[wxy](https://github.com/wxy) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From fa6a21a32f211a2533ea17b3bb3aeee287bc40c5 Mon Sep 17 00:00:00 2001 From: wxy Date: Thu, 22 Jan 2015 21:47:59 +0800 Subject: [PATCH 132/215] PUB:How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS @SPccman --- ...ind Chroot DNS Server on CentOS 7.0 VPS.md | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) rename {translated/tech => published}/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md (61%) diff --git a/translated/tech/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md b/published/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md similarity index 61% rename from translated/tech/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md rename to published/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md index 0df194fe17..c151adf6b1 100644 --- a/translated/tech/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md +++ b/published/How to Setup Bind Chroot DNS Server on CentOS 7.0 VPS.md @@ -1,47 +1,49 @@ -在CentOS7.0 VPS上搭建 Bind Chroot DNS 服务器 +在 CentOS7.0 上搭建 Chroot 的 Bind DNS 服务器 ==================== -BIND（Berkeley internet Name Daemon)也叫做NAMED是现今互联网上使用最为广泛的DNS 服务器程序。这篇文章将要讲述如何在 chroot jail （chroot “监牢”，所谓“监牢”就是指通过chroot机制来更改某个进程所能看到的根目录，即将某进程限制在指定目录中，保证该进程只能对该目录及其子目录的文件有所动作，从而保证整个服务器的安全）中运行 BIND，这样它就无法访问文件系统中除“jail”以外的其它部分。例如，在这篇文章中，我会将BIND的运行根目录改为/var/named/chroot/。当然，对于BIND来说，这个目录就是/（根目录）。 “jail”（监牢，下同）是一个软件机制，其功能是使得某个程序无法访问规定区域之外的资源，同样也为了增强安全性。Bind Chroot DNS 服务器的默认“jail”为/var/named/chroot。你可以按照下列步骤，在CentOS 7.0 虚拟专用服务器（VPS）上部署 Bind Chroot DNS 服务器。 +BIND（Berkeley internet Name Daemon)也叫做NAMED，是现今互联网上使用最为广泛的DNS 服务器程序。这篇文章将要讲述如何在 chroot 监牢中运行 BIND，这样它就无法访问文件系统中除“监牢”以外的其它部分。 - 1. 安装Bind Chroot DNS 服务器： +例如，在这篇文章中，我会将BIND的运行根目录改为 /var/named/chroot/。当然，对于BIND来说，这个目录就是 /（根目录）。 “jail”（监牢，下同）是一个软件机制，其功能是使得某个程序无法访问规定区域之外的资源，同样也为了增强安全性（LCTT 译注：chroot “监牢”，所谓“监牢”就是指通过chroot机制来更改某个进程所能看到的根目录，即将某进程限制在指定目录中，保证该进程只能对该目录及其子目录的文件进行操作，从而保证整个服务器的安全）。Bind Chroot DNS 服务器的默认“监牢”为 /var/named/chroot。你可以按照下列步骤，在CentOS 7.0 上部署 Bind Chroot DNS 服务器。 - [root@centos7 ~]# yum install bind-chroot bind -y +### 1、安装Bind Chroot DNS 服务器 - 2. 拷贝bind相关文件,准备bind chroot 环境 + [root@centos7 ~]# yum install bind-chroot bind -y - [root@centos7 ~]# cp -R /usr/share/doc/bind-*/sample/var/named/* /var/named/chroot/var/named/ +### 2、拷贝bind相关文件,准备bind chroot 环境 - 3. 在bind chroot 的目录中创建相关文件 + [root@centos7 ~]# cp -R /usr/share/doc/bind-*/sample/var/named/* /var/named/chroot/var/named/ - [root@centos7 ~]# touch /var/named/chroot/var/named/data/cache_dump.db +### 3、在bind chroot 的目录中创建相关文件 - [root@centos7 ~]# touch /var/named/chroot/var/named/data/named_stats.txt + [root@centos7 ~]# touch /var/named/chroot/var/named/data/cache_dump.db - [root@centos7 ~]# touch /var/named/chroot/var/named/data/named_mem_stats.txt + [root@centos7 ~]# touch /var/named/chroot/var/named/data/named_stats.txt - [root@centos7 ~]# touch /var/named/chroot/var/named/data/named.run + [root@centos7 ~]# touch /var/named/chroot/var/named/data/named_mem_stats.txt - [root@centos7 ~]# mkdir /var/named/chroot/var/named/dynamic + [root@centos7 ~]# touch /var/named/chroot/var/named/data/named.run - [root@centos7 ~]# touch /var/named/chroot/var/named/dynamic/managed-keys.bind + [root@centos7 ~]# mkdir /var/named/chroot/var/named/dynamic + + [root@centos7 ~]# touch /var/named/chroot/var/named/dynamic/managed-keys.bind - 4. 将 Bind 锁定文件设置为可写： +### 4、 将 Bind 锁定文件设置为可写 - [root@centos7 ~]# chmod -R 777 /var/named/chroot/var/named/data - [root@centos7 ~]# chmod -R 777 /var/named/chroot/var/named/dynamic + [root@centos7 ~]# chmod -R 777 /var/named/chroot/var/named/data + [root@centos7 ~]# chmod -R 777 /var/named/chroot/var/named/dynamic - 5. 将 /etc/named.conf 拷贝到 bind chroot目录 +### 5、 将 /etc/named.conf 拷贝到 bind chroot目录 - [root@centos7 ~]# cp -p /etc/named.conf /var/named/chroot/etc/named.conf + [root@centos7 ~]# cp -p /etc/named.conf /var/named/chroot/etc/named.conf - 6. 在/etc/named.conf中对 bind 进行配置。在文件尾添加 example.local 域信息： +### 6、 在/etc/named.conf中对 bind 进行配置。 - [root@centos7 ~]# vi /var/named/chroot/etc/named.conf - -在 named.conf 中创建转发域（Forward Zone）与反向域（Reverse Zone）： +在 named.conf 文件尾添加 **example.local** 域信息， 创建转发域（Forward Zone）与反向域（Reverse Zone）（LCTT 译注：这里example.local 并非一个真实有效的互联网域名，而是通常用于本地测试的一个域名；如果你需要做权威 DNS 解析，你可以将你拥有的域名如这里所示配置解析。）： + [root@centos7 ~]# vi /var/named/chroot/etc/named.conf +-- .. .. zone "example.local" { @@ -56,7 +58,7 @@ BIND（Berkeley internet Name Daemon)也叫做NAMED是现今互联网上使用 .. .. -named.conf 完全配置 +named.conf 完全配置如下： // // named.conf @@ -123,9 +125,9 @@ named.conf 完全配置 include "/etc/named.rfc1912.zones"; include "/etc/named.root.key"; - 7. 为 example.local 域名创建转发域与反向域文件 +### 7、 为 example.local 域名创建转发域与反向域文件 -a)创建转发域 +#### a)创建转发域 [root@centos7 ~]# vi /var/named/chroot/var/named/example.local.zone @@ -154,11 +156,11 @@ a)创建转发域 ns1 IN A 192.168.0.70 ns2 IN A 192.168.0.80 -b)创建反向域 +#### b)创建反向域 [root@centos7 ~]# vi /var/named/chroot/var/named/192.168.0.zone ----- +-- ; ; Addresses and other host information. @@ -175,7 +177,9 @@ b)创建反向域 70.0.168.192.in-addr.arpa. IN PTR mx.example.local. 70.0.168.192.in-addr.arpa. IN PTR ns1.example.local. - 80.0.168.192.in-addr.arpa. IN PTR ns2.example.local.。开机自启动 bind-chroot 服务： + 80.0.168.192.in-addr.arpa. IN PTR ns2.example.local.。 + +### 8、开机自启动 bind-chroot 服务： [root@centos7 ~]# /usr/libexec/setup-named-chroot.sh /var/named/chroot on [root@centos7 ~]# systemctl stop named @@ -184,15 +188,13 @@ b)创建反向域 [root@centos7 ~]# systemctl enable named-chroot ln -s '/usr/lib/systemd/system/named-chroot.service' '/etc/systemd/system/multi-user.target.wants/named-chroot.service' -[跳转到档案页，阅读更多文章][1] - ------------------ via: http://www.ehowstuff.com/how-to-setup-bind-chroot-dns-server-on-centos-7-0-vps/ 作者：[skytech][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 cbf2f006fb4063cce55ca4e0bdc3e59fb0aa0d27 Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Thu, 22 Jan 2015 23:07:38 +0800 Subject: [PATCH 133/215] =?UTF-8?q?=E9=80=89=E9=A2=98=20How=20are=20C=20da?= =?UTF-8?q?ta=20types=20=E2=80=9Csupported=20directly=20by=20most=20comput?= =?UTF-8?q?ers=E2=80=9D=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... “supported directly by most computers”.md | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 sources/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 new file mode 100644 index 0000000000..0b57189252 --- /dev/null +++ b/sources/talk/20150122 How are C data types “supported directly by most computers”.md @@ -0,0 +1,53 @@ +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 From 81fb54a565cfe5452c7e03f8667d3a5ea77340db Mon Sep 17 00:00:00 2001 From: Vic___ Date: Fri, 23 Jan 2015 00:00:02 +0800 Subject: [PATCH 134/215] translated --- ...gration From 2.2 to 2.4 on Ubuntu 14.04.md | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md b/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md index c456aa6601..f4edd9e627 100644 --- a/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md +++ b/sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md @@ -1,55 +1,53 @@ - Vic020 - -Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04 +Ubuntu 14.04 Apache2.2迁移2.4问题解决 ================================================================================ -If you do a distribution upgrade from **Ubuntu** 12.04 to 14.04, the upgrade will bring among other things an important update to **Apache**, from [version 2.2][1] to version 2.4. The update brings many improvements but it may cause some errors when used with the old configuration file from 2.2. +如果你进行了一次**Ubuntu**从12.04到14.04的升级，那么这次升级还包括了一个重大的升级--**Apache**从2.2版本到2.4版本。**Apache**的这次升级带来了许多性能提升，但是如果继续使用2.2的配置会导致很多错误。 -### Access control in Apache 2.4 Virtual Hosts ### +### 访问控制的改变 ### -Starting with **Apache 2.4** authorization is applied in a way that is much more flexible then just a single check against a single data store like it was in 2.2. In the past it was tricky to figure how and in what order authorization is applied but with the introduction of authorization container directives such as and , the configuration also has control over when the authorization methods are called and what criteria determines when access is granted. +从**Apache 2.4**起，授权（authorization）开始启用，比起2.2的一个检查一个数据存储，授权更加灵活。过去很难确定那些命令授权应用了，但是授权（authorization）的引入解决了这些问题，现在，配置可以控制什么时候授权方法被调用，什么条件决定何时授权访问。 -This is the point where most upgrades fail because of wrong configuration because in 2.2 access control based on IP address, hostname or other characteristic was done using the directives Order, Allow, Deny or Satisfy, but in 2.4 this is done with authorization checks using the new modules. +这就是为什么大多数的升级失败是由于错误配置，2.2的访问控制基于IP地址，主机名和其他字符通过使用指令Order，来设置Allow, Deny或 Satisfy，但是2.4，这些一切被新模板授权（authorization）来替代检查。 -To be clear let's see some virtual host examples, this can be found in your /etc/apache2/sites-enabled/default or /etc/apache2/sites-enabled/YOUR_WEBSITE_NAME: +为了弄清楚这些，可以来看一些虚拟主机的例子，这些可以在/etc/apache2/sites-enabled/default 或者 /etc/apache2/sites-enabled/网页名称 中找到: -Old 2.2 virtual host configuration: +老2.2虚拟主机配置： Order allow,deny Allow from all -New 2.4 virtual host configuration: +新2.4虚拟主机配置： Require all granted ![apache 2.4 config](http://blog.linoxide.com/wp-content/uploads/2014/12/apache-2.4-config.jpg) -### .htaccess problems ### +### .htaccess 问题 ### -If after the upgrade some settings don't work or you get redirect errors, check if those settings are in a .htaccess file. If settings in the .htaccess file are not used by Apache it's because in 2.4 AllowOverride directive is set to None by default, thus ignoring the .htaccess files. All you have to do is to either change or add the AllowOverride All directive to your site configuration file. +升级后如果一些设置不执行或者得到重定向错误，检查是否这些设置是在.htaccess文件中。如果是，2.4已经不再使用.htaccess文件，在2.4中默认使用AllowOverride指令来设置，因此忽略了.htaccess文件。你需要做的就是改变和增加AllowOverride All命令到你的页面配置文件中。 -You also see the AllowOverride All directive set in the screenshot above. +上面截图中，可以看见AllowOverride All指令。 -### Missing config file or module ### +### 丢失配置文件或者模块 ### -From my experience another problem during upgrades is that your configuration file includes an old module or configuration file that is no longer needed or supported in 2.4, you will get a clear warning that Apache can't include the respective file and all you have to do is go to your configuration file and remove the line that causes problem. Afterwards you can search or install a similar module. +根据我的经验，这次升级带了其他问题就是老模块和配置文件不再需要或者不被支持了。所以你必须十分清楚Apache不再支持的各种文件，并且在老配置中移除这些老模块来解决问题。之后你可以搜索和安装相似的模块来替代。 -### Other small changes you shound know about ### +### 其他需要的知道的小改变 ### -There are a few other changes that you should consider, although they generally result in an warning and not an error: +这里还有一些其他改变的需要考虑，虽然这些通常只会发生警告，而不是错误。 -- MaxClients has been renamed to MaxRequestWorkers, which describes more accurately what it does. For async MPMs, like event, the maximum number of clients is not equivalent than the number of worker threads. The old name is still supported. -- The DefaultType directive no longer has any effect, other than to emit a warning if it's used with any value other than none. You need to use other configuration settings to replace it in 2.4. -- EnableSendfile now defaults to Off. -- FileETag now defaults to "MTime Size" (without INode). -- KeepAlive only accepts values of On or Off. Previously, any value other than "Off" or "0" was treated as "On". -- Directives AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex, and WatchdogMutexPath have been replaced with a single Mutex directive. You will need to evaluate any use of these removed directives in your 2.2 configuration to determine if they can just be deleted or will need to be replaced using Mutex. +- 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老配置的设置。 -------------------------------------------------------------------------------- via: http://linoxide.com/linux-how-to/apache-migration-2-2-to-2-4-ubuntu-14-04/ 作者：[Adrian Dinu][a] -译者：[译者ID](https://github.com/译者ID) +译者：[Vic020/VicYu](http://vicyu.net) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 From c77b9e2e2cebef2f195f95d8e2c8137b258ea123 Mon Sep 17 00:00:00 2001 From: Vic___ Date: Fri, 23 Jan 2015 00:01:05 +0800 Subject: [PATCH 135/215] Moved --- ...5 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {sources => translated}/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md (100%) diff --git a/sources/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 similarity index 100% rename from sources/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md rename to translated/tech/20150115 Tips for Apache Migration From 2.2 to 2.4 on Ubuntu 14.04.md From 955219b1a8180109f20917d4bcb122afe8383be1 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Fri, 23 Jan 2015 09:55:35 +0800 Subject: [PATCH 136/215] translating --- ...2 Linux FAQs with Answers--How to add a cron job on Linux.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md b/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md index a119537e74..ad861b42c7 100644 --- a/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md +++ b/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md @@ -1,3 +1,5 @@ +Translating----geekpi + Linux FAQs with Answers--How to add a cron job on Linux ================================================================================ > **Question**: I would like to schedule a task on my Linux box, so that the task runs periodically at fixed times. How can I add a cron job for this task on my Linux system? From 50ee769861dc59c053936d466ad6d6e8e0c28713 Mon Sep 17 00:00:00 2001 From: zhengsihua Date: Fri, 23 Jan 2015 10:34:07 +0800 Subject: [PATCH 137/215] translated --- ...Answers--How to add a cron job on Linux.md | 68 ------------------- ...Answers--How to add a cron job on Linux.md | 66 ++++++++++++++++++ 2 files changed, 66 insertions(+), 68 deletions(-) delete mode 100644 sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md create mode 100644 translated/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md diff --git a/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md b/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md deleted file mode 100644 index ad861b42c7..0000000000 --- a/sources/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md +++ /dev/null @@ -1,68 +0,0 @@ -Translating----geekpi - -Linux FAQs with Answers--How to add a cron job on Linux -================================================================================ -> **Question**: I would like to schedule a task on my Linux box, so that the task runs periodically at fixed times. How can I add a cron job for this task on my Linux system? - -The cron utility is the default task scheduler used in Linux. Using cron, you can schedule a task (e.g., a command or a shell-script) to run it periodically or one-time at a specific time of hour, day, week, month, etc. The cron tool is useful when you schedule a variety of regular maintenance jobs, such as periodic backup, rotating logs, checking filesystem, monitoring disk space, and so on. - -### Add a Cron Job from the Command Line ### - -To add a cron job, you can use a command-line tool called crontab. - -Type the following command to create a new cron job to run as the current user. - - $ crontab -e - -If you want a cron job to run as any other user, type the following command instead. - - $ sudo crontab -u -e - -You will be presented with a text editor window, where you can add or edit cron jobs. By default, nano editor will be used. - -![](https://farm9.staticflickr.com/8586/16200331362_1385807ac0_b.jpg) - -Each cron job is formatted as follows. - - - -The first five elements specify the schedule for a task, and the last element is the (full-path) command or script to execute according to the schedule. - -![](https://farm8.staticflickr.com/7472/16199272841_dffe0b2873_b.jpg) - -Here are a few useful cron job examples. - -- *** * * * * /home/dan/bin/script.sh**: run every minute. -- **0 * * * * /home/dan/bin/script.sh**: run every hour. -- **0 0 * * * /home/dan/bin/script.sh**: run at 12am daily. -- **0 9,18 * * * /home/dan/bin/script.sh**: run at 9AM and 6PM twice a day. -- **0 9-18 * * * /home/dan/bin/script.sh**: run every hour from 9AM and 6PM. -- **0 9-18 * * 1-5 /home/dan/bin/script.sh**: run every hour from 9AM and 6PM every weekday. -- ***/10 * * * * /home/dan/bin/script.sh**: run every 10 minutes. - -Once you are done with setting up cron job(s), press Ctrl+X to save and quit the editor. At this point, newly added cron jobs should be activated. - -To browse existing cron jobs of yours, use the following command: - - $ crontab -l - -### Add a Cron Job from GUI ### - -If you are in Linux desktop environment, you can use a GUI fronend for crontab to add or edit a cron job via a more user-friendly interface. - -On GNOME desktop, there is GNOME Schedule (gnome-schedule package). - -![](https://farm8.staticflickr.com/7484/16015054699_d96f0e9b6a_c.jpg) - -On KDE desktop, there is Task Scheduler (kcron package). - -![](https://farm8.staticflickr.com/7473/16175298266_825376c901_c.jpg) - --------------------------------------------------------------------------------- - -via: http://ask.xmodulo.com/add-cron-job-linux.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 add a cron job on Linux.md b/translated/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md new file mode 100644 index 0000000000..6f0a5effe3 --- /dev/null +++ b/translated/tech/20150122 Linux FAQs with Answers--How to add a cron job on Linux.md @@ -0,0 +1,66 @@ +Linux 有问必答： 如何在Linux中加入cron任务 +================================================================================ +> **提问**： 我想在我的Linux中安排一个计划任务，该任务在固定时间周期性地运行。我该如何在Linux中添加一个cron任务？ + +cron是Linux中默认的计划任务。使用cron，你可以安排一个计划（比如：命令或者shell脚本）周期性地运行或者在指定的小时、天、周、月等特定时间运行。cron在你安排不同的常规维护任务时是很有用的，比如周期性地备份、日志循环、检查文件系统、监测磁盘空间等等。 + +### 从命令行中添加cron任务 ### + +要添加cron任务，你可以使用称为crontab的命令行工具。 + +输入下面的命令会创建一个以当前用户运行的新cron任务。 + + $ crontab -e + +如果你想要以其他用户运行cron任务，输入下面的命令。 + + $ sudo crontab -u -e + +你将会看见一个文本编辑窗口，这里你可以添加或者编辑cron任务。默认使用nono编辑器。 + +![](https://farm9.staticflickr.com/8586/16200331362_1385807ac0_b.jpg) + +每个cron任务的格式如下。 + + + +前5个元素定义了任务的计划，最后一个元素是命令或者脚本的完整路径。 + +![](https://farm8.staticflickr.com/7472/16199272841_dffe0b2873_b.jpg) + +下面是一些cron任务示例。 + +- *** * * * * /home/dan/bin/script.sh**: 每分钟运行。 +- **0 * * * * /home/dan/bin/script.sh**: 每小时运行。 +- **0 0 * * * /home/dan/bin/script.sh**: 每12小时运行。 +- **0 9,18 * * * /home/dan/bin/script.sh**: 在每天的9AM和6PM运行。 +- **0 9-18 * * * /home/dan/bin/script.sh**: 在9AM到6PM的每个小时运行。 +- **0 9-18 * * 1-5 /home/dan/bin/script.sh**: 周一到周五的9AM到6PM每小时运行。 +- ***/10 * * * * /home/dan/bin/script.sh**: 每10分钟运行。 + +一旦完成上面的设置步骤后，按下Ctrl+X来保存并退出编辑器。此时，新增的计划任务应该已经激活了。 + +要查看存在的计划任务，使用下面的命令： + + $ crontab -l + +### 从GUI添加计划任务 ### + +如果你在Linux桌面环境中，你可以使用crontab的更加友好的GUI前端来添加或者添加一个cron任务。 + +在Gnome桌面中，有一个Gnome Schedule（gnome-schedule包）。 + +![](https://farm8.staticflickr.com/7484/16015054699_d96f0e9b6a_c.jpg) + +在KDE桌面中，有一个Task Scheduler（kcron包）。 + +![](https://farm8.staticflickr.com/7473/16175298266_825376c901_c.jpg) + +-------------------------------------------------------------------------------- + +via: http://ask.xmodulo.com/add-cron-job-linux.html + +译者：[geekpi](https://github.com/geekpi) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 \ No newline at end of file From 4a3d1c216ff31c3a9c3321b8c6c7e8aa16408192 Mon Sep 17 00:00:00 2001 From: DeadFire Date: Fri, 23 Jan 2015 16:42:05 +0800 Subject: [PATCH 138/215] =?UTF-8?q?20150123-1=20=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SO Images Directly From Your Hard Drive.md | 78 +++++++++++++++++++ ...3 How to make a file immutable on Linux.md | 72 +++++++++++++++++ ... With Recent Notifications AppIndicator.md | 40 ++++++++++ 3 files changed, 190 insertions(+) create mode 100644 sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md create mode 100644 sources/tech/20150123 How to make a file immutable on Linux.md create mode 100644 sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.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 new file mode 100644 index 0000000000..0a1670da58 --- /dev/null +++ b/sources/tech/20150123 How to Boot Linux ISO Images Directly From Your Hard Drive.md @@ -0,0 +1,78 @@ +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 \ No newline at end of file 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 new file mode 100644 index 0000000000..3eb0394bd1 --- /dev/null +++ b/sources/tech/20150123 How to make a file immutable on Linux.md @@ -0,0 +1,72 @@ +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. + +chattr is a Linux command which allows one to set or unset attributes on a file, which are separate from the standard (read, write, execute) file permission. A related command is lsattr which shows which attributes are set on a file. While file attributes managed by chattr and lsattr are originally supported by EXT file systems (EXT2/3/4) only, this feature is now available on many other native Linux file systems such as XFS, Btrfs, ReiserFS, etc. + +In this tutorial, I am going to demonstrate how to use chattr to make files immutable on Linux. + +chattr and lsattr commands are a part of e2fsprogs package which comes pre-installed on all modern Linux distributions. + +Basic syntax of chattr is as follows. + + $ chattr [-RVf] [operator][attribute(s)] files... + +The operator can be '+' (which adds selected attributes to attribute list), '-' (which removes selected attributes from attribute list), or '=' (which forces selected attributes only). + +Some of available attributes are the following. + +- **a**: can be opened in append mode only. +- **A**: do not update atime (file access time). +- **c**: automatically compressed when written to disk. +- **C**: turn off copy-on-write. +- **i**: set immutable. +- **s**: securely deleted with automatic zeroing. + +### Immutable Attribute ### + +To make a file immutable, you can add "immutable" attribute to the file as follows. For example, to write-protect /etc/passwd file: + + $ sudo chattr +i /etc/passwd + +Note that you must use root privilege to set or unset "immutable" attribute on a file. Now verify that "immutable" attribute is added to the file successfully. + + $ lsattr /etc/passwd + +Once the file is set immutable, this file is impervious to change for any user. Even the root cannot modify, remove, overwrite, move or rename the file. You will need to unset the immutable attribute before you can tamper with the file again. + +To unset the immutable attribute, use the following command: + + $ sudo chattr -i /etc/passwd + +![](https://farm9.staticflickr.com/8613/16152651317_076a65cf50_b.jpg) + +If you want to make a whole directory (e.g., /etc) including all its content immutable at once recursively, use "-R" option: + + $ sudo chattr -R +i /etc + +### Append Only Attribute ### + +Another useful attribute is "append-only" attribute which forces a file to grow only. You cannot overwrite or delete a file with "append-only" attribute set. This attribute can be useful when you want to prevent a log file from being cleared by accident. + +Similar to immutable attribute, you can turn a file into "append-only" mode by: + + $ sudo chattr +a /var/log/syslog + +Note that when you copy an immutable or append-only file to another file, those attributes will not be preserved on the newly created file. + +### Conclusion ### + +In this tutorial, I showed how to use chattr and lsattr commands to manage additional file attributes to prevent (accidental or otherwise) file tampering. Beware that you cannot rely on chattr as a security measure as one can easily undo immutability. One possible way to address this limitation is to restrict the availability of chattr command itself, or drop kernel capability CAP_LINUX_IMMUTABLE. For more details on chattr and available attributes, refer to its man page. + +-------------------------------------------------------------------------------- + +via: http://xmodulo.com/make-file-immutable-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 \ No newline at end of file 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 new file mode 100644 index 0000000000..28bdb2443d --- /dev/null +++ b/sources/tech/20150123 Keep History Of Notifications With Recent Notifications AppIndicator.md @@ -0,0 +1,40 @@ +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 From bf37e3ff9f772207e81c6fc068cdf208c895f087 Mon Sep 17 00:00:00 2001 From: H-mudcup Date: Fri, 23 Jan 2015 18:32:47 +0800 Subject: [PATCH 139/215] Delete 20140819 Top 4 Linux download managers.md --- .../20140819 Top 4 Linux download managers.md | 150 ------------------ 1 file changed, 150 deletions(-) delete mode 100644 sources/share/20140819 Top 4 Linux download managers.md diff --git a/sources/share/20140819 Top 4 Linux download managers.md b/sources/share/20140819 Top 4 Linux download managers.md deleted file mode 100644 index 0282a2e91c..0000000000 --- a/sources/share/20140819 Top 4 Linux download managers.md +++ /dev/null @@ -1,150 +0,0 @@ -Translating By H-mudcup - -Top 4 Linux download managers -================================================================================ -**Improve and better manage your web downloads for mirroring, mass grabs or just better control over your files** - -Download managers seem to be old news these days, but there are still some excellent uses for them. We compare the top four of them on Linux. - -### [uGet][1] ### - -Advertised as lightweight and full- featured like a majority of other Linux apps, uGet can handle multi- threaded streams, includes filters and can integrate with an undefined selection of web browsers. It’s been around for over ten years now, starting out as UrlGet, and can also run on Windows. - -![uGet is actually very full-featured, with a lot of the kind of functions that advanced torrent clients use](http://www.linuxuser.co.uk/wp-content/uploads/2014/08/uget1.png) -uGet is actually very full-featured, with a lot of the kind of functions that advanced torrent clients use - -#### Interface #### - -uGet reminds us of any number of torrent client interfaces, with categories for Active, Finished, Paused and so on for the different downloads. Although there is a lot of information to take in, it’s all presented very cleanly and clearly. The main downloading controls are easy to access, with more advanced ones alongside them. - -#### Integration #### - -While it can see into the clipboard for URLs, uGet doesn’t natively integrate into browsers like Chromium and Firefox. Still, there are add-ons for both these browsers that allow them to connect to uGet: Firefox via FlashGot and Chromium with a dedicated plug-in. Not ideal, but good enough. - -#### Features #### - -uGet’s maturity affords it a range of features, including advanced scheduling to switch downloading on and off, batch download via the clipboard and the ability to change which file types it looks for in the clipboard. There are plug-in options, but not a huge amount. - -#### Availability #### - -While it’s also available in most major distro repos, the uGet website includes regularly updated binaries for a variety of popular distributions as well as easily accessible source code. It runs on GTK 3+ so it has a smaller footprint in some desktop environments than others, although we’d say it’s worth the extra dependancies in KDE or other Qt desktops. - -#### Overall #### - -8/10 - -We very much like uGet – its wide variety of features and popularity have allowed it to develop quite a lot to be an all-encompassing solution to download management, with some decent integration with Linux browsers. - -### [KGet][2] ### - -KDE’s own download manager seems to have been originally designed to work with Konqueror, the KDE web browser. It comes with the kind of features we’re looking for in this test: control of multiple downloads and the ability to run a checksum alongside the downloaded product. - -![You need to manually activate the ability to keep an eye on the clipboard for links](http://www.linuxuser.co.uk/wp-content/uploads/2014/08/kget1.png) -You need to manually activate the ability to keep an eye on the clipboard for links - -#### Interface #### - -As expected of a KDE app, KGet fits the aesthetic style of the desktop environment with similar icons and curves throughout. It’s quite a simple design as well, with only the most necessary functions available on the main toolbars and a minimal view of the current downloads. - -#### Integration #### - -KGet natively integrates with KDE’s Konqueror browser, although it’s not the most popular. Support for it in Firefox is done via FlashGot as usual, but there’s no real way to do it in Chromium. You can turn on a feature that asks if you want to download copied URLs, however it doesn’t parse the clipboard very well and sometimes wants to download text. - -#### Features #### - -The selection of features available are not that high. No scheduling, no batch operations and generally an almost bare-minimum amount of downloading features. The clipboard-scanning feature is a nice idea but it’s a bit buggy. It’s a little weird as the Settings menu looks like it’s designed to have more settings and options. - -#### Availability #### - -While it doesn’t come by default with a KDE install, it is available for any distro that supports KDE. It does need a few KDE libraries to run though, and it’s a bit tricky to find the source code. There isn’t a selection of binaries that you can use with a few distros either. - -#### Overall #### - -6/10 - -KGet doesnt really offer users a huge amount more than the download manager in the majority of popular browsers, although at least you can use it while the browsers are otherwise turned off. - -### [DownThemAll!][3] ### - -DownThemAll, being somewhat platform-independent, comes to Linux by way of Firefox as an add- on. This limits it somewhat to use with only Firefox, however as one of the most popular browsers in the world its tighter integration may be just what some are looking for in a download manager. - -![There are actually a whole lot of options available for DownThemAll! that make it very flexible](http://www.linuxuser.co.uk/wp-content/uploads/2014/08/down1.png) -There are actually a whole lot of options available for DownThemAll! that make it very flexible - -#### Interface #### - -Part of the integration in Firefox allows DownThemAll! to slot into the standard aesthetic of the browser, with right-clicking bringing up options alongside the normal downloading ones. The extra dialog menus are generally themed after Firefox as well, while the main download window is clean and based on its own design - -#### Integration #### - -It doesn’t integrate system-wide but its ability to camouflage itself with Firefox makes it seem like an extra part of the original browser. It can also run alongside the normal downloader if you want, and can find specific link types on a webpage with little manual filtering, and no need for copy and pasting. - -#### Features #### - -With the ability to control how many downloads can happen at once, limit bandwidth when not idle and advanced auto or manual filtering, DownThemAll! is full of excellent features that aid mass downloading. The One Click function also allows it to very quickly start downloads to a pre- determined folder faster than normal download functions. - -#### Availability #### - -Firefox is available on just about every distro and other operating system around, which makes DownThemAll! just as prolific. Unfortunately this is a double-edged sword, as Firefox may not be your browser of choice. It also adds a little weight to the browser, which isn’t the lightest to begin with. - -#### Overall #### - -7/10 - -DownThemAll! is excellent and if you use Firefox you may not need to use anything else. Not everyone uses Firefox as their preferred browser though, and it needs to be left on for the manager to start running. - -### [Steadyflow][4] ### - -Easily available in Ubuntu and some Debian-based distros, Steadyflow may be limited in terms of where you can get it but it’s got a reputation in some circles as one of the better managers available for any distro. It can read the clipboard for URLs, use GNOME’s preset proxies and has many other features. - -![The settings in Steady flow are extremely limiting and somewhat difficult to access](http://www.linuxuser.co.uk/wp-content/uploads/2014/08/steady1.png) -The settings in Steady flow are extremely limiting and somewhat difficult to access - -#### Interface #### - -Steadyflow is quite simple in appearance with a pleasant, clean interface that doesn’t clutter the download window. The dialog for adding downloads is simple enough, with basic options for how to treat it and where the file should live. It’s nothing we can really complain about, although it does remind us of the lack of features in the app. - -#### Integration #### - -Reading copied URLs is as standard and there’s a plug-in for Chromium to integrate with that. Again, you can use FlashGot to link it up to Firefox if that’s your preferred browser. You can’t really edit what it parses from the clipboard though and there’s no batch ability like in uGet and DownThemAll! - -#### Features #### - -Extremely lacking in features and the Options menu is very limited as well. The Pause and Resume function also doesn’t seem to work – a basic part of any browser’s file download features. Still, notifications and default action on finished files can be edited, along with an option to run a script once downloads are finished. - -#### Availability #### - -Only available on Ubuntu and there’s no easy way to get the source code for the app either. This means while it’s easily obtainable on all Ubuntu- based distros, it’s limited to these types of distros. As it’s not even the best download manager available on Linux, that shouldn’t be too big of a concern. - -#### Overall #### - -5/10 - -Frankly, not that good. With very basic options and limited to only working on Ubuntu, Steadyflow doesn’t do enough to differentiate itself from the standard downloading options you’ll get on your web browser. - -### And the winner is… ### - -#### uGet #### - -In this test we’ve proven that there is a place for download managers on modern computers, even if the better ones have cribbed from the torrent clients that seem to have usurped them. While torrenting may be a more effective way for some, with ISPs getting wiser to torrent traffic some people may get better results with a good download manager. Not only are transfer caps imposed by most major ISPs, some are even beginning to slow- down or even block torrent traffic in peak hours – even legal traffic such as distro ISOs and other free software are throttled. - -Steadyflow seems to be a very popular solution for this, but our usage and tests showed an underdeveloped and weak product. The much older uGet was the star of the show, with an amazing selection of features that can aid in downloading single items or filtering through an entire webpage for relevant items to grab. The same goes for DownThemAll!, the excellent Firefox add-on that, while stuck with Firefox, has just about the same level of features, albeit with better integration. - -If you’re choosing between the two it really comes down to what your preferred browser is and whether you need to have downloads and uploads going around the clock. DownThemAll! requires Firefox running, whereas uGet runs on its own, saving a lot of resources and electricity in the process – obviously this makes uGet a much better prospect for 24-hour data transferring and it really isn’t a major hassle to set up big batch downloads, or even just get the download information from your browser. - -Give download managers another chance. You will not be disappointed with the results. - --------------------------------------------------------------------------------- - -via: http://www.linuxuser.co.uk/reviews/top-4-linux-download-managers - -作者：Rob Zwetsloot -译者：[译者ID](https://github.com/译者ID) -校对：[校对者ID](https://github.com/校对者ID) - -本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 - -[1]:http://bit.ly/1mx4Uwz -[2]:http://bit.ly/1lilqU9 -[3]:http://bit.ly/1lilqU9 -[4]:http://bit.ly/1lilymS From 289fc1d826a678fedff1560206892285acc0ebfb Mon Sep 17 00:00:00 2001 From: H-mudcup Date: Fri, 23 Jan 2015 18:36:05 +0800 Subject: [PATCH 140/215] Create 20140819 Top 4 Linux download managers.md --- .../20140819 Top 4 Linux download managers.md | 150 ++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 translated/share/20140819 Top 4 Linux download managers.md diff --git a/translated/share/20140819 Top 4 Linux download managers.md b/translated/share/20140819 Top 4 Linux download managers.md new file mode 100644 index 0000000000..78c5b9ec12 --- /dev/null +++ b/translated/share/20140819 Top 4 Linux download managers.md @@ -0,0 +1,150 @@ +Translated By H-mudcup + +Linux排名前四的下载管理器 +================================================================================ +**改善并更好的管理你的网页下载，不论是镜像、抓取数据包还是仅仅更好的掌控你的文件。** + +下载管理器现在似乎已经是旧闻了，但是他们仍然非常有用。我们来比较一下Linux上排名前四的下载管理器。 + +### [uGet][1] ### + +如同很多其他的Linux应用一样uGet把体积轻巧和功能全面作为宣传亮点。它能处理有着过滤器的多线程数据流，还能与任何网络浏览器进行整合。它从当初的UrlGet开始，如今已经经过了十年。它还能在Windows上运行。 + +![uGet is actually very full-featured, with a lot of the kind of functions that advanced torrent clients use](http://www.linuxuser.co.uk/wp-content/uploads/2014/08/uget1.png) +uGet的功能其实非常全面，有很多先进的BT下载客户端所拥有的功能 + +#### 界面 #### + +uGet让我们想起了许多BT下载客户端的界面：有着活跃、结束、暂停等等对于不同下载任务的分类。尽管有很多的信息，但是他们都以非常简单明确的方式展现出来。旁边伴有高级选项的主下载控制非常易于使用。 + +#### 集成 #### + +它能查看到剪贴板里的URL，但uGet并没有在本地集成到Chromium和Firefox这些浏览器中。尽管如此，这两种浏览器还是能通过一些扩展程序连到uGet上：Firefox可以用Flashgot，Chromium则有专用的插件。虽然不是很理想，但是已经足够好了。 + +#### 功能 #### + +成熟的uGet完备了各种功能，包括按计划进行下载任务的启动和终止的高级功能，通过剪贴板批量下载，还能改变它在剪贴板里查找的文件的类型。虽然有插件选项，但不多。 + +#### 可得性 #### + +虽然在多数主要的发行版的软件库中都能得到它，但uGet网站上有着定期更新的适用于各种流行的发行版的二进制安装文件，还能轻易获得源代码。它的运行基于GTK 3+的图形库，所以它在某些桌面环境上的封装要比其他的小，然而我们得说，在KDE或其他Qt桌面上值得有这么一个额外的从属。 + +#### 总体评价 #### + +8/10 + +我们非常喜欢uGet——它种类繁多的功能和极高的人气，让它成为了能与Linux浏览器优雅结合的，万能的下载管理器。 + +### [KGet][2] ### + +KDE自家的下载管理器貌似原本是设计成与KDE的网页浏览器，Konqueror，一同工作的。它带来了我们这次测试中所期待的功能：多下载控制和对下载完成的文件计算校验和的能力。 + +![You need to manually activate the ability to keep an eye on the clipboard for links](http://www.linuxuser.co.uk/wp-content/uploads/2014/08/kget1.png) +你需要手动激活查看剪贴板中下载链接的功能 + +#### 界面 #### + +作为一个备受期待的KDE应用软件，KGet用一贯的图标和线条，与桌面环境的审美风格完美融合。它的设计也相当简洁，在主工具栏里只显示最必要的功能，当前下载也以最小界面显示。 + +#### 集成 #### + +KGet会集成到本地的KDE的Konqueror浏览器里，虽然它并不是最流行的浏览器。Firefox对KGet的支持是一如往常的是通过FlashGot完成的，但是在Chromium里并没有任何一种方法能真正的将它集成进去。你可以打开一个询问你是否想下载已复制的URL的功能，然而KGet对于剪贴板的分析并不是很好，有的时候会把文本下载下来。 + +#### 功能 #### + +能够选择的功能并不多。没有计划任务，没有批量下载，而且通常情况下，下载功能的数量几乎是光秃秃的。剪贴板扫描功能，想法很不错就是有点问题。设置菜单看起来有点怪怪的，因为它看起来应该设计有更多的功能。 + +#### 可得性 #### + +虽然它不会随着KDE默认安装，但可以在任何支持KDE的发行版里得到它。虽然它的运行需要几个KDE库，找到它的源代码也很困难。支持如此少的发行版，二进制安装文件也没什么可选的。 + +#### 总体评价 #### + +6/10 + +KGet并没有真正的给予用户比大多数主流浏览器内置下载管理器更强大的下载管理功能，但是，你可以在浏览器关闭的情况下使用它。 + +### [DownThemAll!][3] ### + +经由Firefox的附件进入Linux的DownThemAll某种程度上可以说是跨平台。这让它只能通过Firefox使用，然而作为世界上最流行的浏览器之一，它这更加紧凑的集成也许正是某些人对下载管理器所期望的。 + +![There are actually a whole lot of options available for DownThemAll! that make it very flexible](http://www.linuxuser.co.uk/wp-content/uploads/2014/08/down1.png) +其实在DownThemALL！上有很多选项可以设置，这让它非常的灵活 + +#### 界面 #### + +与Firefox的集成使得DownThemAll！的风格符合浏览器的审美标准，右键单击可以唤出普通下载和DownThemAll选项。额外的对话框菜单通常和Firefox使用相同的主题，然而主下载窗口则非常整洁并且是基于它本身的设计。 + +#### 集成 #### + +它并不是系统级集成，但是它伪装在Firefox中的能力让它看起来就像是原本浏览器的附加部分。如果你想，它就可以和普通下载器一同工作，在一点点手动过滤的帮助下，他还能找到网页上特定类型的链接，无需复制粘贴。 + +#### 功能 #### + +拥有着能同时控制多个下载任务的能力，限制而不荒废带宽以及先进的自动或手动过滤功能，DownThemAll！有着一大堆有助于大规模下载的优秀功能。“一键”功能还让它能非常迅速的启动到预定的文件夹中的下载。这比普通下载功能快多了。 + +#### 可得性 #### + +Firefox几乎能在所有的发行版和Linux以外的操作系统中获得。这让DownThemAll!也和它一样多产。不幸的是，这是一把双刃剑，因为Firefox可能不是你喜欢的浏览器。它还给浏览器增加了一些负担，让它的启动不再那么轻松。 + +#### 总体评价 #### + +7/10 + +DownThemAll!是很优秀的，如果你使用Firefox你也许就不再需要用任何其他的下载器了。然而并不是每个人都喜欢用Firefox浏览器，而且管理器需要在浏览器开启的情况下才能启动。 + +### [Steadyflow][4] ### + +Steadyflow很容易在Ubuntu和一些基于Debian的发行版中获得，获取到它的方式可能受到了限制，但它在某些圈子里一直被认为是你能得到的任何发行版里最好的管理器。它能查找剪贴板里的URL，使用GNOME的预设代理，还有许多其他的功能。 + +![The settings in Steady flow are extremely limiting and somewhat difficult to access](http://www.linuxuser.co.uk/wp-content/uploads/2014/08/steady1.png) +Steady flow里的设置非常受限，而且有点难以使用。 + +#### 界面 #### + +Steadyflow的形象相当简洁，令人愉悦的、干净的界面并没有让下载窗口变得混乱。添加下载任务的对话框足够简洁，只有基本的选项来设置下载任务，设置文件位置。真没什么可抱怨的，虽然它的确让我们觉得它的功能有点少。 + +#### 集成 #### + +查看复制的URL是标准配备，还有个让Chromium集成这个功能的插件。同样的，如果你喜欢用Firefox你可以通过Flashgot把它连到Firefox上。你并不能真正的编辑它从剪贴板里分析出的链接，它也不能像uGet和DownThemAll!一样批量下载。 + +#### 功能 #### + +极度缺少功能，选项菜单也受到很大限制。暂停和恢复功能看起来也不怎么好使——这是任何浏览器文件下载功能的最基本的部分。文件下载结束的通知和默认行为是可以设置的，还可以选择在文件下载完成之后运行脚本。 + +#### 可得性 #### + +只能在Ubuntu上获取，还不容易得到这个应用的源代码。这意味着虽然在所有基于Ubuntu的发行版中都能很容易的得到它，但也仅限于这些发行版。由于它不是Linux上能得到的最好的下载管理器，所以也不用想太多。 + +#### 总体评价 #### + +5/10 + +坦白说，没那么好。只有非常基本的选项，还只能在Ubuntu上使用，Steadyflow要想从你能选择的浏览器自带的标准下载选项中脱颖而出，它做的还不够。 + +### 那么获奖者是…… ### + +#### uGet #### + +在此次测试中，我们已经证明了现代电脑中还是有下载管理器的一席之地的，即便它们中的佼佼者们从BT下载客户端中抄袭了某些功能，貌似侵犯了他们的权益。对于某些人来说BT下载可能是个更有效率的方式，随着ISP们对待BT流量越来越机智，一些人可能用一个好的下载管理器就得到更好的效果。大多数主流ISP不仅仅强加了数据转移标记，在高峰时段他们中的一些甚至开始减慢或封掉BT流量——甚至连发行版的ISO文件和其他免费软件的合法数据流都被限制了。 + +对于这类问题Steadyflow看起来是非常受欢迎的解决方式，但我们的使用和测试显示出，它是一个未完成的简陋的产品。更加古老的uGet则是这场表演的明星，有着惊人数量的可选功能，这些功能既能在下载单一文件中有所帮助，还能在整个网页里过滤出相关元素进行抓取。DownThemAll！与之类似，优秀的Firefox有加分，但它也离不开Firefox，有着几乎同级别的功能，但集成效果更好。 + +如果你要在这两个里面选一个，那就得谈谈你喜欢哪个浏览器还有你是否需要昼夜下载或上传文件。DownThemAll!需要Firefox一直运行，然而uGet可以单独运行，为处理器节省了很多资源和电力——这显然让uGet在24小时数据传输上显得更有前途，而且对于它来说，设置一大批下载任务或只是从你的浏览器中获取下载信息，都不是什么难事。 + +再给下载管理器一个机会。结果绝不会让你失望。 + +-------------------------------------------------------------------------------- + +via: http://www.linuxuser.co.uk/reviews/top-4-linux-download-managers + +作者：Rob Zwetsloot +译者：[H-mudcup](https://github.com/H-mudcup) +校对：[校对者ID](https://github.com/校对者ID) + +本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出 + +[1]:http://bit.ly/1mx4Uwz +[2]:http://bit.ly/1lilqU9 +[3]:http://bit.ly/1lilqU9 +[4]:http://bit.ly/1lilymS From b90b0e6f2ffeeb15b474ef6852be052e0d0e9500 Mon Sep 17 00:00:00 2001 From: wxy Date: Sat, 24 Jan 2015 12:05:53 +0800 Subject: [PATCH 141/215] 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 142/215] =?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 143/215] [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 144/215] 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 145/215] 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 146/215] 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 147/215] 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 148/215] 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 149/215] 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 150/215] 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 151/215] 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 152/215] 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 153/215] =?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 154/215] =?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 155/215] 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 156/215] 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 157/215] 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 158/215] 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 6f3210474b26f7dc6ab7294c674ec8c8d662572e Mon Sep 17 00:00:00 2001 From: wxy Date: Sun, 25 Jan 2015 23:41:16 +0800 Subject: [PATCH 159/215] 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 160/215] 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 161/215] 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 162/215] =?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 163/215] 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 164/215] =?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 165/215] =?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 166/215] 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 167/215] 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 168/215] 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 169/215] 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 170/215] 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 171/215] 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 172/215] =?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 27e6ee1ab9b7f86e3e39447f3f606d04e73642c7 Mon Sep 17 00:00:00 2001 From: 2q1w2007 <2q1w2007@163.com> Date: Mon, 26 Jan 2015 20:32:48 +0800 Subject: [PATCH 173/215] =?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 174/215] 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 175/215] 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 176/215] 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 177/215] 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 178/215] 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 179/215] =?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 180/215] 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 181/215] 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 182/215] =?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 183/215] 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 184/215] 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 185/215] 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 186/215] =?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 187/215] =?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 188/215] =?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 189/215] =?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 190/215] 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 191/215] 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 192/215] =?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 193/215] 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 194/215] 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 195/215] 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 196/215] 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 197/215] 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 198/215] =?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 199/215] 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 200/215] 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 201/215] 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 202/215] =?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 203/215] =?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 204/215] =?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 39f39dccb7f1d82fb7126b5ec90c47ce2a707fc9 Mon Sep 17 00:00:00 2001 From: geekpi Date: Wed, 28 Jan 2015 11:09:24 +0800 Subject: [PATCH 205/215] 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 206/215] =?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 207/215] 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 208/215] 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 209/215] =?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 210/215] 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 211/215] =?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 212/215] 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 213/215] [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 214/215] [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 215/215] 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