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

Fixed various typos and unified some formats in documentation (backport #996) #1001

Merged
merged 2 commits into from
Dec 23, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 23, 2024

Description

Fixed some typos found while reading the documentation, fixed some links to c-InstanceHandle_Unknown and unified the format for the references to the different QOS_DEFAULT options.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A Code snippets related to the added documentation have been provided.
  • Documentation tests pass locally.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • CI passes without warnings or errors.

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

* Fix links in docu

Signed-off-by: Juanjo Garcia <juanjosegarciaesteban@gmail.com>

* Fix Typo

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>

* Unified the QOS_DEFAULT format in text

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>

* Fix Typo

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>

* Fixed a typo

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>

* Modified length of a line

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>

---------

Signed-off-by: Juanjo Garcia <juanjosegarciaesteban@gmail.com>
Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
(cherry picked from commit 0a46fe1)

# Conflicts:
#	docs/fastdds/dds_layer/publisher/dataWriter/createDataWriter.rst
#	docs/fastdds/dds_layer/subscriber/dataReader/createDataReader.rst
@mergify mergify bot added the conflicts label Dec 23, 2024
Copy link
Author

mergify bot commented Dec 23, 2024

Cherry-pick of 0a46fe1 has failed:

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

You are currently cherry-picking commit 0a46fe1.
  (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:   docs/fastdds/dds_layer/core/status/status.rst
	modified:   docs/fastdds/dds_layer/domain/domainParticipant/createDomainParticipant.rst
	modified:   docs/fastdds/dds_layer/domain/domainParticipant/domainParticipant.rst
	modified:   docs/fastdds/dds_layer/publisher/dataWriter/dataWriter.rst
	modified:   docs/fastdds/dds_layer/publisher/publisher/createPublisher.rst
	modified:   docs/fastdds/dds_layer/publisher/publisher/publisher.rst
	modified:   docs/fastdds/dds_layer/subscriber/dataReader/dataReader.rst
	modified:   docs/fastdds/dds_layer/subscriber/sampleInfo/sampleInfo.rst
	modified:   docs/fastdds/dds_layer/subscriber/subscriber/createSubscriber.rst
	modified:   docs/fastdds/dds_layer/subscriber/subscriber/subscriber.rst
	modified:   docs/fastdds/dds_layer/topic/topic/createTopic.rst
	modified:   docs/fastdds/dds_layer/topic/topic/topic.rst
	modified:   docs/fastdds/discovery/discovery_server.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/fastdds/dds_layer/publisher/dataWriter/createDataWriter.rst
	both modified:   docs/fastdds/dds_layer/subscriber/dataReader/createDataReader.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

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
@juanjo4936 juanjo4936 requested review from richiprosima and removed request for richiprosima December 23, 2024 10:56
@juanjo4936 juanjo4936 requested review from richiprosima and removed request for richiprosima December 23, 2024 11:00
@juanlofer-eprosima juanlofer-eprosima merged commit b601265 into 2.6.x Dec 23, 2024
4 of 5 checks passed
@juanlofer-eprosima juanlofer-eprosima deleted the mergify/bp/2.6.x/pr-996 branch December 23, 2024 13:30
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