Skip to content

3di | TOC update - delete security-main article and replace position in toc with about-security article (backport #7073) - #7081

Open
mergify[bot] wants to merge 1 commit into
lyricalfrom
mergify/bp/lyrical/pr-7073
Open

3di | TOC update - delete security-main article and replace position in toc with about-security article (backport #7073)#7081
mergify[bot] wants to merge 1 commit into
lyricalfrom
mergify/bp/lyrical/pr-7073

Conversation

@mergify

@mergify mergify Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

Description

We've deleted the "Security-Main" article and replaced its position in TOC with the "About-Security" (ROS 2 Security) article. We've updated any affected links.

Related to: ros2/ros2_documentation/issues #6825

image

Did you use Generative AI?

No

Additional Information

Documentation updates from 3di Information Solutions, agreed with Geoff and Tully.

Label

Please add backport-lyrical.


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

…7073)

(cherry picked from commit 2f850de)

# Conflicts:
#	source/Concepts/Intermediate/About-Security.rst
#	source/Developer-Tools/About-introspection-and-analysis.rst
#	source/Developer-Tools/Introspection-and-analysis/About-Security.rst
#	source/Tutorials/Advanced/Creating-An-RMW-Implementation.rst
#	source/Tutorials/Advanced/Security/About-Security.rst
#	source/Tutorials/Advanced/Security/Security-Main.rst
@mergify mergify Bot added the conflicts label Aug 20, 2026
@mergify

mergify Bot commented Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 2f850de has failed:

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

You are currently cherry-picking commit 2f850de.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	added by us:     source/Concepts/Intermediate/About-Security.rst
	deleted by us:   source/Developer-Tools/About-introspection-and-analysis.rst
	both deleted:    source/Developer-Tools/Introspection-and-analysis/About-Security.rst
	both modified:   source/Tutorials/Advanced/Creating-An-RMW-Implementation.rst
	added by them:   source/Tutorials/Advanced/Security/About-Security.rst
	deleted by them: source/Tutorials/Advanced/Security/Security-Main.rst

no changes added to commit (use "git add" and/or "git commit -a")

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

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.

1 participant