Author: hartmannathan
Date: Fri Sep 11 15:25:28 2020
New Revision: 1881643
URL: http://svn.apache.org/viewvc?rev=1881643&view=rev
Log:
In 'staging': catch-up merge from 'publish'
Modified:
subversion/site/staging/ (props changed)
subversion/site/staging/.message-ids.tsv
subversion/site/staging/docs/community-guide/l10n.part.html
subversion/site/staging/faq.html
subversion/site/staging/faq.ja.html (contents, props changed)
subversion/site/staging/faq.zh.html (props changed)
subversion/site/staging/mailing-lists.html
subversion/site/staging/news.html (contents, props changed)
subversion/site/staging/reporting-issues.html
subversion/site/staging/upcoming.part.html
Propchange: subversion/site/staging/
------------------------------------------------------------------------------
Merged /subversion/site/publish:r1879655-1881642
Modified: subversion/site/staging/.message-ids.tsv
URL:
http://svn.apache.org/viewvc/subversion/site/staging/.message-ids.tsv?rev=1881643&r1=1881642&r2=1881643&view=diff
==============================================================================
--- subversion/site/staging/.message-ids.tsv (original)
+++ subversion/site/staging/.message-ids.tsv Fri Sep 11 15:25:28 2020
@@ -1,5 +1,5 @@
# Message-ids of archived emails that are referenced by a svn.haxx.se URL.
-# Generated by tools/haxx-url-to-message-id.sh on 2020-05-28
+# Generated by tools/haxx-url-to-message-id.sh on 2020-07-09
https://svn.haxx.se/dev/archive-2003-01/1125.shtml
[email protected]
https://svn.haxx.se/dev/archive-2003-02/0068.shtml
[email protected]
https://svn.haxx.se/dev/archive-2003-10/0136.shtml
[email protected]
@@ -10,6 +10,7 @@ https://svn.haxx.se/dev/archive-2005-12/
https://svn.haxx.se/dev/archive-2006-02/1156.shtml
[email protected]
https://svn.haxx.se/dev/archive-2006-02/1214.shtml
[email protected]
https://svn.haxx.se/dev/archive-2006-09/0316.shtml
[email protected]
+https://svn.haxx.se/dev/archive-2007-11/0848.shtml
[email protected]
https://svn.haxx.se/dev/archive-2008-10/0213.shtml
[email protected]
https://svn.haxx.se/dev/archive-2010-01/0545.shtml
[email protected]
https://svn.haxx.se/dev/archive-2010-02/0418.shtml
[email protected]
Modified: subversion/site/staging/docs/community-guide/l10n.part.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/docs/community-guide/l10n.part.html?rev=1881643&r1=1881642&r2=1881643&view=diff
==============================================================================
--- subversion/site/staging/docs/community-guide/l10n.part.html (original)
+++ subversion/site/staging/docs/community-guide/l10n.part.html Fri Sep 11
15:25:28 2020
@@ -70,10 +70,7 @@ string composition.</p>
href="https://svn.apache.org/repos/asf/subversion/trunk/subversion/po/";
>the po section of the repository</a>. Please contact
[email protected] when you want to start a translation not
-available yet. Translation discussion takes place both on that list
-and on dedicated native language mailing lists (<a
-href="http://subversion.tigris.org/servlets/ProjectMailingListList";
-><em>[email protected]</em></a>).</p>
+available yet. Translation discussion takes place on that list.</p>
</div> <!-- l10n-overview -->
Modified: subversion/site/staging/faq.html
URL:
http://svn.apache.org/viewvc/subversion/site/staging/faq.html?rev=1881643&r1=1881642&r2=1881643&view=diff
==============================================================================
--- subversion/site/staging/faq.html (original)
+++ subversion/site/staging/faq.html Fri Sep 11 15:25:28 2020
@@ -861,26 +861,14 @@ chapter 5 in The Subversion Book</a>.</p
title="Link to this section">¶</a>
</h3>
-<p>Try the cvs2svn conversion tool, from <a
-href="http://cvs2svn.tigris.org/";>http://cvs2svn.tigris.org/</a> (see
-also its <a href="http://cvs2svn.tigris.org/features.html"; >feature
-list</a> and <a href="http://cvs2svn.tigris.org/cvs2svn.html";
->documentation</a>). cvs2svn seems to be what most people use, but if
-for some reason it doesn't meet your needs, there are at least two
-other tools you could try:</p>
-
-<ul>
-
-<li>One based on <a
-href="http://public.perforce.com/public/revml/index.html";>VCP</a>
-written by Chia-liang Kao can be found on <a
-href="http://search.cpan.org/perldoc?VCP::Dest::svk";>CPAN</a>.</li>
-
-<li>refinecvs written by Lev Serebryakov is at <a
-href="http://lev.serebryakov.spb.ru/refinecvs/";
->http://lev.serebryakov.spb.ru/refinecvs/</a>.</li>
-
-</ul>
+<p>The cvs2svn conversion tool seems to be what most people use. The
+sources are hosted at <a href="https://github.com/mhagger/cvs2svn";
+>https://github.com/mhagger/cvs2svn</a>. If you are running a Linux or
+BSD-based system, your distribution might have a cvs2svn package.</p>
+
+<p>If cvs2svn doesn't meet your needs, you might try refinecvs written
+by Lev Serebryakov at <a href="http://lev.serebryakov.spb.ru/refinecvs/";
+>http://lev.serebryakov.spb.ru/refinecvs/</a>.</p>
</div>
