You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2021/07/23 07:10:08 UTC

[camel] branch main updated: master -> main branch renaming

This is an automated email from the ASF dual-hosted git repository.

bvahdat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new b42ee6d  master -> main branch renaming
b42ee6d is described below

commit b42ee6d0c2807c48c33c5f7675ff08ee1b525205
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Fri Jul 23 09:09:39 2021 +0200

    master -> main branch renaming
---
 docs/user-manual/modules/ROOT/pages/release-guide.adoc            | 4 ++--
 docs/user-manual/modules/ROOT/pages/testing.adoc                  | 4 ++--
 docs/user-manual/modules/faq/pages/how-do-i-edit-the-website.adoc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/release-guide.adoc b/docs/user-manual/modules/ROOT/pages/release-guide.adoc
index 83486d5..279a168 100644
--- a/docs/user-manual/modules/ROOT/pages/release-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/release-guide.adoc
@@ -268,7 +268,7 @@ Complete the following steps to create a new Camel-karaf release:
   $ git checkout BRANCH_NAME
 
 . From Camel 3.3.0 ahead, the camel-karaf project uses camel-dependencies as parent.
-You'll need to set the version here https://github.com/apache/camel-karaf/blob/master/pom.xml#L26
+You'll need to set the version here https://github.com/apache/camel-karaf/blob/main/pom.xml#L26
 To the version released from the main Camel repository as first step.
   
 . Perform a license check with http://creadur.apache.org/rat/apache-rat-plugin[Apache Rat]:
@@ -281,7 +281,7 @@ To the version released from the main Camel repository as first step.
   proceeding with the next step.
 
 . You already have built the main camel repo for releasing, so you already have a final version in your local repository.
-Change the camel-version property in https://github.com/apache/camel-karaf/blob/master/pom.xml accordingly and commit.
+Change the camel-version property in https://github.com/apache/camel-karaf/blob/main/pom.xml accordingly and commit.
 
 . Do a release dry run to check for problems:
 
diff --git a/docs/user-manual/modules/ROOT/pages/testing.adoc b/docs/user-manual/modules/ROOT/pages/testing.adoc
index 5885b23..7555484 100644
--- a/docs/user-manual/modules/ROOT/pages/testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/testing.adoc
@@ -191,12 +191,12 @@ of annotations you can use in your tests.
 === Blueprint Test
 
 Here is the Blueprint Testing
-https://github.com/apache/camel-karaf/blob/master/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java[example
+https://github.com/apache/camel-karaf/blob/main/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java[example
 using XML Config]:
 
 Also notice the use of `getBlueprintDescriptors` to indicate that by
 default we should look for the
-https://github.com/apache/camel-karaf/blob/master/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml[`camelContext.xml`
+https://github.com/apache/camel-karaf/blob/main/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml[`camelContext.xml`
 in the package] to configure the test case which looks like this:
 
 [[Testing-Testingendpoints]]
diff --git a/docs/user-manual/modules/faq/pages/how-do-i-edit-the-website.adoc b/docs/user-manual/modules/faq/pages/how-do-i-edit-the-website.adoc
index 41e388e..b2d6877 100644
--- a/docs/user-manual/modules/faq/pages/how-do-i-edit-the-website.adoc
+++ b/docs/user-manual/modules/faq/pages/how-do-i-edit-the-website.adoc
@@ -28,8 +28,8 @@ To edit files locally, it's important to understand how the website is generated
 Steps to edit a file:
 
 . Fork and clone the https://github.com/apache/camel-website[site generator repository] and the Camel repository that contains the documentation you want to change.
-. Follow the build instructions located in the site generator's https://github.com/apache/camel-website/blob/master/README.md[README file].
-. Open Antora's https://github.com/apache/camel-website/blob/master/antora-playbook.yml[`antora-playbook.yml`] configuration file and change the content sources to https://docs.antora.org/antora/2.1/playbook/configure-content-sources/#local-urls[local repositories].
+. Follow the build instructions located in the site generator's https://github.com/apache/camel-website/blob/main/README.md[README file].
+. Open Antora's https://github.com/apache/camel-website/blob/main/antora-playbook.yml[`antora-playbook.yml`] configuration file and change the content sources to https://docs.antora.org/antora/2.1/playbook/configure-content-sources/#local-urls[local repositories].
 . Edit the file.
 . Build the website.
 . Preview your changes locally.