Author: luke1410
Date: Tue Dec 5 00:47:47 2017
New Revision: 1817140
URL: http://svn.apache.org/viewvc?rev=1817140&view=rev
Log:
* site/publish: Merge from staging.
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/community-guide/mailing-lists.part.html
subversion/site/publish/faq.html
subversion/site/publish/faq.ja.html
subversion/site/publish/faq.zh.html
subversion/site/publish/mailing-lists.html
subversion/site/publish/source-code.html
Propchange: subversion/site/publish/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 5 00:47:47 2017
@@ -1 +1 @@
-/subversion/site/staging:1815037-1815041,1815121-1815122,1815143,1816503,1816509-1816618
+/subversion/site/staging:1815037-1815041,1815121-1815122,1815143,1816503,1816509-1816618,1816773-1816926
Modified: subversion/site/publish/docs/community-guide/mailing-lists.part.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/mailing-lists.part.html?rev=1817140&r1=1817139&r2=1817140&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/mailing-lists.part.html
(original)
+++ subversion/site/publish/docs/community-guide/mailing-lists.part.html Tue
Dec 5 00:47:47 2017
@@ -10,7 +10,7 @@
Subversion mailing lists, and addresses the problems seen most
frequently on those lists. It should <i>not</i> be taken as a
complete guide to mailing list etiquette — you can <a
-href="http://www.google.com/search?hl=en&ie=UTF-8&q=%22mailing+list+etiquette%22&btnG=Google+Search";
+href="https://www.google.com/search?hl=en&ie=UTF-8&q=%22mailing+list+etiquette%22&btnG=Google+Search";
>find one of those on the Net</a> pretty easily if you want one.</p>
<p>If you follow these conventions when posting to our mailing lists,
@@ -143,8 +143,8 @@ href="https://www.unicom.com/pw/reply-to
"Principle of Least Damage" and "Can't Find My Way Back Home"
sections. From time to time, someone posts asking why we don't set
the <tt>Reply-to</tt> header. Sometimes that person will mention <a
-href="http://www.metasystema.net/essays/reply-to.mhtml";
->http://www.metasystema.net/essays/reply-to.mhtml</a>, which
+href="http://marc.merlins.org/netrants/reply-to-useful.html";
+>http://marc.merlins.org/netrants/reply-to-useful.html</a>, which
gives arguments in favor of modifying the <tt>Reply-to</tt> field.
The list administrators are aware of both documents, and see that both
sides of the argument have merits, but in the end have chosen not to
@@ -227,7 +227,7 @@ not a major inconvenience even when done
advice on how to not flame people for their bad quoting habits, see <a
href="https://www.netmeister.org/news/learn2quote.html";
>https://www.netmeister.org/news/learn2quote.html</a> (Deutsch:
-<a href="http://learn.to/quote";>http://learn.to/quote</a>).</p>
+<a
href="http://www.afaik.de/usenet/faq/zitieren/download/zitieren-alles.html";>http://www.afaik.de/usenet/faq/zitieren/download/zitieren-alles.html</a>).</p>
</div> <!-- top-posting -->
Modified: subversion/site/publish/faq.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1817140&r1=1817139&r2=1817140&view=diff
==============================================================================
--- subversion/site/publish/faq.html (original)
+++ subversion/site/publish/faq.html Tue Dec 5 00:47:47 2017
@@ -1322,7 +1322,7 @@ formatting or content changes necessary)
<p>The basic process looks like this:</p>
<blockquote><pre>
- $ svn co http://svn.apache.org/repos/asf/subversion/site subversion-site
+ $ svn co https://svn.apache.org/repos/asf/subversion/site
subversion-site
$ cd subversion-site/publish
[ make changes to faq.html ]
@@ -2056,7 +2056,7 @@ OpenSSH keys and <b><tt>pageant</tt></b>
<p>Setting up <tt>ssh-agent</tt> is outside the scope of this
document, but a <a
-href="http://www.google.com/search?hl=en&lr=&ie=UTF-8&q=%22ssh-agent%22";
+href="https://www.google.com/search?hl=en&lr=&ie=UTF-8&q=%22ssh-agent%22";
>Google search for "ssh-agent"</a> will quickly get you answers. Or
if you're <i>really</i> impatient, try one of these:</p>
Modified: subversion/site/publish/faq.ja.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/faq.ja.html?rev=1817140&r1=1817139&r2=1817140&view=diff
==============================================================================
--- subversion/site/publish/faq.ja.html (original)
+++ subversion/site/publish/faq.ja.html Tue Dec 5 00:47:47 2017
@@ -1286,7 +1286,7 @@ CVSã® $Log$ ã¨åçå
<tt>ssh-agent</tt>ãç°¡åã«ä½¿ãçºã«äººæ°ã®ããã¹ã¯ãªããã<b><tt>keychain</tt></b>
ã ãWindows ã§ã¯ãssh
ã®æåãªä»£æ¿ã¯ã©ã¤ã¢ã³ãã¨ãã¦<b><tt>PuTTY</tt></b> ãããã
OpenSSH ã®éµãã¤ã³ãã¼ãããçºã«ã¯ã<b><tt>PuTTYgen</tt></b>
ãããã¹ãã¬ã¼ãºããã£ãã·ã¥ããçºã«ã¯ã<b><tt>pageant</tt></b>
ãåç
§ã®äºã</p>
-<p><tt>ssh-agent</tt>ã®è¨å®æ¹æ³ã¯ãã®ããã¥ã¡ã³ãã®ç¯çå¤ã
ãã©ã<a
href="http://www.google.com/search?hl=en&lr=&ie=UTF-8&q=%22ssh-agent%22";>Googleã§ãssh-agent
ãæ¤ç´¢</a>ããã°ãããã«åçãå¾ãããã ããã
+<p><tt>ssh-agent</tt>ã®è¨å®æ¹æ³ã¯ãã®ããã¥ã¡ã³ãã®ç¯çå¤ã
ãã©ã<a
href="https://www.google.com/search?hl=en&lr=&ie=UTF-8&q=%22ssh-agent%22";>Googleã§ãssh-agent
ãæ¤ç´¢</a>ããã°ãããã«åçãå¾ãããã ããã
<i>ãã®åã</i> ãã£ãã¡ãªããªãã¯ã次ã®ãªã³ã¯ãåç
§ã®ãã¨ã</p>
<pre>
Modified: subversion/site/publish/faq.zh.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/faq.zh.html?rev=1817140&r1=1817139&r2=1817140&view=diff
==============================================================================
--- subversion/site/publish/faq.zh.html (original)
+++ subversion/site/publish/faq.zh.html Tue Dec 5 00:47:47 2017
@@ -1205,7 +1205,7 @@ href='https://tortoisesvn.net/downloads.
<p>OpenSSH使ç¨<b><tt>ssh-keygen</tt></b>å建å¯é¥ãéè¿<b><tt>ssh-agent</tt></b>ç¼åå¯ç
çè¯ã使ç¨<b><tt>ssh-add</tt></b>å°å¯ç çè¯æ·»å
å°ä»£çç¼åä¸ãä¸ä¸ªç®å<tt>ssh-agent</tt>使ç¨çèæ¬æ¯<b><tt>keychain</tt></b>ãå¨Windowsä¸ï¼<b><tt>PuTTY</tt></b>æ¯ä¸ä¸ªæµè¡çssh客æ·ç«¯éæ©ï¼å°OpenSSHå¯é¥å¯¼å
¥å°<b><tt>pageant</tt></b>并ç¼åå¯ç
çè¯å¯ä»¥ç<b><tt>PuTTYgen</tt></b>ã</p>
<p>设置<tt>ssh-agent</tt>å·²ç»è¶
åºäºæ¬æçèå´ï¼ä½æ¯<a
-href="http://www.google.com/search?hl=en&lr=&ie=UTF-8&q=%22ssh-agent%22";
+href="https://www.google.com/search?hl=en&lr=&ie=UTF-8&q=%22ssh-agent%22";
>å¨Googleä¸æç´¢âssh-agentâ</a>å¯ä»¥å¿«éå¾å°çæ¡ï¼æè
>å¦æä½ æ²¡æèå¿ï¼å¯ä»¥æ¯çè¿äºï¼</p>
<pre>
Modified: subversion/site/publish/mailing-lists.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/mailing-lists.html?rev=1817140&r1=1817139&r2=1817140&view=diff
==============================================================================
--- subversion/site/publish/mailing-lists.html (original)
+++ subversion/site/publish/mailing-lists.html Tue Dec 5 00:47:47 2017
@@ -149,8 +149,8 @@ delay for your post to appear (see below
(<a href="/mail/users/">mbox files</a>)</li>
<li><a href="https://svn.haxx.se/users/";
>svn.haxx.se</a></li>
- <li><a
href="http://news.gmane.org/gmane.comp.version-control.subversion.user";
- >news.gmane.org</a></li>
+ <li><a
href="nntps://news.gmane.org/gmane.comp.version-control.subversion.user"
+ >news.gmane.org (NNTP/SSL)</a></li>
</ul></td>
</tr>
<tr>
@@ -210,8 +210,8 @@ delay for your post to appear (see below
(<a href="/mail/dev/">mbox files</a>)</li>
<li><a href="https://svn.haxx.se/dev/";
>svn.haxx.se</a></li>
- <li><a
href="http://news.gmane.org/gmane.comp.version-control.subversion.devel";
- >news.gmane.org</a></li>
+ <li><a
href="nntps://news.gmane.org/gmane.comp.version-control.subversion.devel"
+ >news.gmane.org (NNTP/SSL)</a></li>
</ul></td>
</tr>
</tbody>
Modified: subversion/site/publish/source-code.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/source-code.html?rev=1817140&r1=1817139&r2=1817140&view=diff
==============================================================================
--- subversion/site/publish/source-code.html (original)
+++ subversion/site/publish/source-code.html Tue Dec 5 00:47:47 2017
@@ -65,15 +65,15 @@
</h2>
<p>Subversion's source code is stored in the
- <code><a href="http://svn.apache.org/repos/asf/subversion/";
+ <code><a href="https://svn.apache.org/repos/asf/subversion/";
>subversion</a></code> tree of the
- main <a href="http://svn.apache.org/repos/asf/"; >Subversion
+ main <a href="https://svn.apache.org/repos/asf/"; >Subversion
repository of the Apache Software Foundation</a>.
You can checkout the latest version of the code
using the following command:</p>
<blockquote>
-<pre>$ svn co http://svn.apache.org/repos/asf/subversion/trunk subversion
+<pre>$ svn co https://svn.apache.org/repos/asf/subversion/trunk subversion
</pre>
</blockquote>
