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

[20306] Add autofill type information documentation (backport #89) #91

Merged
merged 2 commits into from
Apr 4, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 26, 2024

This is an automatic backport of pull request #89 done by Mergify.
Cherry-pick of 5561470 has failed:

On branch mergify/bp/2.6.x/pr-89
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 5561470.
  (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 <file>..." to mark resolution)
	both modified:   docs/01-figures/participant.png
	both modified:   docs/01-figures/tcp_client_options.png
	both modified:   docs/01-figures/tcp_lan_server_options.png
	both modified:   docs/01-figures/tcp_wan_server_options.png
	both modified:   docs/first_steps/first_steps.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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #20306: Add autofill type information documentation

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20306: Apply Jesús suggestions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
(cherry picked from commit 5561470)

# Conflicts:
#	docs/01-figures/participant.png
#	docs/01-figures/tcp_client_options.png
#	docs/01-figures/tcp_lan_server_options.png
#	docs/01-figures/tcp_wan_server_options.png
#	docs/first_steps/first_steps.rst
@richiprosima
Copy link

Build status: Build Status

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@richiprosima
Copy link

Build status: Build Status

@EduPonz EduPonz added this to the v2.6.8 milestone Feb 15, 2024
@JesusPoderoso
Copy link
Contributor

Mind that some screenshots should be updated

@Mario-DL
Copy link
Member

Mario-DL commented Apr 4, 2024

@EduPonz would you mind updating the screenshots ? In particular, I think that the Data-sharing checkbox within same host delivery in the participant configuration dialog did not exist in 2.6.x

@JesusPoderoso
Copy link
Contributor

I think that updating images is no longer required if we merge this PR before

Do you agree @Mario-DL ?

@JesusPoderoso JesusPoderoso added needs-review PR that is ready to be reviewed and removed to-do labels Apr 4, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Apr 4, 2024

Alright, yes in that case

Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

LGTM

@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed needs-review PR that is ready to be reviewed labels Apr 4, 2024
@JesusPoderoso JesusPoderoso merged commit f965e35 into 2.6.x Apr 4, 2024
4 checks passed
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.6.x/pr-89 branch April 4, 2024 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants