Author: luke1410 Date: Tue Dec 19 22:10:34 2017 New Revision: 1818723 URL: http://svn.apache.org/viewvc?rev=1818723&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 Tue Dec 19 22:10:34 2017 @@ -1 +1 @@ -/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 +/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,1818340-1818384 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=1818723&r1=1818722&r2=1818723&view=diff ============================================================================== --- subversion/site/publish/docs/release-notes/1.3.html (original) +++ subversion/site/publish/docs/release-notes/1.3.html Tue Dec 19 22:10:34 2017 @@ -150,11 +150,9 @@ package. If this happens to you, you wi to <a href="/faq.html#bdb43-upgrade">upgrade existing BerkeleyDB-based repositories to 4.3.</a></p> -<p>Since Subversion 1.2, the <a -href="http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91" ->Windows binary distributions</a> of Subversion from Branko Čibej -use Berkeley DB 4.3. If you are upgrading from an older version, the -above may be of concern to you.</p> +<p>Since Subversion 1.2, the Windows binary distributions of Subversion from +Branko Čibej use Berkeley DB 4.3. If you are upgrading from an older +version, the above may be of concern to you.</p> </div> <!-- bdb-upgrade --> </div> <!-- compatibility --> Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1818723&r1=1818722&r2=1818723&view=diff ============================================================================== --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Tue Dec 19 22:10:34 2017 @@ -187,7 +187,6 @@ a <tt>file:</tt> URL?</a></li> <li><a href="#http-301-error">I can see my repository in a web browser, but 'svn checkout' gives me an error about "301 Moved Permanently". What's wrong?</a></li> -<li><a href="#digest-auth">Why doesn't HTTP Digest auth work?</a></li> <li><a href="#xlc-compile">Compiling with xlc on AIX, I get compilation errors. What's wrong?</a></li> <li><a href="#nonrecursive-checkout">I checked out a directory @@ -1011,7 +1010,6 @@ in MOVE and COPY requests, so you have t >http://www.onlamp.com/pub/a/onlamp/excerpt/ssh_11/index3.html</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> </div> @@ -2401,22 +2399,6 @@ on Windows? instructions <a href="https://svn.apache.org/repos/asf/subversion/trunk/notes/windows-service.txt">here</a>.</p> -<p>In versions before 1.4.0, the <tt>svnserve</tt> binary itself could -not be installed as a Windows service, but there are a number of -“service wrappers” that can do the job; for example:</p> - -<ul> -<li><a href="http://www.clanlib.org/~mbn/svnservice/">SVNService</a> -is a free tool written by Magnus Norddahl</li> -<li><a href="https://support.microsoft.com/kb/q137890/">SrvAny</a> -is avaliable free of charge from Microsoft</li> -</ul> - -<p>There is a bit more about running <tt>svnserve</tt> as a service in -<a -href="http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-serversetup-svnserve.html">the -TortoiseSVN manual</a>.</p> - </div> @@ -2657,7 +2639,7 @@ href="http://svnbook.red-bean.com/en/1.4 >described here</a>.</p> <p>If the vendor code is hosted in a remote Subversion repository, -then you can use <a href="http://piston.rubyforge.org/">Piston</a> to +then you can use <a href="https://github.com/francois/piston">Piston</a> to manage your copy of the vendor's code.</p> <p>As a last resort, if using <tt>svn_load_dirs.pl</tt> is taking too @@ -3108,25 +3090,6 @@ a 301 error to occur.</p> </div> -<div class="h3" id="digest-auth"> -<h3>Why doesn't HTTP Digest auth work? - <a class="sectionlink" href="#digest-auth" - title="Link to this section">¶</a> -</h3> - -<p>This is probably due to a known bug in Apache HTTP Server (versions - 2.0.48 and earlier), for which a patch is available, see -<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25040" - >http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25040</a>. You -may also want to read over -<a href="https://issues.apache.org/jira/browse/SVN-1608" - >https://issues.apache.org/jira/browse/SVN-1608</a> -to see if the description there matches your symptoms. -</p> - -</div> - - <div class="h3" id="xlc-compile"> <h3>Compiling with xlc on AIX, I get compilation errors. What's wrong? @@ -4485,6 +4448,7 @@ a lower score. <h2>Table of Contents</h2> <h4>Troubleshooting:</h4> <ul> +<li><a href="#digest-auth">Why doesn't HTTP Digest auth work?</a></li> <li><a href="#windows-xp-server">Under Windows XP, the Subversion server sometimes seems to send out corrupted data. Can this really be happening?</a></li> @@ -4526,6 +4490,25 @@ Berkeley DB a repository is using?</a></ title="Link to this section">¶</a> </h2> +<div class="h3" id="digest-auth"> +<h3>Why doesn't HTTP Digest auth work? + <a class="sectionlink" href="#digest-auth" + title="Link to this section">¶</a> +</h3> + +<p>This is probably due to a known bug in Apache HTTP Server (versions + 2.0.48 and earlier), for which a patch is available, see +<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=25040" + >https://bz.apache.org/bugzilla/show_bug.cgi?id=25040</a>. You may also + want to read over +<a href="https://issues.apache.org/jira/browse/SVN-1608" + >https://issues.apache.org/jira/browse/SVN-1608</a> +to see if the description there matches your symptoms. +</p> + +</div> + + <div class="h3" id="windows-xp-server"> <h3>Under Windows XP, the Subversion server sometimes seems to send out corrupted data. Can this really Modified: subversion/site/publish/faq.ja.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.ja.html?rev=1818723&r1=1818722&r2=1818723&view=diff ============================================================================== --- subversion/site/publish/faq.ja.html (original) +++ subversion/site/publish/faq.ja.html Tue Dec 19 22:10:34 2017 @@ -655,7 +655,6 @@ 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="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> </div> @@ -1574,16 +1573,6 @@ Subversionã¯ééã¨ãª <p>1.4.0以éã§ããã°ã<a href="http://svn.collab.net/repos/svn/trunk/notes/windows-service.txt">ãã</a>ã§ã¤ã³ã¹ãã©ã¯ã·ã§ã³ãèªãããã</p> -<p>1.4.0ããåã®ãã¼ã¸ã§ã³ã®å ´åã<tt>svnserve</tt>ãã¤ããªããèªèº«ãWindowsãµã¼ãã¹ã¨ãã¦ã¤ã³ã¹ãã¼ã«ãããã¨ã¯ã§ããªãã -ãã ããå¹¾ã¤ãããµã¼ãã¹ã©ããã¼ããåå¨ãã¦ãã¦ãããã使ããã¨ã§å®ç¾å¯è½ã ãä¾ãããããã</p> - -<ul> -<li><a href="http://www.clanlib.org/~mbn/svnservice/">SVNService</a>㯠Magnus Norddahl ãä½ã£ãããªã¼ãªãã¼ã«ã</li> -<li><a href="https://support.microsoft.com/kb/q137890/">SrvAny</a> 㯠Microsoft ãä½ã£ããã®ã§ãç¡æã§å©ç¨å¯è½ã</li> -</ul> - -<p><tt>svnserve</tt> ããµã¼ãã¹ã¨ãã¦ç¨¼åãããæ¹æ³ã«é¢ãã¦ã¯ã<a href="http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-serversetup-svnserve.html">TortiseSVN ããã¥ã¢ã«</a>ã«ããå°ãè¨è¿°ããããã</p> - </div> @@ -1746,7 +1735,7 @@ svn: Path 'svn://server/trunk/stuff/*' d å³ã¡ãåå²ããèªèº«ã®ãã©ã³ããç¶æãã¤ã¤ãä¸å±¤ã®æä¾å ããå ¬éãããæ°ãããªãªã¼ã¹ãçµã¿å ¥ãããããã ã ããã¯ãä¸è¬çã«<em>ãã³ãã¼ãã©ã³ã</em>ã¨å¼ã°ãã¦ãã¦(ãã®å称㯠Subversion 以åãã使ããã¦ãã)ãSubversion ã使ã£ã¦ããã管çãããã¯ããã¯ã¯ã<a href="http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.advanced.vendorbr">ããã§èª¬æããã¦ãã</a>ã</p> -<p>ããããã³ãã¼ã³ã¼ãããªã¢ã¼ãã® Subversion ãªãã¸ããªã§ç®¡çããã¦ãããªãã°ããã³ãã¼ã³ã¼ãã®ã³ãã¼ã管çã«ã<a href="http://piston.rubyforge.org/">Piston</a>ãå©ç¨ã§ããã</p> +<p>ããããã³ãã¼ã³ã¼ãããªã¢ã¼ãã® Subversion ãªãã¸ããªã§ç®¡çããã¦ãããªãã°ããã³ãã¼ã³ã¼ãã®ã³ãã¼ã管çã«ã<a href="https://github.com/francois/piston">Piston</a>ãå©ç¨ã§ããã</p> <p>次åã®çã§ã¯ããããã©ããã<tt>svn_load_dirs.pl</tt>ã使ãã®ã«å¤ãã®æéãè²»ããã¦ããããããã©ã¯ãªæ¹æ³ãæ¢ãã¦ãããªãã°ãJon Steven ã«ãã£ã¦æ¸ããã <a href="http://lookfirst.com/2007/11/subversion-vendor-branches-howto.html">Subversion Vendor Branches Howto</a>ã®ã¹ãããã»ãã¤ã»ã¹ããã解説ãåç §ãã¦ã¿ããã ãã®æ¹æ³ã§ã¯ãå¤ãã³ã¼ããæ°ããã³ã¼ãã¸ä¸æ¸ãããéãSubversion ã®ããã¯ã¨ã³ããæä¾ãã¦ãã容éã®å¢å ãæå¶ããçºã®ææ³ã¯ç¨ããªãã @@ -2287,7 +2276,7 @@ rev 24: (no author) | 2003-07-29 1 </h3> <p>ããã¯ãæãããApache HTTPãµã¼ã(ãã¼ã¸ã§ã³2.0.48以å)ã®æ¢ç¥ã®ãã°ã ã -ãããã<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25040">http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25040</a>ããåå¾ãããã¨ãã§ããã +ãããã<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=25040">https://bz.apache.org/bugzilla/show_bug.cgi?id=25040</a>ããåå¾ãããã¨ãã§ããã ä½µãã¦ãããªãã®ç¶æ³ãã<a href="https://issues.apache.org/jira/browse/SVN-1608">https://issues.apache.org/jira/browse/SVN-1608</a>ã«æ¸ããã¦ããå 容ã¨ä¸è´ãããã©ããã調ã¹ã¦è¦ãæ¹ãè¯ãã ããã</p> </div> Modified: subversion/site/publish/faq.zh.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.zh.html?rev=1818723&r1=1818722&r2=1818723&view=diff ============================================================================== --- subversion/site/publish/faq.zh.html (original) +++ subversion/site/publish/faq.zh.html Tue Dec 19 22:10:34 2017 @@ -625,7 +625,6 @@ $ svn checkout svn+ssh://your.domain.com >http://www.onlamp.com/pub/a/onlamp/excerpt/ssh_11/index3.html</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> </div> @@ -1443,20 +1442,6 @@ href="#hook-debugging">â为ä»� <p>对äº1.4.0å以åççæ¬ï¼ä½ å¯ä»¥æ¥ç<a href="http://svn.collab.net/repos/svn/trunk/notes/windows-service.txt">è¿é</a>ã</p> -<p>对äº1.4.0以åççæ¬ï¼<tt>svnserve</tt>äºè¿å¶æ¬èº«å¹¶ä¸å¯ä»¥è¢«å®è£ æä¸ä¸ªwindowsæå¡ï¼ä½æå¾å¤“service wrappers”å¯ä»¥å®æä¸æ ·çå·¥ä½ãä¾å¦ï¼</p> - -<ul> -<li><a href="http://www.clanlib.org/~mbn/svnservice/">SVNService</a> -Magnus Norddahlåçä¸ä¸ªå è´¹çå·¥å ·</li> -<li><a href="https://support.microsoft.com/kb/q137890/">SrvAny</a> -微软åºçå è´¹çå·¥å ·</li> -</ul> - -<p>å¨ -<a -href="https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-serversetup-svnserve.html"> -TortoiseSVNæå</a>è¿æä¸ç¹å å®¹å ³äºæä¹å°<tt>svnserve</tt>å®è£ ææå¡çå½¢å¼ã</p> - </div> @@ -1616,7 +1601,7 @@ svn: Path 'svn://server/trunk/stuff/*' d href="http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.advanced.vendorbr" >è¿ä¸ªæè¿°</a>ã</p> -<p>å¦æä¾æ¹ä»£ç æ¯è¿ç¨ç主æºä¸çSubversionçæ¬åºï¼ä½ å¯ä»¥ä½¿ç¨<a href="http://piston.rubyforge.org/">Piston</a>æ¥ç®¡çä½ çä¾æ¹ä»£ç æ·è´ã</p> +<p>å¦æä¾æ¹ä»£ç æ¯è¿ç¨ç主æºä¸çSubversionçæ¬åºï¼ä½ å¯ä»¥ä½¿ç¨<a href="https://github.com/francois/piston">Piston</a>æ¥ç®¡çä½ çä¾æ¹ä»£ç æ·è´ã</p> <p>æåï¼å¦æ使ç¨<tt>svn_load_dirs.pl</tt>è±å¤ªå¤æ¶é´çè¯ï¼æè ä½ æ£å¨å¯»æ¾ä¸ä¸ªå·æçæ¹æ¡ï¼åå¯ä»¥åèJon Stevensçæ¸è¿ä»ç»<a @@ -2100,8 +2085,8 @@ href="http://svnbook.red-bean.com/nightl title="Link to this section">¶</a> </h3> -<p>è¿ä¸ªé®é¢å¾å¯è½æ¯å 为Apacheæå¡å¨çä¸ä¸ªå·²ç¥çbugï¼åå¨äº2.0.48æè æ´æ©æççæ¬ï¼ï¼ä½ å¯ä»¥å¨<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25040" - >http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25040</a>æ¾å°ç¸åºçè¡¥ä¸ãä½ ä¹å¯ä»¥å¨<a href="https://issues.apache.org/jira/browse/SVN-1608" +<p>è¿ä¸ªé®é¢å¾å¯è½æ¯å 为Apacheæå¡å¨çä¸ä¸ªå·²ç¥çbugï¼åå¨äº2.0.48æè æ´æ©æççæ¬ï¼ï¼ä½ å¯ä»¥å¨<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=25040" + >https://bz.apache.org/bugzilla/show_bug.cgi?id=25040</a>æ¾å°ç¸åºçè¡¥ä¸ãä½ ä¹å¯ä»¥å¨<a href="https://issues.apache.org/jira/browse/SVN-1608" >https://issues.apache.org/jira/browse/SVN-1608</a> ä¸çæ没æåä½ è¯´çæ åµç±»ä¼¼çå·²åé¦çbugã</p>