www/distros free-distros.zh-cn.html po/free-dis...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/04/15 08:58:46

Modified files:
        distros        : free-distros.zh-cn.html 
        distros/po     : free-distros.zh-cn-en.html 
                         free-distros.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.zh-cn.po?cvsroot=www&r1=1.5&r2=1.6

Patches:
Index: free-distros.zh-cn.html
===================================================================
RCS file: /web/www/www/distros/free-distros.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- free-distros.zh-cn.html     22 Feb 2018 14:00:20 -0000      1.1
+++ free-distros.zh-cn.html     15 Apr 2018 12:58:45 -0000      1.2
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/distros/free-distros.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由的GNU/Linux发行版列表 - GNU工程 - 
自由软件基金会</title>
@@ -9,8 +9,24 @@
       href="http://www.gnu.org/distros/distros.rss";
       type="application/rss+xml" />
 <style type="text/css" media="screen"><!--
+h2 { margin-bottom: 1.5em; }
+h3 { margin: 1.8em 0 1.3em; }
+.summary {
+   padding-top: .7em; padding-bottom: 1.2em;
+   margin-top: 0;
+   border: .15em dotted #ccc;
+}
+.note { margin-top: .8em; margin-bottom: 1em; }
+p.highlight {
+   border: .1em solid #ccc;
+   margin-bottom: 0;
+}
+table.listing { margin-bottom: 3em; }
 td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
address@hidden (max-width: 48em) {
+   .note, .summary { width: 30em; max-width: 93%; }
+}
 -->
 </style>
 
@@ -19,16 +35,26 @@
 <h2>自由的GNU/Linux发行版</h2>
 
 <!--#include virtual="/licenses/fsf-licensing.zh-cn.html" -->
-<blockquote>
-<p><em><span class="highlight"><a
-href="http://www.fsf.org/";>自由软件基金会</a>不负责其他网站及å…
¶ä¿¡æ¯çš„有效性。</span></em></p> 
-</blockquote>
+<div class="summary">
+<h3 class="no-display">目录</h3>
+<ul>
+  <li><a href="#intro">简介</a></li>
+  <li><a 
href="#for-pc">个人电脑和工作站用的GNU/Linux发行版</a></li>
+  <li><a href="#small-distros">小型设备用的GNU/Linux发行版</a></li>
+  <li><a href="#howto-get">如何获得自由的GNU/Linux发行版</a></li>
+  <li><a href="#NewDistro">发现我们有所缺失？</a></li>
+</ul>
+<p class="highlight"><em><a 
href="http://www.fsf.org/";>自由软件基金会</a>不负责其他网站及å…
¶ä¿¡æ¯çš„有效性。</em></p> 
+</div>
+<hr class="no-display" />
+
+<h3 id="intro">简介</h3>
 
 <p>本页面列举了完全是自由言论般<a 
href="/philosophy/free-sw.html">自由的</a><a
-href="/gnu/linux-and-gnu.html">GNU/Linux</a>发行版。所有这些发行版都可以安è£
…åˆ°ç”µè„‘çš„ç¡¬ç›˜ï¼›å…¶ä¸­å¤šæ•°å¯ä»¥æ— 安装运行<sup><a
-href="#TransNote1">1</a></sup>。</p>
+href="/gnu/linux-and-gnu.html">GNU/Linux</a>发行版。<a
+href="/distros/free-non-gnu-distros.html">非GNU的自由系统发行版</a>单独列出。</p>
 
-<p>自由软件基金会推荐并支持这些GNU/Linux发行版，虽然我们除了自由之外没有使用å
…¶ä»–ä»»ä½•è¯„åˆ¤æ ‡å‡†ï¼›æ‰€ä»¥ï¼Œæˆ‘ä»¬æŒ‰ç…
§å­—æ¯é¡ºåºåˆ—ä¸¾å®ƒä»¬ã€‚æˆ‘ä»¬å»ºè®®ä½ 阅读这些简介并参考其相å…
³ç½‘ç«™åŠå…¶ä»–ä¿¡æ¯åšå‡ºæœ€é€‚åˆä½ 的选择。</p>
+<p>自由软件基金会推荐并支持这些GNU/Linux发行版，虽然<strong>我们除了自由之外没有使用å
…¶ä»–ä»»ä½•è¯„åˆ¤æ ‡å‡†</strong>；所以，我们按ç…
§å­—母顺序列举它们。</p>
 
 <p>这些发行版都是可以直接使用的完整系统，它们的开发者
