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) #5001

Merged
merged 3 commits into from
Feb 12, 2025

Conversation

DLu
Copy link
Contributor

@DLu DLu commented Feb 6, 2025

No description provided.

@fujitatomoya
Copy link
Collaborator

html artifacts are not posted here by github action, that is strange, but actions are completed.

@christophebedard
Copy link
Member

christophebedard commented Feb 7, 2025

It's because the PR is coming from a fork.

@kscottz
Copy link
Collaborator

kscottz commented Feb 7, 2025

This isn't as bad as I thought it might be.

I did catch one corner case that might need to get looked at (double space between sentences).

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.

@DLu thank you very much for this 👍

actually i got question if we should apply this one-sentence-per-line rule to Changelog.rst files, please take a look at my comment??

after all, this PR lgtm.

what can be the next step? after this is merged, revise and review #4592 to apply sphincs-plugin?

IMO, #4592 sphincs plugin is better than easy python script checking #4996.

my thoughts are,

please let me know if i am mistaken, happy to help on this development.

@DLu
Copy link
Contributor Author

DLu commented Feb 7, 2025

It's because the PR is coming from a fork.

On the outside, always lookin in...

I did catch one corner case that might need to get looked at (double space between sentences).

There's more to do, but I wanted to fix this much first

probably we can skip applying this rule to the *Changelog.rst files

Okay by me! I'm happy to roll it back. The style guide should be updated.

unrelated but this is still fine

This one popped up because of my syntax checker.

@christophebedard
Copy link
Member

It's because the PR is coming from a fork.

On the outside, always lookin in...

I wanted to enable it even for PR from forks, but there were "security considerations" apparently 😅

@fujitatomoya
Copy link
Collaborator

@DLu

so 1st we are taking this change into rolling (backport jazzy and humble), and then start reviewing #4592? what do you think?

@DLu
Copy link
Contributor Author

DLu commented Feb 11, 2025

so 1st we are taking this change into rolling (backport jazzy and humble), and then start reviewing #4592? what do you think?

I'm fine with that. The purpose of this PR is just to separate the content changes needed from the tooling. This is not the full set of changes that are needed to get #4592 to fully pass.

@fujitatomoya
Copy link
Collaborator

@Mergifyio rebase

Copy link
Contributor

mergify bot commented Feb 12, 2025

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
Auto-merging source/Concepts/Basic/About-Parameters.rst
Auto-merging source/The-ROS2-Project/Contributing/Code-Style-Language-Versions.rst
Auto-merging source/The-ROS2-Project/Contributing/Contributing-To-ROS-2-Documentation.rst
Auto-merging source/Tutorials/Miscellaneous/Deploying-ROS-2-on-IBM-Cloud.rst
CONFLICT (content): Merge conflict in source/Tutorials/Miscellaneous/Deploying-ROS-2-on-IBM-Cloud.rst
error: could not apply f3610ba... Clean up sentences (white space changes only)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f3610ba... Clean up sentences (white space changes only)

@fujitatomoya
Copy link
Collaborator

Ah, it has been rebased already, i was confused with difference from previous review point, sorry.

@fujitatomoya fujitatomoya merged commit cc07913 into ros2:rolling Feb 12, 2025
5 checks passed
mergify bot pushed a commit that referenced this pull request Feb 12, 2025
* Clean up sentences (white space changes only)

* Roll back Releases changes

(cherry picked from commit cc07913)

# Conflicts:
#	source/Related-Projects/Visualizing-ROS-2-Data-With-Foxglove.rst
mergify bot pushed a commit that referenced this pull request Feb 12, 2025
* 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
fujitatomoya added a commit that referenced this pull request Feb 12, 2025
* Clean up sentences (white space changes only) (#5001)

* Clean up sentences (white space changes only)

* Roll back Releases changes

(cherry picked from commit cc07913)

# Conflicts:
#	source/Related-Projects/Visualizing-ROS-2-Data-With-Foxglove.rst

* remove Visualizing-ROS-2-Data-With-Foxglove.rst.

Signed-off-by: Tomoya Fujita <[email protected]>

---------

Signed-off-by: Tomoya Fujita <[email protected]>
Co-authored-by: David V. Lu!! <[email protected]>
Co-authored-by: Tomoya Fujita <[email protected]>
fujitatomoya added a commit that referenced this pull request Feb 12, 2025
* Clean up sentences (white space changes only) (#5001)

* 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

* resolve conflicts.

Signed-off-by: Tomoya Fujita <[email protected]>

---------

Signed-off-by: Tomoya Fujita <[email protected]>
Co-authored-by: David V. Lu!! <[email protected]>
Co-authored-by: Tomoya Fujita <[email protected]>
@DLu DLu deleted the sentences0 branch February 18, 2025 02:02
@DLu DLu mentioned this pull request Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants