Merge from the English version.

MFen:	r52445 -> r54642
This commit is contained in:
Guangyuan Yang 2020-11-11 18:28:32 +00:00
parent 8a64cf7aa0
commit 73c26ecedd
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=54683

View file

@ -2,7 +2,7 @@
<!-- $FreeBSD$ -->
<!-- The FreeBSD Simplified Chinese Documentation Project -->
<!-- Original Revision: r52445 -->
<!-- Original Revision: r54642 -->
<!ENTITY nav.about '
<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
@ -38,7 +38,6 @@
<li><a href="&enbase;/community/irc.html">IRC</a></li>
<li><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/eresources-news.html">新闻组</a></li>
<li><a href="&enbase;/usergroups.html">用户组</a></li>
<li><a href="https://planet.FreeBSD.org/">博客</a></li>
<li><a href="&enbase;/events/events.html">近期活动</a></li>
<li><a href="&enbase;/community/webresources.html">Web 资源</a></li>
<li><a href="http://serverfault.com/questions/tagged/freebsd">常见问题解答(外部链接)</a></li>
@ -70,6 +69,7 @@
<li><a href="&enbase;/doc/en_US.ISO8859-1/books/faq/">常见问题解答</a></li>
<li><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/">使用手册</a></li>
<li><a href="&cgibase;/man.cgi">Man 手册</a></li>
<li><a href="https://papers.FreeBSD.org">演示和论文</a></li>
<li><a href="&enbase;/docs/books.html">在线图书和文章</a></li>
<li><a href="&enbase;/publish.html">出版物</a></li>
<li><a href="&enbase;/docs/webresources.html">Web 资源</a></li>
@ -101,13 +101,11 @@
<li><a href="&base;/releases/">发行版信息</a>
<ul>
<li>生产适用版本: <br />
<a href="&u.rel.announce;">&rel.current;</a></li>
<?ignore
<a href="&u.rel122.announce;">&rel122.current;</a></li>
<li>生产适用版本: <br />
<a href="&u.rel1.announce;">&rel1.current;</a></li>
<a href="&u.rel121.announce;">&rel121.current;</a></li>
<li>生产适用版本: <br />
<a href="&u.rel2.announce;">&rel2.current;</a></li>
?>
<a href="&u.rel114.announce;">&rel114.current;</a></li>
</ul>
</li>
<li><a href="&enbase;/snapshots/">快照版本</a>