From 06792269a72cc07d6bdf6a56bd4ee4435ca293f3 Mon Sep 17 00:00:00 2001 From: kscottz Date: Wed, 9 Aug 2023 16:56:51 -0700 Subject: [PATCH 1/7] Update front page of docs to include more community resources, deprecate answers. --- source/index.rst | 50 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/source/index.rst b/source/index.rst index a9dc6e23cd..ac54308223 100644 --- a/source/index.rst +++ b/source/index.rst @@ -98,10 +98,11 @@ If you're interested in the advancement of the ROS 2 project: Other ROS resources ------------------- -* `ROS Answers `__ (ROS 1, ROS 2) +* `Robotics Stack Exchange - Q&A community website.`__ (ROS 1, ROS 2) + - See :ref:`Contact Page ` for more information - - Q&A community website, similar to `Stack Exchange `_ - - See :ref:`Contact Page ` for more information +* `Official ROS Discord Channel - Discussion and Support.`__ (ROS 1, ROS 2) + - See :ref:`Contact Page ` for more information * `ROS Enhancement Proposals (REPs) `__ (ROS 1, ROS 2) @@ -139,8 +140,51 @@ Other ROS resources - ROS 1 and ROS 2 product landing page, with high-level description of ROS and links to other ROS sites +* `Official Open Source Robotics Foundation Vimeo Channel `__ (ROS 1, ROS 2) + + - Videos of ROSCon Talks, community and working group meetings, and project demos. + +* `ROS resource status page `__ (ROS 1, ROS 2) + +- Check the current status of ROS resources like Discourse or the ROS build farm. + + * `ROSCon website `__ (ROS 1, ROS 2) + + - ROSCon is our annual ROS developer conference. + - This page also lists regional ROS events like ROSConJP and ROSConFr. + +* `Open Source Robotics Foundation Official Events Calendar `__ + + - This calendar is for official OSRF Events and working group meetings. + - `Submit your events here.`__ + +* `Open Source Robotics Foundation Community Calendar + + - This calendar is for unofficial ROS community events. + - `Submit your events here.`__ + +Miscellaneous +^^^^^^^^^^ +* `Information about the ROS trademark `__ + +* ROS 2 can be cited in an academic publication using `DOI: 10.1126/scirobotics.abm6074`__ + +* `Purchase official ROS swag `__ + +* ROS on social media + + - `@OpenRoboticsOrg`__ and `@rosorg`__ on Twitter + - `Open Robotics on LinkedIn`__ + +* Visit the `Open Source Robotics Foundation website `__ + + - Tax deductible charitable donations to the Open Source Robotics Foundation can be sent via `DonorBox. `__ + Deprecated ^^^^^^^^^^ +* `ROS Answers `__ (ROS 1, ROS 2) + + - ROS Answers was the ROS community Q&A website, until August,2023. The website is currently available as a read-only resource * `ROS 2 Docs `_ From 8fe9e32650893cbe942ce5cdd3850e304d3b5304 Mon Sep 17 00:00:00 2001 From: kscottz Date: Wed, 9 Aug 2023 17:28:31 -0700 Subject: [PATCH 2/7] Clean up fussy RST. --- source/Contact.rst | 2 +- source/index.rst | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/source/Contact.rst b/source/Contact.rst index 817be28af6..6b09dee2d2 100644 --- a/source/Contact.rst +++ b/source/Contact.rst @@ -3,7 +3,7 @@ Contact ======= -.. _Using ROS Answers: +.. _Using Robotics Stack Overflow: Support ------- diff --git a/source/index.rst b/source/index.rst index ac54308223..ac56220128 100644 --- a/source/index.rst +++ b/source/index.rst @@ -98,11 +98,10 @@ If you're interested in the advancement of the ROS 2 project: Other ROS resources ------------------- -* `Robotics Stack Exchange - Q&A community website.`__ (ROS 1, ROS 2) +* `Robotics Stack Exchange - Q&A community website `__ . (ROS 1, ROS 2) - See :ref:`Contact Page ` for more information -* `Official ROS Discord Channel - Discussion and Support.`__ (ROS 1, ROS 2) - - See :ref:`Contact Page ` for more information +* `Official ROS Discord Channel for discussion and support `__ .(ROS 1, ROS 2) * `ROS Enhancement Proposals (REPs) `__ (ROS 1, ROS 2) @@ -146,35 +145,35 @@ Other ROS resources * `ROS resource status page `__ (ROS 1, ROS 2) -- Check the current status of ROS resources like Discourse or the ROS build farm. + - Check the current status of ROS resources like Discourse or the ROS build farm. - * `ROSCon website `__ (ROS 1, ROS 2) +* `ROSCon website `__ (ROS 1, ROS 2) - ROSCon is our annual ROS developer conference. - This page also lists regional ROS events like ROSConJP and ROSConFr. -* `Open Source Robotics Foundation Official Events Calendar `__ +* `Open Source Robotics Foundation official events calendar `__ - This calendar is for official OSRF Events and working group meetings. - - `Submit your events here.`__ + - `Submit your events here `__. -* `Open Source Robotics Foundation Community Calendar +* `Open Source Robotics Foundation community calendar `__ - This calendar is for unofficial ROS community events. - - `Submit your events here.`__ + - `Submit your events here `__ . Miscellaneous -^^^^^^^^^^ +^^^^^^^^^^^^^ * `Information about the ROS trademark `__ -* ROS 2 can be cited in an academic publication using `DOI: 10.1126/scirobotics.abm6074`__ +* ROS 2 can be cited in an academic publication using `DOI: 10.1126/scirobotics.abm6074 `__ * `Purchase official ROS swag `__ * ROS on social media - - `@OpenRoboticsOrg`__ and `@rosorg`__ on Twitter - - `Open Robotics on LinkedIn`__ + - `@OpenRoboticsOrg `__ and `@ROSOrg `__ on Twitter + - `Open Robotics on LinkedIn `__ * Visit the `Open Source Robotics Foundation website `__ @@ -184,7 +183,7 @@ Deprecated ^^^^^^^^^^ * `ROS Answers `__ (ROS 1, ROS 2) - - ROS Answers was the ROS community Q&A website, until August,2023. The website is currently available as a read-only resource + - ROS Answers was the ROS community Q&A website, until August, 2023. ROS Answers is currently available as a read-only resource. * `ROS 2 Docs `_ From a8b648b47c937e51eabff002f7b5b4e1166491bf Mon Sep 17 00:00:00 2001 From: kscottz Date: Wed, 9 Aug 2023 17:32:21 -0700 Subject: [PATCH 3/7] Fix bad ref. --- source/Contact.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Contact.rst b/source/Contact.rst index 6b09dee2d2..1d960a4ed8 100644 --- a/source/Contact.rst +++ b/source/Contact.rst @@ -3,7 +3,7 @@ Contact ======= -.. _Using Robotics Stack Overflow: +.. _Using Robotics Stack Exchange: Support ------- From e942666a6e52e10c0ff7f76a05c598fcfbc360b6 Mon Sep 17 00:00:00 2001 From: kscottz Date: Wed, 9 Aug 2023 17:38:11 -0700 Subject: [PATCH 4/7] Fussy whitespace nitpick. --- source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/index.rst b/source/index.rst index ac56220128..3c275cf5f7 100644 --- a/source/index.rst +++ b/source/index.rst @@ -152,7 +152,7 @@ Other ROS resources - ROSCon is our annual ROS developer conference. - This page also lists regional ROS events like ROSConJP and ROSConFr. -* `Open Source Robotics Foundation official events calendar `__ +* `Open Source Robotics Foundation official events calendar `__ - This calendar is for official OSRF Events and working group meetings. - `Submit your events here `__. From d448fe5d31201f7ae5d0ad471134b2465f59e574 Mon Sep 17 00:00:00 2001 From: kscottz Date: Thu, 10 Aug 2023 10:50:11 -0700 Subject: [PATCH 5/7] Reorganize and clarify. --- source/index.rst | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/source/index.rst b/source/index.rst index 3c275cf5f7..d9fea16c0a 100644 --- a/source/index.rst +++ b/source/index.rst @@ -94,18 +94,18 @@ If you're interested in the advancement of the ROS 2 project: * :doc:`Marketing ` - Downloadable marketing materials + - `Information about the ROS trademark `__ -Other ROS resources -------------------- +ROS community resources +----------------------- -* `Robotics Stack Exchange - Q&A community website `__ . (ROS 1, ROS 2) - - See :ref:`Contact Page ` for more information +If you need help, have an idea, or would like to contribute to the project, please visit our ROS community resources. -* `Official ROS Discord Channel for discussion and support `__ .(ROS 1, ROS 2) +* `Official ROS Discord Channel for discussion and support `__ (ROS 1, ROS 2) -* `ROS Enhancement Proposals (REPs) `__ (ROS 1, ROS 2) +* `Robotics Stack Exchange - community Q&A website `__ (ROS 1, ROS 2) - - Proposals for new designs and conventions + - See :ref:`Contact Page ` for more information * `ROS Discourse `__ (ROS 1, ROS 2) @@ -120,6 +120,17 @@ Other ROS resources - Inspect a package's license, build type, maintainers, status, and dependencies - Get more info for a package on `ROS Answers `__ +* `ROS resource status page `__ (ROS 1, ROS 2) + + - Check the current status of ROS resources like Discourse or the ROS build farm. + +Other resources +^^^^^^^^^^^^^^^ + +* `ROS Enhancement Proposals (REPs) `__ (ROS 1, ROS 2) + + - Proposals for new designs and conventions + * `ROS Prerelease `__ (ROS 1) - Generates commands to emulate the `ROS Buildfarm `_ on your local machine @@ -139,13 +150,12 @@ Other ROS resources - ROS 1 and ROS 2 product landing page, with high-level description of ROS and links to other ROS sites -* `Official Open Source Robotics Foundation Vimeo Channel `__ (ROS 1, ROS 2) - - - Videos of ROSCon Talks, community and working group meetings, and project demos. +Events +^^^^^^ -* `ROS resource status page `__ (ROS 1, ROS 2) +* `Official ROS Vimeo Channel `__ (ROS 1, ROS 2) - - Check the current status of ROS resources like Discourse or the ROS build farm. + - Videos of ROSCon Talks, community and working group meetings, and project demos. * `ROSCon website `__ (ROS 1, ROS 2) @@ -164,10 +174,6 @@ Other ROS resources Miscellaneous ^^^^^^^^^^^^^ -* `Information about the ROS trademark `__ - -* ROS 2 can be cited in an academic publication using `DOI: 10.1126/scirobotics.abm6074 `__ - * `Purchase official ROS swag `__ * ROS on social media From f8594c7ab2d04a3f2736f3d95b9bca5ab646bd97 Mon Sep 17 00:00:00 2001 From: kscottz Date: Thu, 10 Aug 2023 13:21:42 -0700 Subject: [PATCH 6/7] Changes to wording. --- source/index.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/index.rst b/source/index.rst index d9fea16c0a..fc0e5388b5 100644 --- a/source/index.rst +++ b/source/index.rst @@ -124,8 +124,8 @@ If you need help, have an idea, or would like to contribute to the project, plea - Check the current status of ROS resources like Discourse or the ROS build farm. -Other resources -^^^^^^^^^^^^^^^ +General ROS project resources +----------------------------- * `ROS Enhancement Proposals (REPs) `__ (ROS 1, ROS 2) @@ -151,7 +151,7 @@ Other resources - ROS 1 and ROS 2 product landing page, with high-level description of ROS and links to other ROS sites Events -^^^^^^ +------ * `Official ROS Vimeo Channel `__ (ROS 1, ROS 2) @@ -173,7 +173,7 @@ Events - `Submit your events here `__ . Miscellaneous -^^^^^^^^^^^^^ +------------- * `Purchase official ROS swag `__ * ROS on social media @@ -186,7 +186,7 @@ Miscellaneous - Tax deductible charitable donations to the Open Source Robotics Foundation can be sent via `DonorBox. `__ Deprecated -^^^^^^^^^^ +---------- * `ROS Answers `__ (ROS 1, ROS 2) - ROS Answers was the ROS community Q&A website, until August, 2023. ROS Answers is currently available as a read-only resource. From 468431b1cd0660ea26a474a6b459fffa4694ce7f Mon Sep 17 00:00:00 2001 From: kscottz Date: Fri, 11 Aug 2023 09:42:31 -0700 Subject: [PATCH 7/7] remove prerelease. --- source/index.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/index.rst b/source/index.rst index fc0e5388b5..a82c7f9f0b 100644 --- a/source/index.rst +++ b/source/index.rst @@ -131,11 +131,6 @@ General ROS project resources - Proposals for new designs and conventions -* `ROS Prerelease `__ (ROS 1) - - - Generates commands to emulate the `ROS Buildfarm `_ on your local machine - - Currently only shows ROS 1 distributions - * `ROS Robots `__ (ROS 1, ROS 2) - Showcases robots projects from the community