承诺会遵守<a
 
href="/distros/free-system-distribution-guidelines.html">自由系统发行指南</a>。这意味着这些发行版只会åŒ
…
含并且只会推荐自由软件。他们会拒绝非自由的应用、非自由的开发平台、非自由的驱动程序、非自由的固件&ldquo;blobs&rdquo;、非自由的游戏程序、å
…¶ä»–任何非自由软件以及非自由的手册和文档。</p>
@@ -40,9 +66,11 @@
 
 <p>我们希望其他GNU/Linux发行版也变成完å…
¨çš„è‡ªç”±è½¯ä»¶ï¼Œé‚£ä¹ˆæˆ‘ä»¬å°±å¯ä»¥æŠŠå®ƒä»¬ä¹Ÿåˆ—åœ¨è¿™é‡Œã€‚å¦‚æžœä½ 
希望改善自由发行版的状态，请帮助开发现有的自由发行版，而不是再开始一个新的发行版。</p>
 
-<p><strong>所有这些发行版都可以安装到电脑的硬盘；å…
¶ä¸­å¤šæ•°å¯ä»¥æ— 安装
运行。并非所有的硬件都支持自由软件；每个发行版的网站都会说明它支持哪些硬件。</strong></p>
+<p>请了解并非所有硬件都为自由世界而存在；每个发行版都会介绍它的硬件支持æƒ
…å†µã€‚æˆ‘ä»¬å»ºè®®ä½ 阅读这些简介并参考其相关网站及å…
¶ä»–ä¿¡æ¯åšå‡ºæœ€é€‚åˆä½ 的选择。</p>
+
+<h3 id="for-pc">个人电脑和工作站用的GNU/Linux发行版</h3>
 
-<p>æˆ‘ä»¬åªæ˜¯ä¸ºäº†è‡ªç”±çš„åŽŸå› 
æ”¯æŒè¿™äº›å‘è¡Œç‰ˆã€‚æˆ‘ä»¬æ²¡æœ‰ä»»ä½•å…¶ä»–è¯„åˆ¤æ ‡å‡†ï¼›æ‰€ä»¥å®ƒä»¬æŒ‰ç…
§å­—æ¯é¡ºåºæŽ’åˆ—ã€‚æˆ‘ä»¬å»ºè®®ä½ 参考发行版的相关网站及å…
¶ä»–ä¿¡æ¯åšå‡ºæœ€é€‚åˆä½ 的选择。</p>
+<p>以下这些发行版都可以安装到电脑的硬盘运行并/æˆ–å¯ä»¥æ— 
安装运行<sup><a href="#TransNote1">1</a></sup>。</p>
 
 <!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
@@ -50,16 +78,16 @@
 <table class="listing">
   <thead><tr>
     <th>发行版</th>
-    <th>描述</th>
+    <th>简要描述</th>
   </tr></thead>
 
-<tr class="odd">
+  <tr class="odd">
    <td class="icon"><a href="http://www.blagblagblag.org/";>
        <img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/></a></td>
    <td>BLAG Linux and 
GNU，一个基于Fedora的GNU/Linux发行版。</td></tr>
 
  <tr class="even">
-   <td class="icon"><a href="http://dragora.org";>
+   <td class="icon"><a href="https://dragora.org/";>
        <img src="/graphics/distros-dragora.png"
             alt="Dragora GNU/Linux-Libre" /></a></td>
    <td>Dragora 
GNU/Linux-Libre，一个基于简洁原则的独立GNU/Linux发行版。</td></tr>
@@ -67,7 +95,7 @@
  <tr class="odd">
    <td class="icon"><a href="https://www.dyne.org/software/dynebolic/";>
        <img src="/graphics/distros-dyen.png" alt="Dynebolic" /></a></td>
-   
<td>Dynebolic，一个特别重视音视频编辑的GNU/Linux发行版。</td></tr>
+   
<td>Dynebolic，一个特别重视音频和视频编辑的GNU/Linux发行版。它是一个&ldquo;不活跃的&rdquo;发行版，通常用CDæ—
 å®‰è£…è¿è¡Œã€‚å› ä¸ºå®ƒä¸å†æœ‰å®‰å…
