Author: markt Date: Fri May 21 20:16:56 2021 New Revision: 1890085 URL: http://svn.apache.org/viewvc?rev=1890085&view=rev Log: Update after branch rename to main
Modified: tomcat/site/trunk/docs/source.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/source.xml Modified: tomcat/site/trunk/docs/source.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1890085&r1=1890084&r2=1890085&view=diff ============================================================================== --- tomcat/site/trunk/docs/source.html (original) +++ tomcat/site/trunk/docs/source.html Fri May 21 20:16:56 2021 @@ -28,7 +28,7 @@ control system:</p> </ul> </div><h3 id="Git">Git</h3><div class="text"> -<p>The ASF operates a dual master system for repositories that use Git as their +<p>The ASF operates a dual primary system for repositories that use Git as their primary version control system. This means committers may commit to either gitbox.apache.org or GitHub.</p> @@ -97,9 +97,9 @@ first.</p> <p>This is the Git repository that contains the parent POM for the Apache Tomcat Tag Libraries. There is currently one active branch:</p> <ul> -<li>master</li> +<li>main</li> </ul> -<p>master is the only development branch. All development work occurs in this +<p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat-taglibs-parent">GitHub</a>.</p> @@ -108,9 +108,9 @@ branch.</p> <p>This is the Git repository that contains the Apache Tomcat Standard Tag Library. There is currently one active branch:</p> <ul> -<li>master</li> +<li>main</li> </ul> -<p>master is the only development branch. All development work occurs in this +<p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat-taglibs-standard">GitHub</a>.</p> @@ -119,9 +119,9 @@ branch.</p> <p>This is the Git repository that contains the Apache Tomcat RDC Tag Library. There is currently one active branch:</p> <ul> -<li>master</li> +<li>main</li> </ul> -<p>master is the only development branch. All development work occurs in this +<p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat-taglibs-rdc">GitHub</a>.</p> @@ -130,9 +130,9 @@ branch.</p> <p>This is the Git repository that contains the web site for the Apache Tomcat Tag Libraries. There is currently one active branch:</p> <ul> -<li>master</li> +<li>main</li> </ul> -<p>master is the only development branch. All development work occurs in this +<p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat-taglibs-site">GitHub</a>.</p> Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1890085&r1=1890084&r2=1890085&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Fri May 21 20:16:56 2021 @@ -4,7 +4,7 @@ <properties> <author>Apache Tomcat Project</author> <title>Welcome!</title> - <!-- Allows markt to monitor site via Google's webmaster tools --> + <!-- Allows markt to monitor site via Google's web tools --> <!-- Please don't delete unless it is causing problems (in which case go ahead!) --> <google-site-verification>nA9F0GvGNjVCU9W7HBziONQVx6FehvgQglI1X7WPfRw</google-site-verification> </properties> Modified: tomcat/site/trunk/xdocs/source.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1890085&r1=1890084&r2=1890085&view=diff ============================================================================== --- tomcat/site/trunk/xdocs/source.xml (original) +++ tomcat/site/trunk/xdocs/source.xml Fri May 21 20:16:56 2021 @@ -38,7 +38,7 @@ control system:</p> <section name="Git"> -<p>The ASF operates a dual master system for repositories that use Git as their +<p>The ASF operates a dual primary system for repositories that use Git as their primary version control system. This means committers may commit to either gitbox.apache.org or GitHub.</p> @@ -117,9 +117,9 @@ first.</p> <p>This is the Git repository that contains the parent POM for the Apache Tomcat Tag Libraries. There is currently one active branch:</p> <ul> -<li>master</li> +<li>main</li> </ul> -<p>master is the only development branch. All development work occurs in this +<p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat-taglibs-parent">GitHub</a>.</p> @@ -130,9 +130,9 @@ branch.</p> <p>This is the Git repository that contains the Apache Tomcat Standard Tag Library. There is currently one active branch:</p> <ul> -<li>master</li> +<li>main</li> </ul> -<p>master is the only development branch. All development work occurs in this +<p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat-taglibs-standard">GitHub</a>.</p> @@ -143,9 +143,9 @@ branch.</p> <p>This is the Git repository that contains the Apache Tomcat RDC Tag Library. There is currently one active branch:</p> <ul> -<li>master</li> +<li>main</li> </ul> -<p>master is the only development branch. All development work occurs in this +<p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat-taglibs-rdc">GitHub</a>.</p> @@ -156,9 +156,9 @@ branch.</p> <p>This is the Git repository that contains the web site for the Apache Tomcat Tag Libraries. There is currently one active branch:</p> <ul> -<li>master</li> +<li>main</li> </ul> -<p>master is the only development branch. All development work occurs in this +<p>main is the only development branch. All development work occurs in this branch.</p> <p>A web based view of this repository is available via <a href="https://github.com/apache/tomcat-taglibs-site">GitHub</a>.</p> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org