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 II (white space changes only) (backport #5017) #5022

Merged
merged 2 commits into from
Feb 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2025

Follow up to #5001

This probably still isn't all of them, but we're getting closer.

CC: @fujitatomoya


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

(cherry picked from commit 6ea9c13)

# Conflicts:
#	source/Related-Projects/Visualizing-ROS-2-Data-With-Foxglove.rst
@mergify mergify bot requested a review from clalancette as a code owner February 14, 2025 17:22
@mergify mergify bot added the conflicts label Feb 14, 2025
@mergify mergify bot requested a review from audrow as a code owner February 14, 2025 17:22
Copy link
Contributor Author

mergify bot commented Feb 14, 2025

Cherry-pick of 6ea9c13 has failed:

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

You are currently cherry-picking commit 6ea9c13.
  (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/Intermediate/About-Logging.rst
	modified:   source/How-To-Guides/Ament-CMake-Documentation.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/Working-with-multiple-RMW-implementations.rst
	modified:   source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst
	modified:   source/The-ROS2-Project/Contributing/Quality-Guide.rst
	modified:   source/The-ROS2-Project/Feature-Ideas.rst
	modified:   source/Tutorials/Advanced/Ament-Lint-For-Clean-Code.rst
	modified:   source/Tutorials/Advanced/Security/The-Keystore.rst
	modified:   source/Tutorials/Advanced/Simulators/Webots/Installation-Windows.rst
	modified:   source/Tutorials/Advanced/Simulators/Webots/Setting-Up-Simulation-Webots-Basic.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Creating-A-Workspace/Creating-A-Workspace.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Pluginlib.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst
	modified:   source/Tutorials/Demos/Logging-and-logger-configuration.rst
	modified:   source/Tutorials/Intermediate/Composition.rst
	modified:   source/Tutorials/Intermediate/RViz/Marker-Display-types/Marker-Display-types.rst
	modified:   source/Tutorials/Intermediate/RViz/RViz-User-Guide/RViz-User-Guide.rst
	modified:   source/Tutorials/Intermediate/Rosdep.rst
	modified:   source/Tutorials/Intermediate/Testing/BuildFarmTesting.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Cpp.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Py.rst
	modified:   source/Tutorials/Intermediate/Using-Node-Interfaces-Template-Class.rst
	modified:   source/Tutorials/Intermediate/Writing-an-Action-Server-Client/Cpp.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

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   source/Related-Projects/Visualizing-ROS-2-Data-With-Foxglove.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

@christophebedard
Copy link
Member

I'll take care of the conflicts.

Copy link

github-actions bot commented Feb 14, 2025

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/13334254941/artifacts/2594104713.

To view the resulting site:

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

It's not in the Jazzy docs

Signed-off-by: Christophe Bedard <[email protected]>
@christophebedard christophebedard merged commit 8776847 into jazzy Feb 14, 2025
5 checks passed
@christophebedard christophebedard deleted the mergify/bp/jazzy/pr-5017 branch February 14, 2025 17:33
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