¨æ›´æ–°ï¼Œæ‰€ä»¥è¯·ç¦»çº¿ä½¿ç”¨ã€‚</td></tr>
 
  <tr class="even">
    <td class="icon"><a href="http://www.gnewsense.org/";>
@@ -79,41 +107,42 @@
        <img src="/software/guix/graphics/GuixSD-V.png" alt="guix" /></a></td>
    <td>Guix系统发行版是一个基于GNU 
Guix（发音是&ldquo;geeks&rdquo;）的发行版，这是纯粹的GNU系统功能åŒ
…管理器。 </td></tr>
 
-    
  <tr class="even">
    <td class="icon"><a href="https://musixdistro.wordpress.com/";>
        <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
-   
<td>Musix，一个基于Knoppix的GNU+Linux发行版，特别注重音频处理。</td></tr>
+   
<td>Musix，一个基于Knoppix的GNU+Linux发行版，特别重视音频制作。它是一个&ldquo;不活跃的&rdquo;发行版，通常用CDæ—
 å®‰è£…è¿è¡Œã€‚å› ä¸ºå®ƒä¸å†æœ‰å®‰å…
¨æ›´æ–°ï¼Œæ‰€ä»¥è¯·ç¦»çº¿ä½¿ç”¨ã€‚</td></tr>
 
  <tr class="odd">
-   <td class="icon"><a href="http://www.parabola.nu/https/";>
+   <td class="icon"><a href="https://www.parabola.nu";>
        <img src="/graphics/distros-parabola.png"
             alt="Parabola GNU/Linux-libre" /></a></td>
    <td>Parabola 
GNU/Linux-libre，一个基于Arch的发行版，注重简洁的软件包
和系统管理。</td></tr>
 
  <tr class="even">
    <td class="icon"><a href="https://pureos.net/";>
-       <img src="/graphics/pureos-logo-small.png"
+       <img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /></a></td>
    <td>PureOS，基于Debian的GNU发行版，专注于隐私、安å…
¨å’Œä¾¿åˆ©ã€‚</td></tr>
  
  <tr class="odd">
-   <td class="icon"><a href="http://trisquel.info/";>
+   <td class="icon"><a href="https://trisquel.info/";>
        <img src="/graphics/distros-trisquel.png" alt="Trisquel" /></a></td>
    
<td>Trisquel，一个基于面向小企业、家庭用户和教育中心发行版Ubuntu的GNU/Linux发行版。</td></tr>
 
 <tr class="even">
    <td class="icon"><a href="http://www.ututo.org/";>
        <img src="/graphics/distros-ututo.png" alt="Ututo" /></a></td>
-   <td>Ututo 
XS，一个基于Gentoo的GNU/Linux发行版。它是第一个由GNU工程确认的完å
…¨è‡ªç”±çš„GNU/Linux系统。</td></tr>
+   <td>Ututo 
S，一个100%自由的GNU/Linux发行版。它是第一个由GNU工程确认的完å
…¨è‡ªç”±çš„GNU/Linux系统。</td></tr>
 
 </table>
 
-<p 
id="small-distros">以下列举了一些小型的系统发行版。它们针对的是资源有限的设备，比如æ—
 çº¿è·¯ç”±å™¨ã€‚ä¸€ä¸ªè‡ªç”±çš„å°åž‹ç³»ç»Ÿå‘è¡Œç‰ˆä¸æ˜¯è‡ªåŠ 
载的，但是它必须可以从上面列举的完å…
¨è‡ªç”±çš„ç³»ç»Ÿå¼€å‘å’Œæž„é€ 
，也许此过程需要一些和该小型系统一起发布的自由工å…
·ã€‚</p>
+<h3 id="small-distros">小型设备用的GNU/Linux发行版</h3>
+
+<p>以下列举了一些小型的系统发行版。它们针对的是资源有限的设备，比如æ—
 çº¿è·¯ç”±å™¨ã€‚ä¸€ä¸ªè‡ªç”±çš„å°åž‹ç³»ç»Ÿå‘è¡Œç‰ˆä¸æ˜¯è‡ªåŠ 
