Author: luke1410
Date: Mon Dec 18 00:16:29 2017
New Revision: 1818524

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

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

Propchange: subversion/site/publish/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 18 00:16:29 2017
@@ -1 +1 @@
-/subversion/site/staging:1815037-1815041,1815121-1815122,1815143,1816503,1816509-1816618,1816773-1816926,1816940-1817033,1817142-1817435,1817659,1817713-1817720,1817862,1818080
+/subversion/site/staging:1815037-1815041,1815121-1815122,1815143,1816503,1816509-1816618,1816773-1816926,1816940-1817033,1817142-1817435,1817659,1817713-1817720,1817862,1817969,1818080,1818083,1818206

Modified: subversion/site/publish/docs/release-notes/1.3.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.3.html?rev=1818524&r1=1818523&r2=1818524&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.3.html (original)
+++ subversion/site/publish/docs/release-notes/1.3.html Mon Dec 18 00:16:29 2017
@@ -434,13 +434,13 @@ working, even with older clients.</p>
 
 <p>However, programs that interact with the working copy property
 files without using the official Subversion APIs or binaries may
-experience problems.  <a href="http://tmate.org/svn/";>JavaSVN</a> is
-the only project that we know of that falls into this category, and
-they have been notified accordingly.  If you happen to be using or
-developing software that, similarly, bypasses the Subversion APIs,
-then you may need to make a minor alteration to the parsing routines.
-See <a href="https://svn.apache.org/r856929";>revision 16855</a> of
-the Subversion repository for details.</p>
+experience problems.  JavaSVN (now known as
+<a href="https://svnkit.com/";>SVNKit</a>) is the only project that we know of
+that falls into this category, and they have been notified accordingly.  If you
+happen to be using or developing software that, similarly, bypasses the
+Subversion APIs, then you may need to make a minor alteration to the
+parsing routines. See <a href="https://svn.apache.org/r856929";
+>revision 16855</a> of the Subversion repository for details.</p>
 
 </div>  <!-- wc-props-change -->
 </div>  <!-- enhancements -->

Modified: subversion/site/publish/faq.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1818524&r1=1818523&r2=1818524&view=diff
==============================================================================
--- subversion/site/publish/faq.html (original)
+++ subversion/site/publish/faq.html Mon Dec 18 00:16:29 2017
@@ -1009,8 +1009,8 @@ in MOVE and COPY requests, so you have t
 <ul>
 <li><a href="http://www.onlamp.com/pub/a/onlamp/excerpt/ssh_11/index3.html";
 >http://www.onlamp.com/pub/a/onlamp/excerpt/ssh_11/index3.html</a></li>
-<li><a href="http://csociety.ecn.purdue.edu/~sigos/projects/ssh/forwarding/";
->http://csociety.ecn.purdue.edu/~sigos/projects/ssh/forwarding/</a></li>
+<li><a 
href="https://engineering.purdue.edu/ECN/Support/KB/Docs/SSHIntroductionToSSH";
+>https://engineering.purdue.edu/ECN/Support/KB/Docs/SSHIntroductionToSSH</a></li>
 <li><a href="http://www.zip.com.au/~roca/ttssh.html";>TTSSH: A Win32 SSH client 
capable of port forwarding</a></li>
 </ul>
 
@@ -2058,13 +2058,11 @@ OpenSSH keys and <b><tt>pageant</tt></b>
 document, but a <a
 
href="https://www.google.com/search?hl=en&amp;lr=&amp;ie=UTF-8&amp;q=%22ssh-agent%22";
 >Google search for "ssh-agent"</a> will quickly get you answers.  Or
-if you're <i>really</i> impatient, try one of these:</p>
+if you're <i>really</i> impatient, try this one:</p>
 
 <pre>
    <a href="http://mah.everybody.org/docs/ssh";
            >http://mah.everybody.org/docs/ssh</a>
-   <a href="http://kimmo.suominen.com/docs/ssh/";
-           >http://kimmo.suominen.com/docs/ssh/</a>
 </pre>
 
 </div>

Modified: subversion/site/publish/faq.ja.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/faq.ja.html?rev=1818524&r1=1818523&r2=1818524&view=diff
==============================================================================
--- subversion/site/publish/faq.ja.html (original)
+++ subversion/site/publish/faq.ja.html Mon Dec 18 00:16:29 2017
@@ -654,7 +654,7 @@ IPアドレスは10.1.1.5
 
 <ul>
 <li><a 
href="http://www.onlamp.com/pub/a/onlamp/excerpt/ssh_11/index3.html";>http://www.onlamp.com/pub/a/onlamp/excerpt/ssh_11/index3.html</a></li>
-<li><a 
href="http://csociety.ecn.purdue.edu/~sigos/projects/ssh/forwarding/";>http://csociety.ecn.purdue.edu/~sigos/projects/ssh/forwarding/</a></li>
+<li><a 
href="https://engineering.purdue.edu/ECN/Support/KB/Docs/SSHIntroductionToSSH";>https://engineering.purdue.edu/ECN/Support/KB/Docs/SSHIntroductionToSSH</a></li>
 <li><a href="http://www.zip.com.au/~roca/ttssh.html";>TTSSH: A Win32 SSH client 
capable of port forwarding</a></li>
 </ul>
 
@@ -1292,8 +1292,6 @@ OpenSSH の鍵をインã
 <pre>
    <a href="http://mah.everybody.org/docs/ssh";
            >http://mah.everybody.org/docs/ssh</a>
-   <a href="http://kimmo.suominen.com/docs/ssh/";
-           >http://kimmo.suominen.com/docs/ssh/</a>
 </pre>
 
 </div>

Modified: subversion/site/publish/faq.zh.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/faq.zh.html?rev=1818524&r1=1818523&r2=1818524&view=diff
==============================================================================
--- subversion/site/publish/faq.zh.html (original)
+++ subversion/site/publish/faq.zh.html Mon Dec 18 00:16:29 2017
@@ -623,8 +623,8 @@ $ svn checkout svn+ssh://your.domain.com
 <ul>
 <li><a href="http://www.onlamp.com/pub/a/onlamp/excerpt/ssh_11/index3.html";
 >http://www.onlamp.com/pub/a/onlamp/excerpt/ssh_11/index3.html</a></li>
-<li><a href="http://csociety.ecn.purdue.edu/~sigos/projects/ssh/forwarding/";
->http://csociety.ecn.purdue.edu/~sigos/projects/ssh/forwarding/</a></li>
+<li><a 
href="https://engineering.purdue.edu/ECN/Support/KB/Docs/SSHIntroductionToSSH";
+>https://engineering.purdue.edu/ECN/Support/KB/Docs/SSHIntroductionToSSH</a></li>
 <li><a href="http://www.zip.com.au/~roca/ttssh.html";>TTSSH: A Win32 SSH client 
capable of port forwarding</a></li>
 </ul>
 
@@ -1211,8 +1211,6 @@ href="https://www.google.com/search?hl=e
 <pre>
    <a href="http://mah.everybody.org/docs/ssh";
            >http://mah.everybody.org/docs/ssh</a>
-   <a href="http://kimmo.suominen.com/docs/ssh/";
-           >http://kimmo.suominen.com/docs/ssh/</a>
 </pre>
 
 </div>


Reply via email to