Author: luke1410
Date: Mon Jan 8 23:23:26 2018
New Revision: 1820610
URL: http://svn.apache.org/viewvc?rev=1820610&view=rev
Log:
* site/publish: Merge from staging.
Modified:
subversion/site/publish/ (props changed)
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 Jan 8 23:23:26 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
+/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
Modified: subversion/site/publish/faq.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1820610&r1=1820609&r2=1820610&view=diff
==============================================================================
--- subversion/site/publish/faq.html (original)
+++ subversion/site/publish/faq.html Mon Jan 8 23:23:26 2018
@@ -1916,7 +1916,7 @@ information on the revision level of a w
You can incorporate it into your build or release process to get the
information you need into the source itself. For example, in a build
environment based on <tt>GNU make</tt>, add <a
-href="http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=112564";
+href="https://svn.haxx.se/dev/archive-2006-02/1156.shtml";
>something like this</a> to your <tt>Makefile</tt>:
</p>
@@ -4518,13 +4518,7 @@ to see if the description there matches
title="Link to this section">¶</a>
</h3>
-<p>You need to install Window XP Service Pack 1. You can get all
-sorts of information about that Service Pack here:</p>
-
- <ul><li>
- <a href="http://support.microsoft.com/default.aspx?scid=kb;EN-US;q317949";
- >http://support.microsoft.com/default.aspx?scid=kb;EN-US;q317949</a>
- </li></ul>
+<p>You need to install Window XP Service Pack 1.</p>
</div>
@@ -4590,7 +4584,7 @@ href="#bdb-recovery">more info</a>).</p>
<p>The logfiles will grow forever, eating up disk space, unless you,
(as the repository administrator) do something about it. At any given
moment, Berkeley DB is only using a few logfiles actively (see <a
-href="http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=15194";
+href="https://svn.haxx.se/users/archive-2004-07/1662.shtml";
>this post</a> and its associated thread); the rest can be safely
deleted. If you keep all the logfiles around forever, then in theory
Berkeley DB can replay every change to your repository from the day it
Modified: subversion/site/publish/faq.ja.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/faq.ja.html?rev=1820610&r1=1820609&r2=1820610&view=diff
==============================================================================
--- subversion/site/publish/faq.ja.html (original)
+++ subversion/site/publish/faq.ja.html Mon Jan 8 23:23:26 2018
@@ -760,7 +760,7 @@ subtree checking ãç¡å¹å�
<p>ãªãã¸ããªã¯ãããªãã®å
¨ã¦ã®ãã¼ã¿ãããªãã¸ããªã®
/db/ ãµããã£ã¬ã¯ããªå
ã«ãã Berkeley DBã®ãç°å¢ãå
ã«èç©ãã¦ããã
ãã®ç°å¢ã¯ããã¼ãã«ã®éåããã°ãã¡ã¤ã«(log.*) ã®æãæ
¼ç´ãã¦ãããBerkeley DB ã¯ãã¼ãã«ã«è¡ãããå
¨ã¦ã®å¤æ´ãè¨é²ããã®ã§ãå®è¡ãé®ãããå
´åã§ããé¦å°¾ä¸è²«ããç¶æ
ã¸ã¨å¾©å
ãããã¨ãå¯è½ã (<a
href="#bdb-recovery">詳細ã¯ãã¡ã</a>)ã</p>
-<p>ãã°ãã¡ã¤ã«ã¯æ°¸é
ã«æé·ãç¶ããããªãã(ãªãã¸ããªç®¡çè
ã¨ãã¦)ä½ãã®å¦çãè¡ããªãéãã¯ããã£ã¹ã¯ç©ºéãé£ãã¤ã¥ããã
ãããããæç¹ã§ãBerkeley DB
ãå®éã«ä½¿ç¨ãããã°ãã¡ã¤ã«ã¯å
ãã§ãããªã(<a
href="http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=15194";>ãã®æ稿</a>ã¨ç¶ãã¹ã¬ãããåç
§)ã
+<p>ãã°ãã¡ã¤ã«ã¯æ°¸é
ã«æé·ãç¶ããããªãã(ãªãã¸ããªç®¡çè
ã¨ãã¦)ä½ãã®å¦çãè¡ããªãéãã¯ããã£ã¹ã¯ç©ºéãé£ãã¤ã¥ããã
ãããããæç¹ã§ãBerkeley DB
ãå®éã«ä½¿ç¨ãããã°ãã¡ã¤ã«ã¯å
ãã§ãããªã(<a
href="https://svn.haxx.se/users/archive-2004-07/1662.shtml";>ãã®æ稿</a>ã¨ç¶ãã¹ã¬ãããåç
§)ã
ã¨ããããã§ãæ®ãã¯å®å
¨ã«åé¤ãããã¨ãã§ããããããããªããå
¨ã¦ã®ãã°ãã¡ã¤ã«ãæ°¸é
ã«ä¿åãã¦ããã®ã§ããã°ãBerkeley
DBã¯ããªãã¸ããªããã®ä¸ã«çãåãæããå¾ãæ½ãããå
¨ã¦ã®å¤æ´ããçè«ä¸ã¯åç¾ãããã¨ãåºæ¥ããã¨ã«ãªãã
ã§ãç¾å®çã«ã¯ãããããã¯ã¢ãããã¨ã£ã¦ãããªããå¤åããã£ã¹ã¯ç©ºéã¨ããé¢ã§ãã³ã¹ãã«è¦åããªãã¨æããã</p>
@@ -1177,7 +1177,7 @@ Subversion ã§ã¯ãªãã�
<p>
ããããã«ãããªãªã¼ã¹ããã»ã¹ã«çµ±åãããã¨ã§ãã½ã¼ã¹èªèº«ã«ãã®æ
å ±ãå¼ã渡ããã¨ãå¯è½ã ã
-ä¾ãã°ã<tt>GNU make</tt>ã使ã£ããã«ãç°å¢ã§ã¯ã<tt>Makefile</tt>ã¸<a
href="http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=112564";>ãã®ãããªå¦ç</a>ãå
ããã°è¯ãã
+ä¾ãã°ã<tt>GNU make</tt>ã使ã£ããã«ãç°å¢ã§ã¯ã<tt>Makefile</tt>ã¸<a
href="https://svn.haxx.se/dev/archive-2006-02/1156.shtml";>ãã®ãããªå¦ç</a>ãå
ããã°è¯ãã
</p>
<pre>
@@ -2106,10 +2106,7 @@ svn import file:///d:/some/path/to/repos
title="Link to this section">¶</a>
</h3>
-<p>Window XP Service Pack 1 ãã¤ã³ã¹ãã¼ã«ããå¿
è¦ããããã
-Service Packã«é¢ããå種æ
å ±ã¯ã次ã®ãªã³ã¯ããå
¥æå¯è½ã</p>
-
- <ul><li><a
href="http://support.microsoft.com/default.aspx?scid=kb;EN-US;q317949";>http://support.microsoft.com/default.aspx?scid=kb;EN-US;q317949</a>(æ¥æ¬èªçã¯ä»¥ä¸ã®ãªã³ã¯ãåç
§:<a
href="http://support.microsoft.com/?scid=kb%3Bja%3B317949&x=20&y=13";>http://support.microsoft.com/?scid=kb%3Bja%3B317949&x=20&y=13</a>)</li></ul>
+<p>Window XP Service Pack 1 ãã¤ã³ã¹ãã¼ã«ããå¿
è¦ããããã</p>
</div>
Modified: subversion/site/publish/faq.zh.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/faq.zh.html?rev=1820610&r1=1820609&r2=1820610&view=diff
==============================================================================
--- subversion/site/publish/faq.zh.html (original)
+++ subversion/site/publish/faq.zh.html Mon Jan 8 23:23:26 2018
@@ -725,7 +725,7 @@ Server Guide</a>å<b>exports(5)</b>�
href="#bdb-recovery">more info</a>ï¼ã</p>
<p>å¦æä½
æ¾ä»»ä¸ç®¡ï¼ä½ä¸ºçæ¬åºç®¡çåï¼ï¼æ¥å¿æ件ä¼ä¸æççé¿ï¼åå¬ç£ç空é´ãå¨ä»»ä½æ¶å»ï¼Berkeley
DBåªä½¿ç¨å¾å°ä¸é¨åçæ¥å¿æ件ï¼å¯ä»¥ç<a
-href="http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=15194";
+href="https://svn.haxx.se/users/archive-2004-07/1662.shtml";
>è¿ä¸ªå¸å</a>以åç¸å
³ç线索ï¼ï¼å
¶ä½çå¯ä»¥å®å
¨çå
>é¤ãå¦æä½ æ°¸ä¹
ä¿åææçæ¥å¿æ件ï¼ç论ä¸Berkeley
>DBè½å¤æ
>¹æ®è¿ä¸ªæ件åå°åºççæ¶å»ãä½æ¯å¨å®è·µä¸ï¼å¦æä½
>è¿è¡äºå¤ä»½ï¼å°±æ²¡æå¿
è¦å¨ç£çä¸æµªè´¹ç©ºé´äºã</p>
<p>å¯ä»¥ä½¿ç¨<code>svnadmin</code>æ¥çåªäºæ¥å¿æ件å¯ä»¥å é¤ï¼ä½
å¯ä»¥éè¿crobç¨åºå®æè¿ä¸ªä»»å¡ã</p>
@@ -1113,7 +1113,7 @@ Subversionæ¯æ¬¡é½å°æ´
</p>
<p>ä½ å¯ä»¥å°å
¶ç»åå°ä½
çæ建æåå¸è¿ç¨ä¸ï¼ä»¥è·åéè¦åæ¾å°æºä»£ç
çä¿¡æ¯ãä¾å¦ï¼å¨ä¸ä¸ªåºäº<tt>GNU make</tt>çæ建ç¯å¢ä¸ï¼å¨ä½
ç<tt>Makefile</tt>ä¸æ·»å <a
-href="http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=112564";
+href="https://svn.haxx.se/dev/archive-2006-02/1156.shtml";
>å¦ä¸çä¿¡æ¯</a>ï¼
</p>
@@ -1932,12 +1932,7 @@ href="http://svnbook.red-bean.com/nightl
title="Link to this section">¶</a>
</h3>
-<p>ä½ éè¦å®è£
Windows XPçSP1è¡¥ä¸ãä½
å¯ä»¥å¨ä¸é¢è¿éæ¾å°ææç¸å
³çä¿¡æ¯ï¼</p>
-
- <ul><li>
- <a href="http://support.microsoft.com/default.aspx?scid=kb;EN-US;q317949";
- >http://support.microsoft.com/default.aspx?scid=kb;EN-US;q317949</a>
- </li></ul>
+<p>ä½ éè¦å®è£
Windows XPçSP1è¡¥ä¸ã</p>
</div>
