Author: luke1410 Date: Sun Jan 21 16:00:55 2018 New Revision: 1821800 URL: http://svn.apache.org/viewvc?rev=1821800&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 Sun Jan 21 16:00:55 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 +/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 Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1821800&r1=1821799&r2=1821800&view=diff ============================================================================== --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Sun Jan 21 16:00:55 2018 @@ -4616,9 +4616,11 @@ $ db_archive -a -h /repos/db | xargs rm <p><strong>Note:</strong> If you use Berkeley DB 4.2, Subversion will create new repositories with automatic log file removal enabled. You can change this by passing the <code>--bdb-log-keep</code> option to -<code>svnadmin create</code>. Refer to the section about the <a -href="http://www.oracle.com/technology/documentation/berkeley-db/db/api_c/env_set_flags.html#DB_LOG_AUTOREMOVE"> -<code>DB_LOG_AUTOREMOVE</code></a> flag in the Berkeley DB manual.</p> +<code>svnadmin create</code>. Refer to the <code>DB_LOG_AUTOREMOVE</code> flag +in the Berkeley DB manual located under +docs/api_c/env_set_flags.html#DB_LOG_AUTOREMOVE on the <a +href="https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index-082944.html"> +Berkeley DB 4.2.x download package</a>.</p> </div> @@ -4742,10 +4744,12 @@ give errors like this:</p> </pre> <p>In that case, try Berkeley DB's native <b>db_recover</b> utility -(see <a href="http://www.oracle.com/technology/documentation/berkeley-db/db/utility/db_recover.html" ->db_recover documentation</a>). It -usually lives in a "bin/" subdirectory of the Berkeley DB installation, -for example if you installed Berkeley DB from source, it might be +(see the Berkeley DB db_recover documentation located under +docs/utility/db_recover.html on the <a +href="https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index-082944.html"> +Berkeley DB 4.2.x download package</a>). It usually lives in a "bin/" +subdirectory of the Berkeley DB installation, for example if you installed +Berkeley DB from source, it might be <tt>/usr/local/BerkeleyDB.4.2/bin/db_recover</tt>; or on systems where Berkeley DB comes prepackaged it might just be <tt>/usr/bin/db_recover</tt>. If you have multiple versions of Modified: subversion/site/publish/faq.ja.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.ja.html?rev=1821800&r1=1821799&r2=1821800&view=diff ============================================================================== --- subversion/site/publish/faq.ja.html (original) +++ subversion/site/publish/faq.ja.html Sun Jan 21 16:00:55 2018 @@ -787,7 +787,7 @@ $ db_archive -a -h /repos/db | xargs rm <p><strong>注æ:</strong>ããããªãã Berkeley DB 4.2 ã使ã£ã¦ãããªãã°ãSubversion ã¯ãèªåãã°åé¤æ©è½ãæå¹ã«ãã¦ãªãã¸ããªãä½æãã¦ããã ããã <code>svnadmin create</code>ãå®è¡æã«ã<code>--bdb-log-keep</code>ãªãã·ã§ã³ãæå®ãããã¨ã§ããããå¤æ´ãããã¨ãå¯è½ã ã -Berkeley DBããã¥ã¢ã«ã«æ¸ããã <a href="http://www.oracle.com/technology/documentation/berkeley-db/db/api_c/env_set_flags.html#DB_LOG_AUTOREMOVE"><code>DB_LOG_AUTOREMOVE</code></a>ãã©ã°ãåç §ã®ãã¨ã</p> +Berkeley DBããã¥ã¢ã«ã«æ¸ããã (dead link: http://www.oracle.com/technology/documentation/berkeley-db/db/api_c/env_set_flags.html#DB_LOG_AUTOREMOVE) <code>DB_LOG_AUTOREMOVE</code>ãã©ã°ãåç §ã®ãã¨ã</p> </div> @@ -1847,7 +1847,7 @@ Berkeley DB ã¯ãã¸ã£ã [...] </pre> -<p>ãã®ãããªå ´åã«ã¯ãBerkeley DB èªä½ã®<b>db_recover</b>ã¦ã¼ãã£ãªãã£ã試ãã¦ã¿ãã(<a href="http://www.oracle.com/technology/documentation/berkeley-db/db/utility/db_recover.html">db_recover ããã¥ã¡ã³ã</a>ãåç §ã®ãã¨)ã +<p>ãã®ãããªå ´åã«ã¯ãBerkeley DB èªä½ã®<b>db_recover</b>ã¦ã¼ãã£ãªãã£ã試ãã¦ã¿ãã(dead link: http://www.oracle.com/technology/documentation/berkeley-db/db/utility/db_recover.html) db_recover ããã¥ã¡ã³ã</a>ãåç §ã®ãã¨)ã ãã®ã³ãã³ãã¯ã大æµãBerkeley DB ãã¤ã³ã¹ãã¼ã«ããã ãbin/ããµããã£ã¬ã¯ããªã®ä¸ã«ãããä¾ãã°ãBerkeley DB ãã½ã¼ã¹ããã¤ã³ã¹ãã¼ã«ããã®ãªãã°ã<tt>/usr/local/BerkeleyDB.4.2/bin/db_recover</tt>ãããããªãã Berkeley DB ãäºãã¤ã³ã¹ãã¼ã«ãããã·ã¹ãã ã§ã¯ãåç´ã« <tt>/usr/bin/db_recover</tt>ãããããªãã ãããè¤æ°ã®Berkeley DB ãã¤ã³ã¹ãã¼ã«ããã¦ãããªãã°ã試ããã¨ãã¦ããdb_recover ã®ãã¼ã¸ã§ã³ãããªãã¸ããªã®ä½¿ã£ã¦ãã Berkeley DB ã®ãã¼ã¸ã§ã³ã¨ä¸è´ãã¦ãããã¨ã確èªãããã Modified: subversion/site/publish/faq.zh.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.zh.html?rev=1821800&r1=1821799&r2=1821800&view=diff ============================================================================== --- subversion/site/publish/faq.zh.html (original) +++ subversion/site/publish/faq.zh.html Sun Jan 21 16:00:55 2018 @@ -749,9 +749,9 @@ $ db_archive -a -h /repos/db | xargs rm <p>è¿å¯ä»¥ç<code>svnadmin hotcopy</code>æ<code>hotbackup.py</code>ã</p> -<p><strong>注æï¼</strong>å¦æä½ æ£å¨ä½¿ç¨Berkeley DB 4.2ï¼Subversionå建ççæ¬åºä¼èªå¨å é¤æ¥å¿æ件ï¼å¦æä½ æ³å ³éè¿ä¸ªåè½ï¼å¯ä»¥å¨<code>svnadmin create</code>å½ä»¤ä¸ä½¿ç¨<code>--bdb-log-keep</code>é项ãå¯ä»¥åèBerkeley DBæåä¸ç<a -href="http://www.oracle.com/technology/documentation/berkeley-db/db/api_c/env_set_flags.html#DB_LOG_AUTOREMOVE"> -<code>DB_LOG_AUTOREMOVE</code></a>åæ°ã</p> +<p><strong>注æï¼</strong>å¦æä½ æ£å¨ä½¿ç¨Berkeley DB 4.2ï¼Subversionå建ççæ¬åºä¼èªå¨å é¤æ¥å¿æ件ï¼å¦æä½ æ³å ³éè¿ä¸ªåè½ï¼å¯ä»¥å¨<code>svnadmin create</code>å½ä»¤ä¸ä½¿ç¨<code>--bdb-log-keep</code>é项ãå¯ä»¥åèBerkeley DBæåä¸ç (dead link: +http://www.oracle.com/technology/documentation/berkeley-db/db/api_c/env_set_flags.html#DB_LOG_AUTOREMOVE +) <code>DB_LOG_AUTOREMOVE</code>åæ°ã</p> </div> @@ -1700,8 +1700,9 @@ href="http://lookfirst.com/2007/11/subve </pre> <p>è¿ç§æ åµä¸å¯ä»¥è¯è¯Berkeley DBçå·¥å ·<b>db_recover</b> -ï¼åè§<a href="http://www.oracle.com/technology/documentation/berkeley-db/db/utility/db_recover.html" ->db_recoverææ¡£</a>ï¼.è¿ä¸ªå½ä»¤é常å¨Berkeley DBå®è£ ç®å½çåç®å½"bin/"ä¸, +ï¼åè§ (dead link: +http://www.oracle.com/technology/documentation/berkeley-db/db/utility/db_recover.html +)db_recoverææ¡£ï¼.è¿ä¸ªå½ä»¤é常å¨Berkeley DBå®è£ ç®å½çåç®å½"bin/"ä¸, ä¾å¦ä½ ä»æºä»£ç å®è£ çBerkeley DB,å½ä»¤å¯è½æ¯ <tt>/usr/local/BerkeleyDB.4.2/bin/db_recover</tt>;æå¨æäºç³»ç»ä¸é¢å®è£ çBerkeley DBï¼å¯è½æ¯ <tt>/usr/bin/db_recover</tt>.å¦æä½ çç³»ç»ä¸å®è£ äºå¤ä¸ªçæ¬ç