Author: markt
Date: Fri May 21 20:38:17 2021
New Revision: 1890087
URL: http://svn.apache.org/viewvc?rev=1890087&view=rev
Log:
Update after branch rename to main
Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/xdocs/bugreport.xml
tomcat/site/trunk/xdocs/ci.xml
tomcat/site/trunk/xdocs/source.xml
Modified: tomcat/site/trunk/docs/bugreport.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1890087&r1=1890086&r2=1890087&view=diff
==============================================================================
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Fri May 21 20:38:17 2021
@@ -185,7 +185,7 @@ problem you are having before reporting
</tr>
<tr>
- <td>Tomcat 10.0 (master)</td>
+ <td>Tomcat 10.0 (main)</td>
<td>
<a
href="https://tomcat.apache.org/tomcat-10.0-doc/changelog.html";>changelog.html</a>
</td>
@@ -230,7 +230,7 @@ problem you are having before reporting
<a
href="https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";>changelog.html</a>
</td>
<td>
- <a
href="https://github.com/apache/tomcat-connectors/blob/master/xdocs/miscellaneous/changelog.xml";>changelog.xml</a>
+ <a
href="https://github.com/apache/tomcat-connectors/blob/main/xdocs/miscellaneous/changelog.xml";>changelog.xml</a>
</td>
</tr>
@@ -240,7 +240,7 @@ problem you are having before reporting
<a
href="https://tomcat.apache.org/native-doc/miscellaneous/changelog.html";>changelog.html</a>
</td>
<td>
- <a
href="https://github.com/apache/tomcat-native/blob/master/xdocs/miscellaneous/changelog.xml";>changelog.xml</a>
+ <a
href="https://github.com/apache/tomcat-native/blob/main/xdocs/miscellaneous/changelog.xml";>changelog.xml</a>
</td>
</tr>
</table>
Modified: tomcat/site/trunk/docs/ci.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1890087&r1=1890086&r2=1890087&view=diff
==============================================================================
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Fri May 21 20:38:17 2021
@@ -27,7 +27,7 @@ currently developed not yet released ver
prepared and published by ASF Buildbot, using the latest source code.</p>
<ul>
- <li><a href="http://ci.apache.org/projects/tomcat/tomcat10/docs/index.html";
rel="nofollow">Tomcat 10.0.x</a> (master)</li>
+ <li><a href="http://ci.apache.org/projects/tomcat/tomcat10/docs/index.html";
rel="nofollow">Tomcat 10.0.x</a> (main)</li>
<li><a href="http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html";
rel="nofollow">Tomcat 9.0.x</a></li>
<li><a href="http://ci.apache.org/projects/tomcat/tomcat85/docs/index.html";
rel="nofollow">Tomcat 8.5.x</a></li>
<li><a href="http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html";
rel="nofollow">Tomcat 7.0.x</a></li>
Modified: tomcat/site/trunk/docs/source.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1890087&r1=1890086&r2=1890087&view=diff
==============================================================================
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Fri May 21 20:38:17 2021
@@ -40,16 +40,16 @@ found at git.apache.org or GitHub and ar
<p>This is the Git repository that contains the Apache Tomcat source code.
There
are currently four branches:</p>
<ul>
-<li>master</li>
+<li>main</li>
<li>9.0.x</li>
<li>8.5.x</li>
<li>7.0.x</li>
</ul>
-<p>master is the primary development branch. Apache Tomcat 10.0.x releases are
+<p>main is the primary development branch. Apache Tomcat 10.0.x releases are
tagged from this branch. Development work generally occurs in this branch
first.</p>
<p>9.0.x is the stable release branch for Apache Tomcat 9.0.x. Generally, fixes
-are cherry picked from master into this branch.</p>
+are cherry picked from main into this branch.</p>
<p>8.5.x is the stable release branch for Apache Tomcat 8.5.x. Generally, fixes
are cherry picked from 9.0.x into this branch.</p>
<p>7.0.x is the stable release branch for Apache Tomcat 7.0.x. Generally, fixes
Modified: tomcat/site/trunk/xdocs/bugreport.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1890087&r1=1890086&r2=1890087&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/bugreport.xml (original)
+++ tomcat/site/trunk/xdocs/bugreport.xml Fri May 21 20:38:17 2021
@@ -199,7 +199,7 @@ problem you are having before reporting
</tr>
<tr>
- <td>Tomcat 10.0 (master)</td>
+ <td>Tomcat 10.0 (main)</td>
<td>
<a
href="https://tomcat.apache.org/tomcat-10.0-doc/changelog.html";>changelog.html</a>
</td>
@@ -244,7 +244,7 @@ problem you are having before reporting
<a
href="https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";>changelog.html</a>
</td>
<td>
- <a
href="https://github.com/apache/tomcat-connectors/blob/master/xdocs/miscellaneous/changelog.xml";>changelog.xml</a>
+ <a
href="https://github.com/apache/tomcat-connectors/blob/main/xdocs/miscellaneous/changelog.xml";>changelog.xml</a>
</td>
</tr>
@@ -254,7 +254,7 @@ problem you are having before reporting
<a
href="https://tomcat.apache.org/native-doc/miscellaneous/changelog.html";>changelog.html</a>
</td>
<td>
- <a
href="https://github.com/apache/tomcat-native/blob/master/xdocs/miscellaneous/changelog.xml";>changelog.xml</a>
+ <a
href="https://github.com/apache/tomcat-native/blob/main/xdocs/miscellaneous/changelog.xml";>changelog.xml</a>
</td>
</tr>
</table>
Modified: tomcat/site/trunk/xdocs/ci.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1890087&r1=1890086&r2=1890087&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/ci.xml (original)
+++ tomcat/site/trunk/xdocs/ci.xml Fri May 21 20:38:17 2021
@@ -37,7 +37,7 @@ currently developed not yet released ver
prepared and published by ASF Buildbot, using the latest source code.</p>
<ul>
- <li><a href="http://ci.apache.org/projects/tomcat/tomcat10/docs/index.html";
rel="nofollow">Tomcat 10.0.x</a> (master)</li>
+ <li><a href="http://ci.apache.org/projects/tomcat/tomcat10/docs/index.html";
rel="nofollow">Tomcat 10.0.x</a> (main)</li>
<li><a href="http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html";
rel="nofollow">Tomcat 9.0.x</a></li>
<li><a href="http://ci.apache.org/projects/tomcat/tomcat85/docs/index.html";
rel="nofollow">Tomcat 8.5.x</a></li>
<li><a href="http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html";
rel="nofollow">Tomcat 7.0.x</a></li>
Modified: tomcat/site/trunk/xdocs/source.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1890087&r1=1890086&r2=1890087&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/source.xml (original)
+++ tomcat/site/trunk/xdocs/source.xml Fri May 21 20:38:17 2021
@@ -52,16 +52,16 @@ found at git.apache.org or GitHub and ar
<p>This is the Git repository that contains the Apache Tomcat source code.
There
are currently four branches:</p>
<ul>
-<li>master</li>
+<li>main</li>
<li>9.0.x</li>
<li>8.5.x</li>
<li>7.0.x</li>
</ul>
-<p>master is the primary development branch. Apache Tomcat 10.0.x releases are
+<p>main is the primary development branch. Apache Tomcat 10.0.x releases are
tagged from this branch. Development work generally occurs in this branch
first.</p>
<p>9.0.x is the stable release branch for Apache Tomcat 9.0.x. Generally, fixes
-are cherry picked from master into this branch.</p>
+are cherry picked from main into this branch.</p>
<p>8.5.x is the stable release branch for Apache Tomcat 8.5.x. Generally, fixes
are cherry picked from 9.0.x into this branch.</p>
<p>7.0.x is the stable release branch for Apache Tomcat 7.0.x. Generally, fixes
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
