This PR cherry-picks changes that were pushed to the main branch (directly or via stabilization branches) and that were not pushed to the development branch causing the misalignment.
In particular, it commits:
aaa7c603075cd9510c23c5b9a12974f834a5fa1b
f5dad19f028e69401d2dc9d768010b204433dda9
133b8f26deb707d841b295652db8fe17a51f1f98
d9d3a036c0e2d7b4a49a9f143f4c9fcfe98f7e0e
b816fd7a197c8a55f62fd4f3cf65621bc8fe2047
05fa6a392aa26a0aa98a2e8b8f954fde3c907d9d
da33e38f5a4c71733504122c46dca52548d4bd1a
b7fe90c4a45773d66e902c276c1e55b64d45cdc7
14dea04f3e7c297a754893872b9b9e80d7bbb759
The tip of this branch differs from the main branch by the following commits (pushed to the development branch after the release):
f8a54bc71329b17f51e1e7b6ae7a15ca128338e7
995992f576cb3a3d3c7a12fb33482b36d941f7e4
dab5cd9ffdaae0bcaf354be67f43b3c6d426d42c
220e0fca980a1be000ceeffb5c87ae9be69c38f8
39c1163bbb66548919bc65785377ef802324b2b9
Moreover, there are the differences in the following files:
content/docs/welcome-guide/setup/installing-linux.md - the file was updated differently in development and main; I manually aligned its content in the development
config.toml - main branch is behind, waiting for #2530
Submission Checklist:
[x] Descriptive active voice - Do descriptive sentences have a clear subject and action verb?
[x] Answer the question at hand - Does the documentation answer a what, why, how, or where type of question?
[x] Consistency - Does the content consistently follow the Style Guide?
[x] Help the user - Does the documentation show the user something meaningful?
I might add my signature to the cherry-picked commits if this is required by the procedure (DCO), but I thought it would be okay to keep it as is. Please let me know.
Change summary
This PR cherry-picks changes that were pushed to the
main
branch (directly or via stabilization branches) and that were not pushed to thedevelopment
branch causing the misalignment.In particular, it commits: aaa7c603075cd9510c23c5b9a12974f834a5fa1b f5dad19f028e69401d2dc9d768010b204433dda9 133b8f26deb707d841b295652db8fe17a51f1f98 d9d3a036c0e2d7b4a49a9f143f4c9fcfe98f7e0e b816fd7a197c8a55f62fd4f3cf65621bc8fe2047 05fa6a392aa26a0aa98a2e8b8f954fde3c907d9d da33e38f5a4c71733504122c46dca52548d4bd1a b7fe90c4a45773d66e902c276c1e55b64d45cdc7 14dea04f3e7c297a754893872b9b9e80d7bbb759
The tip of this branch differs from the
main
branch by the following commits (pushed to thedevelopment
branch after the release): f8a54bc71329b17f51e1e7b6ae7a15ca128338e7 995992f576cb3a3d3c7a12fb33482b36d941f7e4 dab5cd9ffdaae0bcaf354be67f43b3c6d426d42c 220e0fca980a1be000ceeffb5c87ae9be69c38f8 39c1163bbb66548919bc65785377ef802324b2b9Moreover, there are the differences in the following files:
content/docs/user-guide/interactivity/robotics/_index.md
- corrected whitespacecontent/docs/welcome-guide/setup/installing-linux.md
- the file was updated differently indevelopment
andmain
; I manually aligned its content in thedevelopment
config.toml
-main
branch is behind, waiting for #2530Submission Checklist: