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-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 6e5a5ec Update after rename of branch to main
6e5a5ec is described below
commit 6e5a5ece201d75d714c161685c99df5315d18cd4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 21 21:25:10 2021 +0100
Update after rename of branch to main
---
HOWTO-RELEASE.txt | 2 +-
tools/jkrelease.sh | 6 +++---
xdocs/miscellaneous/doccontrib.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 3586c0b..e051936 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -88,7 +88,7 @@ Here is an example for mod_jk 1.2.49
git commit -a -m "Tag JK_1_2_48"
git tag JK_1_2_48
git push origin JK_1_2_48
-# reset master
+# reset main
Build the mod_jk 1.2 documentation
diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index b75e117..6042a9f 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -53,7 +53,7 @@ usage() {
echo " -r: revision or hash to package, only allowed in"
echo " combination with '-b BRANCH', '-T' or '-d DIR'"
echo " -b: package from branch BRANCH"
- echo " -T: package from trunk/master"
+ echo " -T: package from trunk/main"
echo " -d: package from local directory"
echo " -o: owner used for creating tar archive"
echo " -g: group used for creating tar archive"
@@ -175,10 +175,10 @@ if [ -n "$trunk" ]
then
if [ $USE_GIT -eq 1 ]
then
- JK_REV=`git ls-remote $REPOS refs/heads/master | awk '{print $1}'`
+ JK_REV=`git ls-remote $REPOS refs/heads/main | awk '{print $1}'`
if [ -z "$JK_REV" ]
then
- echo "No git hash found via 'git ls-remote $REPOS
refs/heads/master'"
+ echo "No git hash found via 'git ls-remote $REPOS refs/heads/main'"
exit 3
fi
JK_SUFFIX=-${JK_REV}
diff --git a/xdocs/miscellaneous/doccontrib.xml
b/xdocs/miscellaneous/doccontrib.xml
index a0c9e6b..1589ef1 100644
--- a/xdocs/miscellaneous/doccontrib.xml
+++ b/xdocs/miscellaneous/doccontrib.xml
@@ -255,7 +255,7 @@ Writing Guide</a>
<a href="https://git-scm.com/";>Git Home</a>
</li>
<li>
-<a href="https://github.com/apache/tomcat-connectors/tree/master/xdocs";>JK
Docs repository</a>
+<a href="https://github.com/apache/tomcat-connectors/tree/main/xdocs";>JK Docs
repository</a>
</li>
</ul>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