载的，但是它必须可以从上面列举的完å…
¨è‡ªç”±çš„ç³»ç»Ÿå¼€å‘å’Œæž„é€ 
，也许此过程需要一些和该小型系统一起发布的自由工å…
·ã€‚</p>
 <table class="listing">
   <thead><tr>
     <th>发行版</th>
-    <th>描述</th>
+    <th>简要描述</th>
   </tr></thead>
 
  <tr class="odd">
@@ -127,16 +156,17 @@
 
 </table>
 
+<h3 id="howto-get">如何获得自由的GNU/Linux发行版</h3>
+
 <p>除了自己的网站外，多数发行版都可以在<a
 
href="http://mirror.fsf.org/";>mirror.fsf.org</a>找到。请按需下载或镜像这些发行版，建议使用rsync。自由发行版的维护è€
…可以写信给<a
 href="mailto:address@hidden";>FSF系统管理员</a>æ¥è¯·æ±‚æ·»åŠ é•œåƒã€‚</p>
 
-<p id="other-free">基于非GNU系统的自由系统发行版单独列在<a 
href="/distros/free-non-gnu-distros.html">此处</a>。</p>
-
-<p>我们单独列举了<a href="/links/companies.html">销售预先安装
了自由GNU/Linux系统的硬件的公司</a>。</p>
-
 <p><a href="/software/software.html">单独的GNU软件包
</a>（大多数都包
含在列在此处的自由发行版中）会单独介绍。</p>
 
+<p>我们单独列举了<a
+href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom";>销售预å
…ˆå®‰è£…了自由GNU/Linux系统的硬件的公司</a>。</p>
+
 <h3 id="NewDistro">发现我们有所缺失？</h3>
 
 <p>ä½ æ˜¯å¦æœŸå¾…æŸä¸ªå‘è¡Œç‰ˆè¢«åˆ—å‡ºï¼Œä½†æ˜¯æ²¡æ‰¾åˆ°ï¼Ÿé¦–å…ˆï¼Œè¯·é˜…
读<a
@@ -201,7 +231,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -217,7 +247,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/02/22 14:00:20 $
+$Date: 2018/04/15 12:58:45 $
 
 <!-- timestamp end -->
 </p>

Index: po/free-distros.zh-cn-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/free-distros.zh-cn-en.html       22 Feb 2018 14:00:22 -0000      1.1
+++ po/free-distros.zh-cn-en.html       15 Apr 2018 12:58:46 -0000      1.2
@@ -1,43 +1,67 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 <title>List of Free GNU/Linux Distributions
 - GNU Project - Free Software Foundation</title>
 <link rel="alternate" title="Free GNU/Linux distributions"
       href="http://www.gnu.org/distros/distros.rss";
       type="application/rss+xml" />
 <style type="text/css" media="screen"><!--
+h2 { margin-bottom: 1.5em; }
+h3 { margin: 1.8em 0 1.3em; }
+.summary {
+   padding-top: .7em; padding-bottom: 1.2em;
+   margin-top: 0;
+   border: .15em dotted #ccc;
+}
+.note { margin-top: .8em; margin-bottom: 1em; }
+p.highlight {
+   border: .1em solid #ccc;
+   margin-bottom: 0;
+}
+table.listing { margin-bottom: 3em; }
 td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
address@hidden (max-width: 48em) {
+   .note, .summary { width: 30em; max-width: 93%; }
+}
 --></style>
-
 <!--#include virtual="/distros/po/free-distros.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Free GNU/Linux distributions</h2>
+
 <!--#include virtual="/licenses/fsf-licensing.html" -->
+<div class="summary">
+<h3 class="no-display">Table of Contents</h3>
+<ul>
+  <li><a href="#intro">Introduction</a></li>
+  <li><a href="#for-pc">GNU/Linux distros for PCs and workstations</a></li>
+  <li><a href="#small-distros">Small GNU/Linux distros</a></li>
+  <li><a href="#howto-get">How to get free GNU/Linux distros</a></li>
+  <li><a href="#NewDistro">See something we missed?</a></li>
+</ul>
+<p class="highlight"><em>The <a href="http://www.fsf.org/";>Free
+Software Foundation</a> is not responsible for other websites, or how
+up-to-date their information is.</em></p> 
+</div>
+<hr class="no-display" />
 
