[PATCH 0/2] Update branch and URL references in the documentation

[PATCH 0/2] Update branch and URL references in the documentation

[Massimo Pegorer]

Replace master with main as name of the primary branch.
Replace previous U-Boot git repo URL at DENX with current one.

Signed-off-by: Massimo Pegorer <massimo.pegorer+oss@gmail.com>
---
Massimo Pegorer (2):
      doc: Replace master with main as primary branch name
      global: Update references to U-Boot git repo URL

 board/rockchip/evb_rk3229/README |  2 +-
 doc/CONTRIBUTE.rst               |  6 +++---
 doc/develop/sending_patches.rst  | 12 ++++++------
 tools/buildman/buildman.rst      | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)
---
base-commit: 8d534cec0cc0109a37c0ded8854da03f1526dc0e
change-id: 20261018-master-main-b0aaca076372

Best regards,
--  
Massimo Pegorer <massimo.pegorer+oss@gmail.com>

[PATCH 1/2] doc: Replace master with main as primary branch name

[Massimo Pegorer]

The primary branch name is main, not master anymore. Update references
still naming it master in the documentation, replacing master with main.

Signed-off-by: Massimo Pegorer <massimo.pegorer+oss@gmail.com>
---
 doc/CONTRIBUTE.rst              |  6 +++---
 doc/develop/sending_patches.rst | 12 ++++++------
 tools/buildman/buildman.rst     |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/CONTRIBUTE.rst b/doc/CONTRIBUTE.rst
index e0394515702..b012648e3f2 100644
--- a/doc/CONTRIBUTE.rst
+++ b/doc/CONTRIBUTE.rst
@@ -73,11 +73,11 @@ considered as reasonable amount of time.
 Development Branches
 --------------------
 
-The U-Boot developers use two main branches for developing the code. The master
+The U-Boot developers use two primary branches for developing the code. The main
 branch is used for the current development cycle, while there is also a next
 branch intended to land changes for the next release early to enable wider
-testing of larger code changes. The next branch is merged to master shortly
-after the tagging of a new major release.
+testing of larger code changes. The next branch is merged to main shortly after
+the tagging of a new major release.
 
 Similar to Linux there is a three week merge window post release after which a
 release candidate is tagged. There's typically a new release candidate every
diff --git a/doc/develop/sending_patches.rst b/doc/develop/sending_patches.rst
index b4f82eb18e1..8b8a70da4bb 100644
--- a/doc/develop/sending_patches.rst
+++ b/doc/develop/sending_patches.rst
@@ -36,7 +36,7 @@ configuration file and ``scripts/get_maintainer.pl``.
 .. code-block:: bash
 
    b4 prep -n mmc-fixes
-   git rebase -i origin/master
+   git rebase -i origin/main
    b4 prep --edit-cover
    b4 prep --auto-to-cc
 
@@ -65,7 +65,7 @@ fold them into your commits before resending the updated series.
 .. code-block:: bash
 
    b4 trailers -u
-   git rebase -i origin/master
+   git rebase -i origin/main
    b4 send
 
 Using patman
@@ -132,11 +132,11 @@ General Patch Submission Rules
 * Send your patches as plain text messages: no HTML, no MIME, no links, no
   compression, no attachments. Just plain text. The best way to generate
   patches is by using the ``git format-patch`` command. For a patch that is
-  fixing a bug or regression of some sort, please use the ``master`` branch of
+  fixing a bug or regression of some sort, please use the ``main`` branch of
   the mainline U-Boot git repository located at
   https://git.u-boot-project.org/u-boot/u-boot.git as reference. For new features, if
   the ``next`` branch has been opened (which happens with the release of
-  ``-rc2``) that branch should be used, otherwise ``master`` is acceptable.
+  ``-rc2``) that branch should be used, otherwise ``main`` is acceptable.
 
 * Make sure that your mailer does not mangle the patch by automatic changes
   like wrapping of longer lines etc.
@@ -452,8 +452,8 @@ today. Not all states are used by all custodians.
   it will be accepted for mainline.
 
 * Awaiting Upstream: A custodian may have applied this to the ``next`` branch
-  and has not merged yet to master, or has queued the patch up to be submitted
-  to be merged, but has not yet.
+  and has not merged yet to ``main`` one, or has queued the patch up to be
+  submitted to be merged, but has not yet.
 
 * Superseded: Patches are marked as 'superseded' when the poster submits a
   new version of these patches.
diff --git a/tools/buildman/buildman.rst b/tools/buildman/buildman.rst
index a2061715788..151123ccdca 100644
--- a/tools/buildman/buildman.rst
+++ b/tools/buildman/buildman.rst
@@ -180,7 +180,7 @@ Setting up
 
       cd /path/to/u-boot
       git clone git://git.denx.de/u-boot.git .
-      git checkout -b my-branch origin/master
+      git checkout -b my-branch origin/main
       # Add some commits to the branch, reading for testing
 
 #. Create ~/.buildman to tell Buildman where to find tool chains (see
@@ -505,7 +505,7 @@ branch with a valid upstream):
    ./tools/buildman/buildman -b <branch> -n
 
 If it can't detect the upstream branch, try checking out the branch, and
-doing something like ``git branch --set-upstream-to upstream/master``
+doing something like ``git branch --set-upstream-to upstream/main``
 or something similar. Buildman will try to guess a suitable upstream branch
 if it can't find one (you will see a message like "Guessing upstream as ...").
 You can also use the -c option to manually specify the number of commits to
@@ -1008,9 +1008,9 @@ Building Ranges
 You can build a range of commits by specifying a range instead of a branch
 when using the -b flag. For example::
 
-    buildman -b upstream/master..us-buildman
+    buildman -b upstream/main..us-buildman
 
-will build commits in us-buildman that are not in upstream/master.
+will build commits in us-buildman that are not in upstream/main.
 
 
 Building Faster

-- 
2.34.1

[PATCH 2/2] global: Update references to U-Boot git repo URL

[Massimo Pegorer]

U-Boot git repository URL is git.u-boot-project.org. Update some
references in the documentation still pointing to the previous URL
at DENX.

Signed-off-by: Massimo Pegorer <massimo.pegorer+oss@gmail.com>
---
 board/rockchip/evb_rk3229/README | 2 +-
 tools/buildman/buildman.rst      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/rockchip/evb_rk3229/README b/board/rockchip/evb_rk3229/README
index a8dcc40f09b..01839fe504b 100644
--- a/board/rockchip/evb_rk3229/README
+++ b/board/rockchip/evb_rk3229/README
@@ -3,7 +3,7 @@ Get the Source and prebuild binary
 
   > mkdir ~/evb_rk3229
   > cd ~/evb_rk3229
-  > git clone git://git.denx.de/u-boot.git
+  > git clone https://git.u-boot-project.org/u-boot/u-boot.git
   > git clone https://github.com/OP-TEE/optee_os.git
   > git clone https://github.com/rockchip-linux/rkbin.git
   > git clone https://github.com/rockchip-linux/rkdeveloptool.git
diff --git a/tools/buildman/buildman.rst b/tools/buildman/buildman.rst
index 151123ccdca..9dfd32ad8ba 100644
--- a/tools/buildman/buildman.rst
+++ b/tools/buildman/buildman.rst
@@ -179,7 +179,7 @@ Setting up
    .. code-block:: bash
 
       cd /path/to/u-boot
-      git clone git://git.denx.de/u-boot.git .
+      git clone https://git.u-boot-project.org/u-boot/u-boot.git .
       git checkout -b my-branch origin/main
       # Add some commits to the branch, reading for testing
 

-- 
2.34.1