svn commit: r1817861 - in /subversion/site/publish: ./ docs/release-notes/1.6.zh.html

[luke1410]

Author: luke1410
Date: Mon Dec 11 22:38:54 2017
New Revision: 1817861

URL: http://svn.apache.org/viewvc?rev=1817861&view=rev
Log:
* site/publish: Merge from staging.

Modified:
    subversion/site/publish/   (props changed)
    subversion/site/publish/docs/release-notes/1.6.zh.html

Propchange: subversion/site/publish/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 11 22:38:54 2017
@@ -1 +1 @@
-/subversion/site/staging:1815037-1815041,1815121-1815122,1815143,1816503,1816509-1816618,1816773-1816926,1816940-1817033,1817142-1817145,1817659
+/subversion/site/staging:1815037-1815041,1815121-1815122,1815143,1816503,1816509-1816618,1816773-1816926,1816940-1817033,1817142-1817435,1817659

Modified: subversion/site/publish/docs/release-notes/1.6.zh.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.6.zh.html?rev=1817861&r1=1817860&r2=1817861&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.6.zh.html (original)
+++ subversion/site/publish/docs/release-notes/1.6.zh.html Mon Dec 11 22:38:54 
2017
@@ -18,7 +18,7 @@
 
 <h1 style="text-align: center">Subversion 1.6发布说明</h1>
 
-<p>本文根据原文r36726，由<a 
href="http://www.subversion.org.cn/";>Subversion中文站</a>的中文化翻译小组翻译，欢迎各位参与翻译工作，åŠ
 å…¥åœ°å€ï¼š<a 
href="https://code.google.com/archive/p/svncndoc/";>https://code.google.com/archive/p/svncndoc/</a>，参与翻译的志愿è€
…包括<a href="http://rocksun.cn/";>rocksun</a>。</p>
+<p>本文根据原文r36726，由<a href="http://www.subversion.org.cn/";>XXX 
(dead link) 
Subversion中文站</a>的中文化翻译小组翻译，欢迎各位参与翻译工作，åŠ
 å…¥åœ°å€ï¼š<a 
href="https://code.google.com/archive/p/svncndoc/";>https://code.google.com/archive/p/svncndoc/</a>，参与翻译的志愿è€
…包括<a href="http://rocksun.cn/";>XXX (dead link) rocksun</a>。</p>
 
 <div class="h2" id="news">
 <h2>Subversion 1.6的新东西
@@ -367,8 +367,8 @@ Keyring, Mac OS Keychain以及Wind
 </h4>
 
 <p>XXX: Need to document possible incompatibilies (see
-<a href="/ds/viewMessage.do?dsForumId=462&amp;dsMessageId=86142">this
-thread)</a></p>
+<a href="https://svn.haxx.se/dev/archive-2008-10/0213.shtml";>this thread</a>
+)</p>
 
 </div>  <!-- shell-quoting-externals -->
 
@@ -567,7 +567,7 @@ update</code>的<code>--set-depth</co
     title="Link to this section">&para;</a>
 </h4>
 
-<p>看这篇<a 
href="http://www.subversion.org.cn/submerged/?p=111";>博文</a>。</p>
+<p>看这篇<a href="http://www.subversion.org.cn/submerged/?p=111";>XXX (dead 
link) 博文</a>。</p>
 
 </div>  <!-- further-reading -->