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

[lu...@apache.org]

Author: luke1410
Date: Wed Dec 13 23:01:55 2017
New Revision: 1818078

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

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

Propchange: subversion/site/publish/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 13 23:01:55 2017
@@ -1 +1 @@
-/subversion/site/staging:1815037-1815041,1815121-1815122,1815143,1816503,1816509-1816618,1816773-1816926,1816940-1817033,1817142-1817435,1817659
+/subversion/site/staging:1815037-1815041,1815121-1815122,1815143,1816503,1816509-1816618,1816773-1816926,1816940-1817033,1817142-1817435,1817659,1817713-1817717

Modified: subversion/site/publish/docs/release-notes/1.6.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.6.html?rev=1818078&r1=1818077&r2=1818078&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.6.html (original)
+++ subversion/site/publish/docs/release-notes/1.6.html Wed Dec 13 23:01:55 2017
@@ -473,8 +473,8 @@ external.</p>
 </h4>
 
 <p><!-- XXX -->Need to document possible incompatibilities (see
-<a href="http://subversion.tigris.org/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 -->
 
@@ -737,7 +737,7 @@ reach those files, too.</p>
     title="Link to this section">&para;</a>
 </h4>
 
-<p>See this <a href="http://blogs.open.collab.net/svn/2009/03/sparse-directories-now-with-exclusion.html">blog post</a> for more examples and information.</p>
+<p>See this <a href="http://blogs.collab.net/subversion/sparse-directories-now-with-exclusion>blog post</a> for more examples and information.</p>
 
 </div>  <!-- further-reading -->
 
@@ -891,8 +891,8 @@ without this option:
 
 <p>The <tt>pre-lock</tt> hook can now specify the lock-token string
 via the hook's stdout; see <a
-href="http://svn.collab.net/viewcvs/svn?rev=32778&amp;view=rev"
->r32778</a> for details.  Note that when the hook uses this feature,
+href="https://svn.apache.org/viewvc?view=revision&revision=872852"
+>r872852</a> for details.  Note that when the hook uses this feature,
 it must take responsibility for ensuring that lock tokens are unique
 across the repository.</p>
 

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=1818078&r1=1818077&r2=1818078&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.6.zh.html (original)
+++ subversion/site/publish/docs/release-notes/1.6.zh.html Wed Dec 13 23:01:55 2017
@@ -698,8 +698,8 @@ href="https://svn.apache.org/repos/asf/s
 </h3>
 
 <p><tt>pre-lock</tt>钩子现在可以通过标准输出指明锁定令牌字符串；详细请看<a
-href="http://svn.collab.net/viewcvs/svn?rev=32778&amp;view=rev"
->r32778</a>。注意，当钩子用了这个特性，必须确保锁定令牌在版本库范围是唯一的。</p>
+href="https://svn.apache.org/viewvc?view=revision&revision=872852"
+>r872852</a>。注意，当钩子用了这个特性，必须确保锁定令牌在版本库范围是唯一的。</p>
 
 <p>Subversion 1.6有许多新的修正的API需要列出来，一般的API信息可以看<a
 href="/docs/#api" >Subversion API</a>，如果你使用Subversion API开发第三方的客户端程序，你可能需要看接口的头文件来查看发生的变更。</p>