-<blockquote>
-<p><em><span class="highlight">The <a href="http://www.fsf.org/";>Free
-Software Foundation</a> is not responsible for other web sites, or how
-up-to-date their information is.</span></em></p> 
-</blockquote>
+<h3 id="intro">Introduction</h3>
 
 <p>This page lists the <a href="/gnu/linux-and-gnu.html">GNU/Linux</a>
 distributions that are
 entirely <a href="/philosophy/free-sw.html">free</a> as in freedom.
-All of the distributions that follow are installable to a
-computer's hard drive; most can be run live.</p>
+<a href="/distros/free-non-gnu-distros.html">Non-GNU-based
+free system distributions</a> are listed separately.</p>
 
 <p>The Free Software Foundation recommends and endorses these GNU/Linux
-distros, although we do not try to judge or compare them based on any
-criterion other than freedom; therefore, we list them in alphabetical
-order.  We encourage you to read these brief descriptions and to
-consult their respective web sites and other information to choose the
-one best for you.</p>
+distros, although <strong>we do not try to judge or compare them based on any
+criterion other than freedom</strong>; therefore, we list them in alphabetical
+order.</p>
 
 <p>These distros are ready-to-use full systems whose developers have made
 a commitment to follow the 
 <a href="/distros/free-system-distribution-guidelines.html">Guidelines
-for Free System Distributions</a>.  This means these distros will
+for Free System Distributions</a>.  This means they will
 include, and propose, exclusively free software.  They will reject
 nonfree applications, nonfree programming platforms, nonfree drivers,
 nonfree firmware &ldquo;blobs&rdquo;, nonfree games, and any other
@@ -62,17 +86,18 @@
 improve the state of free distros, helping to develop an existing free
 distro contributes more than starting a new one.</p>
 
-<p><strong>All of the distributions that follow are installable to a
-computer's hard drive; most can be run live.  Not all hardware works
-in the free world; each distro's site should say which hardware it
-supports.</strong></p>
-
-<p>We endorse these distros only for freedom.  We do not try to judge
-or compare these distros based on any other criterion; therefore, we
-list them in alphabetical order.  We suggest you consult their
-respective web sites and other information to judge which one is most
+<p>Please note that not all hardware works in the free world; each
+distro's site should say which hardware it supports. We suggest that,
+after reading the short descriptions below, you consult these sites as
+well as other available information, to judge which distro is most
 convenient for you.</p>
 
+<h3 id="for-pc">GNU/Linux distros for PCs and
+workstations</h3>
+
+<p>The distributions that follow are installable to a computer's hard
+drive and/or can be run live.</p>
+
 <!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
      http://www.gnu.org/server/standards/index.html#distros -->
@@ -80,16 +105,16 @@
 <table class="listing">
   <thead><tr>
     <th>Distribution</th>
-    <th>Description</th>
+    <th>Brief Description</th>
   </tr></thead>
 
-<tr class="odd">
+  <tr class="odd">
    <td class="icon"><a href="http://www.blagblagblag.org/";>
        <img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/></a></td>
    <td>BLAG Linux and GNU, a GNU/Linux distribution based on Fedora.</td></tr>
 
  <tr class="even">
-   <td class="icon"><a href="http://dragora.org";>
+   <td class="icon"><a href="https://dragora.org/";>
        <img src="/graphics/distros-dragora.png"
             alt="Dragora GNU/Linux-Libre" /></a></td>
    <td>Dragora GNU/Linux-Libre, an independent GNU/Linux distribution
@@ -99,7 +124,9 @@
    <td class="icon"><a href="https://www.dyne.org/software/dynebolic/";>
        <img src="/graphics/distros-dyen.png" alt="Dynebolic" /></a></td>
    <td>Dynebolic, a GNU/Linux distribution with special emphasis on audio 
-       and video editing.</td></tr>
+       and video editing. This is a &ldquo;static&rdquo; distro, normally
+       run from a live CD. Since it will not receive security updates, it
+       should be used offline.</td></tr>
 
  <tr class="even">
    <td class="icon"><a href="http://www.gnewsense.org/";>
