Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 18, 2025

Follow up #6012


This is an automatic backport of pull request #6016 done by Mergify.

* Updated REP links

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>

* Update source/index.rst

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

* Update source/index.rst

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

* Update source/Glossary.rst

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

---------

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 6f986a1)

# Conflicts:
#	source/Installation.rst
#	source/Installation/RHEL-Install-RPMs.rst
#	source/Installation/Ubuntu-Install-Debs.rst
@mergify mergify bot added the conflicts label Nov 18, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 18, 2025

Cherry-pick of 6f986a1 has failed:

On branch mergify/bp/jazzy/pr-6016
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 6f986a1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   source/Concepts/Advanced/About-Build-System.rst
	modified:   source/Glossary.rst
	modified:   source/How-To-Guides/Ament-CMake-Documentation.rst
	modified:   source/How-To-Guides/Installing-on-Raspberry-Pi.rst
	modified:   source/How-To-Guides/Migrating-from-ROS1/Migrating-CPP-Package-Example.rst
	modified:   source/How-To-Guides/Migrating-from-ROS1/Migrating-CPP-Packages.rst
	modified:   source/How-To-Guides/Migrating-from-ROS1/Migrating-Package-XML.rst
	modified:   source/How-To-Guides/Releasing/Index-Your-Packages.rst
	modified:   source/How-To-Guides/Releasing/Release-Team-Repository.rst
	modified:   source/How-To-Guides/Releasing/Releasing-a-Package.rst
	modified:   source/How-To-Guides/Using-Variants.rst
	modified:   source/How-To-Guides/Using-ros1_bridge-Jammy-upstream.rst
	modified:   source/How-To-Guides/Working-with-multiple-RMW-implementations.rst
	modified:   source/Installation/Alternatives/RHEL-Development-Setup.rst
	modified:   source/Installation/Alternatives/RHEL-Install-Binary.rst
	modified:   source/Installation/Alternatives/Ubuntu-Development-Setup.rst
	modified:   source/Installation/Alternatives/Ubuntu-Install-Binary.rst
	modified:   source/Installation/RMW-Implementations.rst
	modified:   source/Installation/Windows-Install-Binary.rst
	modified:   source/Releases.rst
	modified:   source/Releases/Release-Ardent-Apalone.rst
	modified:   source/Releases/Release-Bouncy-Bolson.rst
	modified:   source/Releases/Release-Crystal-Clemmys.rst
	modified:   source/Releases/Release-Dashing-Diademata.rst
	modified:   source/Releases/Release-Eloquent-Elusor.rst
	modified:   source/Releases/Release-Foxy-Fitzroy.rst
	modified:   source/Releases/Release-Galactic-Geochelone.rst
	modified:   source/Releases/Release-Humble-Hawksbill.rst
	modified:   source/Releases/Release-Iron-Irwini.rst
	modified:   source/Releases/Release-Jazzy-Jalisco.rst
	modified:   source/Releases/Release-Kilted-Kaiju.rst
	modified:   source/Releases/Release-Lyrical-Luth.rst
	modified:   source/Releases/Release-Process.rst
	modified:   source/Releases/Release-Rolling-Ridley.rst
	modified:   source/Tutorials/Advanced/Creating-An-RMW-Implementation.rst
	modified:   source/Tutorials/Advanced/Simulators/Gazebo/Gazebo.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst
	modified:   source/Tutorials/Intermediate/Rosdep.rst
	modified:   source/index.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Installation.rst
	both modified:   source/Installation/RHEL-Install-RPMs.rst
	both modified:   source/Installation/Ubuntu-Install-Debs.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahcorde found a few conflicts here, can you address those when you have time?

@github-actions
Copy link

github-actions bot commented Nov 18, 2025

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/19461279095/artifacts/4599597606.

To view the resulting site:

  1. Click on the above link to download the artifacts archive
  2. Extract it
  3. Open html-artifacts-6027/index.html in your favorite browser

Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
@ahcorde ahcorde enabled auto-merge (squash) November 18, 2025 09:49
@ahcorde ahcorde requested a review from fujitatomoya November 18, 2025 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants