Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up sentences (white space changes only) (backport #5001) #5015

Merged
merged 2 commits into from
Feb 12, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2025


This is an automatic backport of pull request #5001 done by [Mergify](https://mergify.com).

* Clean up sentences (white space changes only)

* Roll back Releases changes

(cherry picked from commit cc07913)

# Conflicts:
#	source/Related-Projects/Nvidia-ROS2-Projects.rst
#	source/Related-Projects/Visualizing-ROS-2-Data-With-Foxglove.rst
#	source/Tutorials/Demos/dummy-robot-demo.rst
#	source/Tutorials/Intermediate/Tf2/Time-Travel-With-Tf2-Cpp.rst
Copy link
Contributor Author

mergify bot commented Feb 12, 2025

Cherry-pick of cc07913 has failed:

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

You are currently cherry-picking commit cc07913.
  (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/Basic/About-Client-Libraries.rst
	modified:   source/Concepts/Basic/About-Interfaces.rst
	modified:   source/Concepts/Basic/About-Parameters.rst
	modified:   source/Concepts/Basic/About-Topics.rst
	modified:   source/Concepts/Intermediate/About-Cross-Compilation.rst
	modified:   source/Concepts/Intermediate/About-Different-Middleware-Vendors.rst
	modified:   source/Concepts/Intermediate/About-Executors.rst
	modified:   source/Contact.rst
	modified:   source/Glossary.rst
	modified:   source/How-To-Guides/Ament-CMake-Documentation.rst
	modified:   source/How-To-Guides/Ament-CMake-Python-Documentation.rst
	modified:   source/How-To-Guides/DDS-tuning.rst
	modified:   source/How-To-Guides/Installation-Troubleshooting.rst
	modified:   source/How-To-Guides/Installing-on-Raspberry-Pi.rst
	modified:   source/How-To-Guides/ROS-2-IDEs.rst
	modified:   source/How-To-Guides/Releasing/Index-Your-Packages.rst
	modified:   source/How-To-Guides/Run-2-nodes-in-single-or-separate-docker-containers.rst
	modified:   source/How-To-Guides/Setup-ROS-2-with-VSCode-and-Docker-Container.rst
	modified:   source/How-To-Guides/Topics-Services-Actions.rst
	modified:   source/How-To-Guides/Using-Python-Packages.rst
	modified:   source/How-To-Guides/Working-with-multiple-RMW-implementations.rst
	modified:   source/Package-Docs.rst
	modified:   source/The-ROS2-Project/Contributing/Build-Farms.rst
	modified:   source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst
	modified:   source/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst
	modified:   source/The-ROS2-Project/Contributing/Developer-Guide.rst
	modified:   source/The-ROS2-Project/Contributing/Quality-Guide.rst
	modified:   source/The-ROS2-Project/Contributing/Windows-Tips-and-Tricks.rst
	modified:   source/The-ROS2-Project/Feature-Ideas.rst
	modified:   source/The-ROS2-Project/Features.rst
	modified:   source/The-ROS2-Project/Marketing.rst
	modified:   source/The-ROS2-Project/Roadmap.rst
	modified:   source/Tutorials/Advanced/Ament-Lint-For-Clean-Code.rst
	modified:   source/Tutorials/Advanced/Discovery-Server/Discovery-Server.rst
	modified:   source/Tutorials/Advanced/Security/Deployment-Guidelines.rst
	modified:   source/Tutorials/Advanced/Security/Examine-Traffic.rst
	modified:   source/Tutorials/Advanced/Simulators/Webots/Installation-MacOS.rst
	modified:   source/Tutorials/Advanced/Simulators/Webots/Installation-Windows.rst
	modified:   source/Tutorials/Advanced/Simulators/Webots/Simulation-Supervisor.rst
	modified:   source/Tutorials/Advanced/Topic-Statistics-Tutorial/Topic-Statistics-Tutorial.rst
	modified:   source/Tutorials/Beginner-CLI-Tools/Understanding-ROS2-Nodes/Understanding-ROS2-Nodes.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Pluginlib.rst
	modified:   source/Tutorials/Demos/Intra-Process-Communication.rst
	modified:   source/Tutorials/Demos/Quality-of-Service.rst
	modified:   source/Tutorials/Demos/Real-Time-Programming.rst
	modified:   source/Tutorials/Intermediate/RViz/Marker-Display-types/Marker-Display-types.rst
	modified:   source/Tutorials/Intermediate/RViz/RViz-Custom-Display/RViz-Custom-Display.rst
	modified:   source/Tutorials/Intermediate/RViz/RViz-Custom-Panel/RViz-Custom-Panel.rst
	modified:   source/Tutorials/Intermediate/RViz/RViz-User-Guide/RViz-User-Guide.rst
	modified:   source/Tutorials/Intermediate/Rosdep.rst
	modified:   source/Tutorials/Intermediate/Testing/Python.rst
	modified:   source/Tutorials/Intermediate/Testing/Testing-Main.rst
	modified:   source/Tutorials/Intermediate/Tf2/Quaternion-Fundamentals.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Py.rst
	modified:   source/Tutorials/Intermediate/URDF/Adding-Physical-and-Collision-Properties-to-a-URDF-Model.rst
	modified:   source/Tutorials/Intermediate/URDF/Building-a-Movable-Robot-Model-with-URDF.rst
	modified:   source/Tutorials/Intermediate/URDF/Building-a-Visual-Robot-Model-with-URDF-from-Scratch.rst
	modified:   source/Tutorials/Intermediate/URDF/Exporting-an-URDF-File.rst
	modified:   source/Tutorials/Intermediate/URDF/Using-URDF-with-Robot-State-Publisher.rst
	modified:   source/Tutorials/Intermediate/URDF/Using-Xacro-to-Clean-Up-a-URDF-File.rst
	modified:   source/Tutorials/Intermediate/Writing-an-Action-Server-Client/Cpp.rst
	modified:   source/Tutorials/Intermediate/Writing-an-Action-Server-Client/Py.rst
	modified:   source/Tutorials/Miscellaneous/Building-ROS2-Package-with-eclipse-2021-06.rst
	modified:   source/Tutorials/Miscellaneous/Building-Realtime-rt_preempt-kernel-for-ROS-2.rst
	modified:   source/Tutorials/Miscellaneous/Deploying-ROS-2-on-IBM-Cloud.rst
	modified:   source/index.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   source/Related-Projects/Nvidia-ROS2-Projects.rst
	deleted by us:   source/Related-Projects/Visualizing-ROS-2-Data-With-Foxglove.rst
	both modified:   source/Tutorials/Demos/dummy-robot-demo.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Time-Travel-With-Tf2-Cpp.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

@mergify mergify bot requested a review from clalancette as a code owner February 12, 2025 01:08
@mergify mergify bot added the conflicts label Feb 12, 2025
@mergify mergify bot requested a review from audrow as a code owner February 12, 2025 01:08
Signed-off-by: Tomoya Fujita <[email protected]>
Copy link

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/13278847430/artifacts/2576438458.

To view the resulting site:

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

@fujitatomoya
Copy link
Collaborator

after resolved conflicts, all workflow is green. CC: @DLu

@fujitatomoya fujitatomoya merged commit 5b24144 into humble Feb 12, 2025
5 checks passed
@fujitatomoya fujitatomoya deleted the mergify/bp/humble/pr-5001 branch February 12, 2025 05:41
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.

2 participants