Author: dsahlberg
Date: Sun Sep 24 07:20:59 2023
New Revision: 1912504
URL: http://svn.apache.org/viewvc?rev=1912504&view=rev
Log:
In site/publish: Merge revision 1911986 to 1912028 from staging
* docs/community-guide/building.part.html:
Change to ci2.apache.org and document configuration.
* docs/community-guide/conventions.part.html
New section about the GitHub integration (including how to close issues).
* docs/community-guide/conventions.toc.html
Link to the above.
* source-code.html
Remove links to the nightly builds as these didn't work.
See the merged commits for more details.
Modified:
subversion/site/publish/ (props changed)
subversion/site/publish/docs/community-guide/building.part.html
subversion/site/publish/docs/community-guide/conventions.part.html
subversion/site/publish/docs/community-guide/conventions.toc.html
subversion/site/publish/source-code.html
Propchange: subversion/site/publish/
------------------------------------------------------------------------------
Merged /subversion/site/staging:r1911987-1912028
Modified: subversion/site/publish/docs/community-guide/building.part.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/building.part.html?rev=1912504&r1=1912503&r2=1912504&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/building.part.html (original)
+++ subversion/site/publish/docs/community-guide/building.part.html Sun Sep 24
07:20:59 2023
@@ -267,7 +267,7 @@ farm. The Buildbot waterfall for the Sub
<li><a href="/buildbot/all">The whole farm</a></li>
</ul>
<p>For more information about build services, head over
-to <a href="https://ci.apache.org/";>ci.apache.org</a>.
+to <a href="https://ci2.apache.org/";>ci2.apache.org</a>.
</p>
<p>If you'd like to receive notifications about buildbot build and
@@ -275,6 +275,12 @@ test failures, please subscribe to the <
href="/mailing-lists.html#notifications-ml">notifications@</a> mailing list.
</p>
+<p>Buildbot is configured in the <a
+href="https://svn.apache.org/repos/infra/infrastructure/buildbot2/";>Infra
+repository</a>, specifically, the <a
+href="https://svn.apache.org/repos/infra/infrastructure/buildbot2/projects/subversion.py";
+>subversion.py</a> file.</p>
+
</div> <!-- build-farm -->
Modified: subversion/site/publish/docs/community-guide/conventions.part.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/conventions.part.html?rev=1912504&r1=1912503&r2=1912504&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/conventions.part.html
(original)
+++ subversion/site/publish/docs/community-guide/conventions.part.html Sun Sep
24 07:20:59 2023
@@ -1268,4 +1268,28 @@ voted for the change to be merged.</p>
</div> <!-- crediting -->
+<div class="h2" id="github">
+<h2>Github
+ <a class="sectionlink" href="<!--#echo var="GUIDE_CONVENTIONS_PAGE"
-->#github"
+ title="Link to this section">¶</a>
+</h2>
+
+<p>The Subversion repository is mirrored to GitHub at <a
+href="https://github.com/apache/subversion/";
+>https://github.com/apache/subversion/</a>.</p>
+
+<p>Some users might create pull requests in GitHub. If the code is committed
+to the Subversion repository, make sure to include text in the log message
+to automatically close the pull request:</p>
+
+<pre>
+This fixes #NNN in GitHub
+</pre>
+
+<p>To manage pull requests without committing code, you must have a GitHub
+account connected to your ASF id and you must have the <tt>triager</tt> role
+assigned to your account by ASF Infra.</p>
+
+</div> <!-- github -->
+
</div> <!-- conventions -->
Modified: subversion/site/publish/docs/community-guide/conventions.toc.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/conventions.toc.html?rev=1912504&r1=1912503&r2=1912504&view=diff
==============================================================================
--- subversion/site/publish/docs/community-guide/conventions.toc.html (original)
+++ subversion/site/publish/docs/community-guide/conventions.toc.html Sun Sep
24 07:20:59 2023
@@ -13,6 +13,7 @@
<li><a href="#other-conventions">Other coding conventions</a></li>
<li><a href="#log-messages">Writing log messages</a></li>
<li><a href="#crediting">Crediting</a></li>
+ <li><a href="#github">GitHub</a></li>
</ul>
<!--#else -->
<ul>
@@ -29,5 +30,6 @@
<li><a href="conventions.html#other-conventions">Other coding
conventions</a></li>
<li><a href="conventions.html#log-messages">Writing log messages</a></li>
<li><a href="conventions.html#crediting">Crediting</a></li>
+ <li><a href="conventions.html#github">GitHub</a></li>
</ul>
<!--#endif -->
Modified: subversion/site/publish/source-code.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/source-code.html?rev=1912504&r1=1912503&r2=1912504&view=diff
==============================================================================
--- subversion/site/publish/source-code.html (original)
+++ subversion/site/publish/source-code.html Sun Sep 24 07:20:59 2023
@@ -82,20 +82,6 @@
</div> <!-- #source-svn -->
-<div class="h2" id="nightlies">
-<h2>Nightly Source Releases
- <a class="sectionlink" href="#nightlies"
- title="Link to this section">¶</a>
-</h2>
-
-<p>The project also produces nightly source code snapshots based upon the
-latest development sources. These are available as
-<a
href="https://ci.apache.org/projects/subversion/nightlies/index.html";>nightly
-source releases</a>, and are only recommended for people who would like to
-test cutting-edge new features. <em>These are not for production use!</em></p>
-
-</div> <!-- #nightlies -->
-
<div class="h2" id="web-access">
<h2>Web Access
<a class="sectionlink" href="#web-access"