@@ -114,15 +141,16 @@
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
        functional package manager for the GNU system. </td></tr>
 
-    
  <tr class="even">
    <td class="icon"><a href="https://musixdistro.wordpress.com/";>
        <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
    <td>Musix, a GNU+Linux distribution based on Knoppix, with special
-       emphasis on audio production.</td></tr>
+       emphasis on audio production. This is a &ldquo;static&rdquo;
+       distro, normally run from a live CD. Since it will not receive
+       security updates, it should be used offline.</td></tr>
 
  <tr class="odd">
-   <td class="icon"><a href="http://www.parabola.nu/https/";>
+   <td class="icon"><a href="https://www.parabola.nu";>
        <img src="/graphics/distros-parabola.png"
             alt="Parabola GNU/Linux-libre" /></a></td>
    <td>Parabola GNU/Linux-libre, a distribution based on Arch that
@@ -130,13 +158,13 @@
 
  <tr class="even">
    <td class="icon"><a href="https://pureos.net/";>
-       <img src="/graphics/pureos-logo-small.png"
+       <img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /></a></td>
    <td>PureOS, a GNU distribution based on Debian with a focus on
        privacy, security, and convenience.</td></tr>
  
  <tr class="odd">
-   <td class="icon"><a href="http://trisquel.info/";>
+   <td class="icon"><a href="https://trisquel.info/";>
        <img src="/graphics/distros-trisquel.png" alt="Trisquel" /></a></td>
    <td>Trisquel, a GNU/Linux distribution based on Ubuntu that's oriented 
  toward small enterprises, domestic users and educational centers.</td></tr>
@@ -144,12 +172,14 @@
 <tr class="even">
    <td class="icon"><a href="http://www.ututo.org/";>
        <img src="/graphics/distros-ututo.png" alt="Ututo" /></a></td>
-   <td>Ututo XS, a GNU/Linux distribution based on Gentoo.  It was the first
+   <td>Ututo S, a GNU/Linux 100% free distribution.  It was the first
        fully free GNU/Linux system recognized by the GNU Project.</td></tr>
 
 </table>
 
-<p id="small-distros">Below is a list of small system distributions. These 
+<h3 id="small-distros">Small GNU/Linux distros</h3>
+
+<p>Below is a list of small system distributions. These 
    distributions are meant for devices with limited resources, like a 
    wireless router for example. A free small system distribution is not 
    self-hosting, but it must be developable and buildable on top of one of 
@@ -158,7 +188,7 @@
 <table class="listing">
   <thead><tr>
     <th>Distribution</th>
-    <th>Description</th>
+    <th>Brief Description</th>
   </tr></thead>
 
  <tr class="odd">
@@ -178,6 +208,8 @@
 
 </table>
 
+<h3 id="howto-get">How to get free GNU/Linux distros</h3>
+
 <p>In addition to their own sites, many of these distributions are
 available from <a href="http://mirror.fsf.org/";>mirror.fsf.org</a>.
 Feel free to download or mirror the distributions from there,
@@ -185,16 +217,15 @@
 mirror for their project by mailing the 
 <a href="mailto:address@hidden";>FSF sysadmins</a>.</p>
 
-<p id="other-free">Non-GNU-based free system distributions are
-listed in <a href="/distros/free-non-gnu-distros.html">a separate file</a>.</p>
-
-<p>We list <a href="/links/companies.html">companies that sell hardware
-preinstalled with a free GNU/Linux distribution</a> separately.</p>
-
 <p><a href="/software/software.html">Individual GNU
 packages</a> (most of which are included in the free distributions here) 
 are described separately.</p>
 
+<p>We list <a
+href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom";>
+companies that sell hardware
+preinstalled with a free GNU/Linux distribution</a> separately.</p>
+
 <h3 id="NewDistro">See something we missed?</h3>
 
 <p>Do you know about a distribution that you expected to find on our
@@ -263,7 +294,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -273,7 +304,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/02/22 14:00:22 $
+$Date: 2018/04/15 12:58:46 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/free-distros.zh-cn.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.zh-cn.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/free-distros.zh-cn.po    15 Apr 2018 12:48:55 -0000      1.5
+++ po/free-distros.zh-cn.po    15 Apr 2018 12:58:46 -0000      1.6
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-04-14 11:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""