Author: luke1410 Date: Mon Feb 26 23:27:58 2018 New Revision: 1825424 URL: http://svn.apache.org/viewvc?rev=1825424&view=rev Log: * site/publish: Merge from staging.
Modified: subversion/site/publish/ (props changed) subversion/site/publish/faq.ja.html subversion/site/publish/faq.zh.html Propchange: subversion/site/publish/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 26 23:27:58 2018 @@ -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,1818340-1818384,1818496-1818517,1818724,1819267-1819300,1821098,1822805 +/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,1818496-1818517,1818724,1819267-1819300,1821098,1822805,1823239-1823254 Modified: subversion/site/publish/faq.ja.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.ja.html?rev=1825424&r1=1825423&r2=1825424&view=diff ============================================================================== --- subversion/site/publish/faq.ja.html (original) +++ subversion/site/publish/faq.ja.html Mon Feb 26 23:27:58 2018 @@ -188,7 +188,7 @@ CollabNetãææãã¦� </h3> <p>ãããSubversionã¯ãªã¼ãã³ã½ã¼ã¹ã§ããããªã¼ã½ããã¦ã§ã¢ã ãã -CollabNetã¯ãä½äººãã®ãã«ã¿ã¤ã éçºè ã¸çµ¦æãæã£ã¦ãã¦ãã³ã¼ãã®ã³ãã¼ã©ã¤ãããã£ã¦ãããã©ãã§ããã®ã³ãã¼ã©ã¤ãã¯ã<a href="https://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>ã¸å®å ¨æºæ ãª<a href="http://subversion.tigris.org/license-1.html">Apache/BSD-style ã©ã¤ã»ã³ã¹</a>ã ã +CollabNetã¯ãä½äººãã®ãã«ã¿ã¤ã éçºè ã¸çµ¦æãæã£ã¦ãã¦ãã³ã¼ãã®ã³ãã¼ã©ã¤ãããã£ã¦ãããã©ãã§ããã®ã³ãã¼ã©ã¤ãã¯ã<a href="https://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>ã¸å®å ¨æºæ ãª<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache ã©ã¤ã»ã³ã¹</a>ã ã è¨ãæããã°ããã¦ã³ãã¼ããæ¹å¤ãããã¦åé å¸ã¯ãããªããæãããã«ãèªç±ã«è¡ããã CollabNetãä»ã®äººã«è¨±è«¾ãå¾ãå¿ è¦ã¯ãªãã</p> @@ -274,7 +274,7 @@ Subversionãµã¼ããã <p>ãµã¼ãã®è¦æ±ã¯å¤ãã®è¦ç´ ãé¢ä¿ãã¦ããã ä¾ãã°ãã¦ã¼ã¶æ°ããã³ããããåãã¨ãããµã¼ãé¢é£æä½ã®é »åº¦ããªãã¸ããªã®ãµã¤ãºãç¬èªã«è¨å®ãããªãã¸ããªããã¯ã®è² è·ãªã©ã ã -ãããApacheã使ã£ã¦ãããªãã°ãApacheèªä½ãã¡ã¢ãªä½¿ç¨éã®æ大è¦å ã¨ãªãã ããããã詳ãã話ã¯ãã¡ã¤ãªã³ã°ãªã¹ãã®<a href="http://subversion.tigris.org/servlets/BrowseList?list=users&by=thread&from=330941">è°è«</a>ãåç §ãã¦ã»ããã</p> +ãããApacheã使ã£ã¦ãããªãã°ãApacheèªä½ãã¡ã¢ãªä½¿ç¨éã®æ大è¦å ã¨ãªãã ããã</p> <p>åããµã¼ãä¸ã§åä½ãã¦ãããä»ã®ã¢ããªã±ã¼ã·ã§ã³ãèæ ®ã«å ¥ããã®ãå¿ããªããã¨ã ä¾ãã°ããªãã¸ããªãã©ã¦ã¶ã使ãã®ã§ããã°ãSubversion èªä½ã¨ã¯é¢ä¿ãªããªã½ã¼ã¹ãå¿ è¦ã«ãªãã</p> @@ -412,7 +412,7 @@ ArchãBitkeeperãªã©ã®ã� title="Link to this section">¶</a> </h3> -<p>次ã®ã¹ãã¼ã¿ã¹ãã¼ã¸ãåç §ã<a href="http://subversion.tigris.org/project_status.html">http://subversion.tigris.org/project_status.html</a></p> +<p><a href="/roadmap.html">次ã®ã¹ãã¼ã¿ã¹ãã¼ã¸ãåç §</a>ã</p> </div> @@ -456,7 +456,7 @@ Win32ã·ã¹ãã ã«ã� <p>ããããã®FAQã®æ®ããèªãã§ãåçãè¦ä»ããããªããã°ã以ä¸ã®ãªã½ã¼ã¹ãããã£ã¦ã¿ãã¨è¯ãã ããã</p> <ul> <li><a href="http://svnbook.red-bean.com">The Subversion Book</a></li> - <li><a href="http://subversion.tigris.org/servlets/ProjectMailingListList">Subversion ã¦ã¼ã¶ã¼ãºã¡ã¤ãªã³ã°ãªã¹ã</a> (<a href="mailto:us...@subversion.tigris.org">us...@subversion.tigris.org</a>) + <li><a href="mailing-lists.html">Subversion ã¦ã¼ã¶ã¼ãºã¡ã¤ãªã³ã°ãªã¹ã</a> (<a href="mailto:us...@subversion.apache.org">us...@subversion.apache.org</a>) — 注æ: ãã®ã¡ã¤ãªã³ã°ãªã¹ãã¯<a href="#moderation">ã¢ãã¬ã¼ã¿å¶</a>ã ãããããªãã®æ稿ãé éãããã¾ã§ã«ã¯ãå°ãé 延ãããããã</li> <li><a href="https://svn.haxx.se/users/">Subversion ã¦ã¼ã¶ã¼ãºãªã¹ãã®ã¢ã¼ã«ã¤ã</a></li> <li>IRCãirc.freenode.net ã® #svn ãã£ã³ãã«ã«ã¦ã</li> @@ -744,7 +744,7 @@ Berkeley DBã®ãã¼ã¿ã� <p>ä½æ¥ã³ãã¼ã¯NFSä¸ã¸æ ¼ç´ãããã¨ãã§ãã(åºæ¬çãªã¨ããã§ã¯ããã¼ã ãã£ã¬ã¯ããªãNFSãµã¼ãä¸ã«ä½ç½®ãã¦ãããã¨ããã®ããã)ã Subversionã¯ããã§ãã¯ã¢ã¦ãæã大éã®ãªãã¼ã å¦çãå é¨çã«è¡ã£ã¦ããçºãLinuxã®NFSãµã¼ãã使ãå ´åã«ã¯'subtree checking'ãç¡å¹åãã¹ãã ãã¨ã®å ±åããã(ããã©ã«ãã§ã¯æå¹ã«ãªã£ã¦ãã)ã -subtree checking ãç¡å¹åããæ¹æ³ã«ã¤ãã¦ã¯ã<a href="http://nfs.sourceforge.net/nfs-howto/server.html">NFS Howto Server Guide</a><b>ã¨exports(5)</b>ãåç §ã®ãã¨ã</p> +subtree checking ãç¡å¹åããæ¹æ³ã«ã¤ãã¦ã¯ã<a href="http://nfs.sourceforge.net/nfs-howto/ar01s03.html">NFS Howto Server Guide</a><b>ã¨exports(5)</b>ãåç §ã®ãã¨ã</p> <p>æã ã¯ãå°ãªãã¨ã1éãSMBã§ã¢ã¯ã»ã¹ããå¾ãä½æ¥ã³ãã¼ãWedged ã«ãªã£ããã¨ããã¬ãã¼ããåãåã£ã¦ãããåé¡ã®ãµã¼ãã¯ããå¤ãã®ãã¼ã¸ã§ã³(2.2.7a)ã®Sambaã稼åãã¦ããããã®åé¡ã¯æ°ããã®Samba(3.0.6)ã§ã¯åçºãã¦ããªãã</p> @@ -2425,7 +2425,7 @@ Subversion ã«æ¼ãã¦ã� <p>åé¡ã¯ãBerkeley DB ãããã¯ã¨ã³ãã«ä½¿ã£ã Subversion ãªãã¸ããªæ§æãã¦ãããã¼ãã«å ã®ããããã¼ã¿ãã¼ã¹ãã©ã¼ããããã£ã¼ã«ããå£ãã¤ã¤ãããã¨ãããã¨ã ã çç±ã¯ä¸æã ããã»ã¨ãã©å¸¸ã«'copies'ãã¼ãã«ã§çºçãã'btree' ã¿ã¤ããã'recno'ã¿ã¤ãã¸ã¨å¤æ´ã¨ãªã£ã¦ããã ã·ã³ãã«ãªå復æ¹æ³ã¯ä»¥ä¸ã®éãã -ãããã®æ¹æ³ãæåããªãã£ãããSubversion Users<a href="mailto:us...@subversion.tigris.org">ã¡ã¤ãªã³ã°ãªã¹ã</a>ã¸åãåããã¦ã¿ããã</p> +ãããã®æ¹æ³ãæåããªãã£ãããSubversion Users<a href="mailto:us...@subversion.apache.org">ã¡ã¤ãªã³ã°ãªã¹ã</a>ã¸åãåããã¦ã¿ããã</p> <ul> <li>ä»ã®ããã»ã¹ãããªãã¸ããªã¸ã¢ã¯ã»ã¹ãããã¨ãã¦ããªããã¨ã確èªããã</li> Modified: subversion/site/publish/faq.zh.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.zh.html?rev=1825424&r1=1825423&r2=1825424&view=diff ============================================================================== --- subversion/site/publish/faq.zh.html (original) +++ subversion/site/publish/faq.zh.html Mon Feb 26 23:27:58 2018 @@ -21,10 +21,10 @@ <div class="h2"><!-- no 'id' or 'title' attribute for TOC --> <h2>é®é¢å表</h2> <p> -<a href="http://subversion.tigris.org/faq.html">English</a> +<a href="faq.html">English</a> </p> -<p>æ¬ææ ¹æ®åær33959ï¼ç±<a href="http://www.subversion.org.cn">Subversionä¸æç«</a>çä¸æåç¿»è¯å°ç»ç¿»è¯ï¼æ¬¢è¿åä½åä¸ç¿»è¯å·¥ä½ï¼å å ¥å°åï¼<a href="https://code.google.com/p/svncndoc/">https://code.google.com/p/svncndoc/</a>ãåä¸ç¿»è¯çå¿æ¿è å æ¬<a href="http://rocksun.cn">rocksun</a>ãakeybupt2004ã<a href="http://www.devespace.cn">zhaozhi</a>åjiaqifengã +<p>æ¬ææ ¹æ®åær33959ï¼ç±(DEAD LINK - http://www.subversion.org.cn)Subversionä¸æç«çä¸æåç¿»è¯å°ç»ç¿»è¯ï¼æ¬¢è¿åä½åä¸ç¿»è¯å·¥ä½ï¼å å ¥å°åï¼<a href="https://code.google.com/p/svncndoc/">https://code.google.com/p/svncndoc/</a>ãåä¸ç¿»è¯çå¿æ¿è å æ¬(DEAD LINK - http://rocksun.cn)rocksunãakeybupt2004ã(DEAD LINK - http://www.devespace.cn)zhaozhiåjiaqifengã </p> <h4>常è§é®é¢ï¼</h4> @@ -202,7 +202,7 @@ </h3> <p>ä¸æ¯ï¼Subversionä¸æ¬¾å¼æº/å è´¹ç软件ãCollabNetå ¬å¸ä¸ºå ä¸ªå ¨èçå¼å人åæ¯ä»èªæ°´ï¼å¹¶ä¸æ¥æç¸å ³ä»£ç ççæï¼ä½æ¯è¿ä¸ªçææ¯<a -href="http://subversion.tigris.org/license-1.html">ä¸ä¸ªApache/BSD-é£æ ¼ç许å¯è¯</a>ï¼å®å®å ¨éµä»äº<a +href="https://www.apache.org/licenses/LICENSE-2.0">ä¸ä¸ªApache-许å¯è¯</a>ï¼å®å®å ¨éµä»äº<a href="https://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>ãæ¢å¥è¯è¯´ï¼ä½ å¯ä»¥éå¿æ欲çå»ä¸è½½ï¼ä¿®æ¹ï¼æè éæ°åå¸æ°ççæ¬ï¼èä¸éè¦ç»è¿CollabNetå ¬å¸æè å ¶ä»ä»»ä½ä¸ä¸ªäººç许å¯ã</p> @@ -270,8 +270,7 @@ href="https://apr.apache.org/">Apache Po title="Link to this section">¶</a> </h3> -<p>è¿è¡Subversionæå¡å¨è¦ä¾èµåæ¹é¢çå¤ç§å ç´ ï¼æ¯å¦è¯´ä¸å®æ°éçç¨æ·ï¼ç»å¸¸æ§çæ交ï¼å ¶å®ç¸å ³èçæå¡å¨ï¼çæ¬åºç大å°ä»¥åèªå®ä¹çæ¬åºçè´è½½çãå½ä½¿ç¨Apacheæ¶ï¼æå¯è½Apacheæ¬èº«å¨å åç使ç¨æ åµå°æ为æ大çå¶çº¦å ç´ ã请åé é®ä»¶å表ä¸å¯¹è¿ä¸ªé®é¢ç<a href="http://subversion.tigris.org/servlets/BrowseList?list=users&by=thread&from=330941" ->讨论</a>ï¼è¿éæé对è¿ä¸ªé®é¢çæç¡®ççæ¡ã</p> +<p>è¿è¡Subversionæå¡å¨è¦ä¾èµåæ¹é¢çå¤ç§å ç´ ï¼æ¯å¦è¯´ä¸å®æ°éçç¨æ·ï¼ç»å¸¸æ§çæ交ï¼å ¶å®ç¸å ³èçæå¡å¨ï¼çæ¬åºç大å°ä»¥åèªå®ä¹çæ¬åºçè´è½½çãå½ä½¿ç¨Apacheæ¶ï¼æå¯è½Apacheæ¬èº«å¨å åç使ç¨æ åµå°æ为æ大çå¶çº¦å ç´ ã</p> <p>éè¦è®°ä½çæ¯ï¼å¨åä¸å°æå¡å¨ä¸è¿è¡å ¶å®çåºç¨ç¨åºï¼æ¯å¦çæ¬åºçæµè§å¨åæ ·ä¼ä½¿ç¨å åï¼å®æ¯ç¬ç«äºSubversionæ¬èº«ã</p> @@ -388,9 +387,7 @@ href="http://svnbook.red-bean.com/nightl title="Link to this section">¶</a> </h3> -<p>çæ们çç¶æ页<a -href="http://subversion.tigris.org/project_status.html"> -http://subversion.tigris.org/project_status.html</a>ã</p> +<p><a href="/roadmap.html">çæ们çç¶æ页</a>ã</p> </div> @@ -435,11 +432,11 @@ href="http://svn.collab.net/repos/svn/tr <p>å¦æä½ å¨é 读è¿ä¸ªå¸¸è§é®é¢åçä¹åï¼æ²¡ææ¾å°ä½ é®é¢ççæ¡ï¼é£ä¹ä½ è¿æå ¶ä»çå 个èµæºå¯ä»¥å©ç¨ï¼</p> <ul> - <li><a href="http://svnbook.red-bean.com/">Subversionæå</a>ï¼ä»¥åä¸ææå<a href="http://www.subversion.org.cn/svnbook/">Subversionæå</a></li> - <li><a href="http://subversion.tigris.org/servlets/ProjectMailingListList">The + <li><a href="http://svnbook.red-bean.com/">Subversionæå</a>ï¼ä»¥åä¸ææå (DEAD LINK - http://www.subversion.org.cn/svnbook/)Subversionæå</li> + <li><a href="mailing-lists.html">The Subversionç¨æ·é®ä»¶å表</a> (<a - href="mailto:us...@subversion.tigris.org" - >us...@subversion.tigris.org</a>) + href="mailto:us...@subversion.apache.org" + >us...@subversion.apache.org</a>) — 注æè¿ä¸ªå表éè¦ç»è¿<a href="#moderation">å®¡æ ¸</a>ï¼æ以å¨æ¾ç¤ºä¹åæä¸äºå»¶è¿ã</li> <li><a href="https://svn.haxx.se/users/">Subversionç¨æ·ä¿¡æ¯å表ã</a></li> <li>å¨çº¿è天系ç»ï¼IRCï¼å¨irc.freenode.netç#svné¢éã</li> @@ -707,7 +704,7 @@ Ben Collins-Sussman解é <suss href="http://svn.collab.net/repos/svn/trunk/notes/fsfs">FSFS</a>ä½ä¸ºå端ï¼é£ä¹å°çæ¬åºåæ¾å°NFSæå¡å¨ï¼åºå½æ¯æ¯æéå®çæå¡å¨ï¼ä¹åºå½æ²¡é®é¢ã</p> <p>å·¥ä½æ·è´å¯ä»¥åæ¾å°NFSï¼ä¸ä¸ªå¸¸è§çåºæ¯æ¯ä½ ç主ç®å½å¨NFSæå¡å¨ä¸ï¼ä¸ï¼å¨Linux NFSæå¡å¨ä¸ï¼å 为å¨æ£åºæ¶Subversionå é¨ä½¿ç¨çéå½åçéæ¯è¾å¤§ï¼ä¸äºç¨æ·æ¥ååºå½å ³éâåç®å½æ£æ¥ï¼subtree checkingï¼âåºå½å ³éï¼å¦æå ³éåç®å½æ£æ¥ç详ç»ä¿¡æ¯å¯ä»¥ç<a -href="http://nfs.sourceforge.net/nfs-howto/server.html" >NFS Howto +href="http://nfs.sourceforge.net/nfs-howto/ar01s03.html" >NFS Howto Server Guide</a>å<b>exports(5)</b>ã</p> <p>æ们è³å°æ¥å°ä¸ä»½å¯¹äºéè¿SMB访é®é æå·¥ä½æ·è´æ¥ä½çæ¥åï¼é æé误çæå¡å¨æ¯çæ¬é常èçSambaï¼2.2.7aï¼ï¼å¨æ°çæ¬ï¼3.0.6ï¼Sambaä¸å¹¶æ²¡æååºç°è¿ä¸ªé®é¢ã</p> @@ -1891,7 +1888,7 @@ href="http://svnbook.red-bean.com/nightl <p>VS.Netæä¸ä¸ªASP.Netåç³»ç»ï¼å®ä½¿ç¨WebDAVæ¥éè¿IISæ¥è¿ç¨åå¸ãè¿ä¸ªåç³»ç»åé¤äºææ以"."å¼å¤´çç®å½ãå¨ä½ è¯å¾è¿ç¨åå¸ä½ çå·¥ä½ç®å½çæ¶åï¼".svn"å°å¯¼è´é®é¢ãé误信æ¯ç±»ä¼¼"unable to read project information"ã</p> -<p>è¦æ³ç»è¿è¿ä¸ªé®é¢ï¼è®¾ç½®ç¯å¢åéSVN_ASP_DOT_NET_HACK为任æå¼ — è¿å°åè¯Windows clientså¨ä½ çå·¥ä½æ·è´ä¸ä½¿ç¨"_svn"ä½ä¸ºç®å½åãåè§<a href="http://subversion.tigris.org/svn_1.3_releasenotes.html#_svn-hack">Subversion 1.3åå¸è¯´æçç¸å ³ç« è</a>æ¥åå¾æ´å¤ä¿¡æ¯ï¼åè§<a href="#adm-dir">è¿ä¸ªé®é¢</a>æ¥ç¨å ¶ä»æ¹æ³é 置管çç®å½åã</p> +<p>è¦æ³ç»è¿è¿ä¸ªé®é¢ï¼è®¾ç½®ç¯å¢åéSVN_ASP_DOT_NET_HACK为任æå¼ — è¿å°åè¯Windows clientså¨ä½ çå·¥ä½æ·è´ä¸ä½¿ç¨"_svn"ä½ä¸ºç®å½åãåè§<a href="/docs/release-notes/1.3.html#_svn-hack">Subversion 1.3åå¸è¯´æçç¸å ³ç« è</a>æ¥åå¾æ´å¤ä¿¡æ¯ï¼åè§<a href="#adm-dir">è¿ä¸ªé®é¢</a>æ¥ç¨å ¶ä»æ¹æ³é 置管çç®å½åã</p> </div> @@ -2194,7 +2191,7 @@ href="https://issues.apache.org/jira/bro <p>尽管å¦æ¤ï¼å¦æä½ è¿æ¯æ å¿çè¯ï¼é£ä¹ä½ å¯ä»¥å°å¯ç ç¼åçåè½æ°¸ä¹ å ³éãå¨svn 1.0ç客æ·ç«¯ä¸ï¼ä½ åªéè¦å¨ä½ çè¿è¡æ¶é ç½®æ件设置âstore-auth-creds = noâã对äºsvn 1.1以åä¹åççæ¬æ¥è¯´ï¼ä½ å¯ä»¥ä½¿ç¨ç²åº¦æ´ç»ç设置âstore-passwords = no' ï¼è¿æ ·æå¡å¨çè¯ä¹¦è¿æ¯ä¼ç¼åï¼ãæ´å¤å ³äºå¯ç ç¼åçä¿¡æ¯å·²ç»å¯ä»¥ç<a -href="http://www.subversion.org.cn/svnbook/">âæ¥æ建âSubversionæåä¹ä¸</a>第å ç« ç<a href="http://www.subversion.org.cn/svnbook/nightly/svn.serverconfig.netmodel.html#svn.serverconfig.netmodel.credcache">â客æ·ç«¯åè¯ç¼å</a>ã</p> +href="http://svnbook.red-bean.com/nightly/en/index.html">âæ¥æ建âSubversionæåä¹ä¸</a>第å ç« ç<a href="http://svnbook.red-bean.com/nightly/en/svn.serverconfig.netmodel.html#svn.serverconfig.netmodel.credcache">â客æ·ç«¯åè¯ç¼å</a>ã</p> <p>æåè¦è¯´çæ¯ï¼æ们ç¥éCVSå¾å¤å¹´æ¥ä¸ç´é½æ¯å°ç¼åçå¯ç åæ¾å¨.cvspassæ件ä¸çã表é¢ä¸æ¥çåæ¾å¨éé¢çæ°æ®æ¯å å¯è¿çï¼ä½å®é ä¸ï¼ä»ä»¬åªæ¯ä½¿ç¨é常ç®åçç®æ³æ¥è¿è¡æ··æ·ï¼å°±årot13ä¸æ ·ãè¿äºæè°çå¯ç å¯ä»¥å¾è½»æå°±è¢«ç ´è§£æãè¿ç§æ··æ·çå¯ä¸ä½ç¨å°±æ¯é²æ¢å ¶ä»ç¨æ·å¦ç®¡çåæå¤ççå°å¯ç ãä½æ¯ç®åè¿æ²¡æ人å¸æSubversionä¹è¿æ ·åãå¦æä½ æå ´è¶£çè¯ï¼ä½ å¯ä»¥ä¸ºå ¶åè¡¥ä¸ç¶å åéå°dev@listã</p>