This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new f0627aa Update after renaming branch to main
f0627aa is described below
commit f0627aa10346539995e4546275b58d02bd7323ca
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 21 21:41:46 2021 +0100
Update after renaming branch to main
---
.github/workflows/ci.yml | 4 ++--
BUILDING.txt | 2 +-
build.properties.default | 2 +-
webapps/docs/web-socket-howto.xml | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d380ea..b3079ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,10 +15,10 @@ name: Smoke Test
on:
push:
branches:
- - master
+ - main
pull_request:
branches:
- - master
+ - main
env:
LC_ALL: en_US.UTF-8
diff --git a/BUILDING.txt b/BUILDING.txt
index 1577c6b..ba16b72 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -95,7 +95,7 @@ source distribution, do the following:
(3.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@
Clone the source using git, then checkout a specific major branch or
-master for the latest code development, or download and unpack a source
+main for the latest code development, or download and unpack a source
package.
* Tomcat GitHub repository URL:
diff --git a/build.properties.default b/build.properties.default
index 83231eb..f1bd57b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -35,7 +35,7 @@ version.suffix=-dev
#ant.tstamp.now=1620482400
# ----- Source control flags -----
-git.branch=master
+git.branch=main
# ----- Build control flags -----
# Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/web-socket-howto.xml
b/webapps/docs/web-socket-howto.xml
index 7206ad0..709a2c3 100644
--- a/webapps/docs/web-socket-howto.xml
+++ b/webapps/docs/web-socket-howto.xml
@@ -44,9 +44,9 @@
<p>There are several example applications that demonstrate how the WebSocket
API
can be used. You will need to look at both the client side <a
-
href="https://github.com/apache/tomcat/tree/master/webapps/examples/websocket";>
+
href="https://github.com/apache/tomcat/tree/main/webapps/examples/websocket";>
HTML</a> and the server side <a
-
href="https://github.com/apache/tomcat/tree/master/webapps/examples/WEB-INF/classes/websocket";>
+
href="https://github.com/apache/tomcat/tree/main/webapps/examples/WEB-INF/classes/websocket";>
code</a>.</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
