From e88dd62ca84407003a07d2b7092735f2275bdbe0 Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Tue, 16 Jul 2024 11:58:05 +0200 Subject: [PATCH] Common: fix infinite recursion --- blimp/source/index.rst | 1 + common/source/docs/common-abbreviations.rst | 4 ++-- common/source/docs/common-acknowledgments.rst | 2 +- common/source/docs/common-appendix.rst | 4 +++- common/source/docs/common-commercial-support.rst | 10 +++++----- common/source/docs/common-contact-us.rst | 2 +- common/source/docs/common-donation.rst | 2 +- .../common-downloads_advanced_user_tools.rst | 2 +- .../docs/common-downloads_developer_tools.rst | 2 +- common/source/docs/common-downloads_firmware.rst | 2 +- common/source/docs/common-glossary.rst | 2 +- .../source/docs/common-history-of-ardupilot.rst | 2 +- .../common-makeflyeasy-fighter-hand-throw.rst | 10 +--------- .../docs/common-makeflyeasy-fighter-vtol.rst | 2 +- ...ommon-makeflyeasy-striver-mini-hand-throw.rst | 2 +- .../common-makeflyeasy-striver-mini-vtol.rst | 8 +------- common/source/docs/common-partners-program.rst | 2 +- common/source/docs/common-partners.rst | 2 +- common/source/docs/common-rtf.rst | 16 +++++++++++++--- common/source/docs/common-stores.rst | 2 +- common/source/docs/common-team.rst | 2 +- .../docs/common-wiki-editing-archiving.rst | 2 +- .../docs/common-wiki-editing-infra-overview.rst | 2 +- .../docs/common-wiki-editing-quick-edit.rst | 2 +- common/source/docs/common-wiki-editing-setup.rst | 2 +- .../docs/common-wiki-editing-style-guide.rst | 2 +- .../common-wiki-editing-submitting-changes.rst | 2 +- common/source/docs/common-wiki_editing_guide.rst | 2 +- 28 files changed, 47 insertions(+), 48 deletions(-) diff --git a/blimp/source/index.rst b/blimp/source/index.rst index b83e561608..0d768e8822 100644 --- a/blimp/source/index.rst +++ b/blimp/source/index.rst @@ -35,3 +35,4 @@ Getting more info Complete log message list Simulation Upcoming Features + docs/common-appendix diff --git a/common/source/docs/common-abbreviations.rst b/common/source/docs/common-abbreviations.rst index 97d34dfb73..d33656e4c6 100644 --- a/common/source/docs/common-abbreviations.rst +++ b/common/source/docs/common-abbreviations.rst @@ -1,4 +1,4 @@ -.. common-abbreviations: +.. _common-abbreviations: ==================== Common Abbreviations @@ -30,4 +30,4 @@ TECS Total Energy Control System (altitude/speed controller for Plane) WP Waypoint ====== ===================================================================== -[copywiki destination="copter,plane,rover,planner,planner2,dev,antennatracker,mavproxy,ardupilot"] \ No newline at end of file +[copywiki destination="copter,plane,rover,blimp,planner,planner2,dev,antennatracker,mavproxy,ardupilot"] diff --git a/common/source/docs/common-acknowledgments.rst b/common/source/docs/common-acknowledgments.rst index 5bcf8d022e..61f12ae95a 100644 --- a/common/source/docs/common-acknowledgments.rst +++ b/common/source/docs/common-acknowledgments.rst @@ -10,4 +10,4 @@ These days ArduPilot is financially supported by our `Partners `__ for providing their Bliss plan free of cost. Managing e-mail in ArduPilot's team is now easier. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-appendix.rst b/common/source/docs/common-appendix.rst index c717e2697b..c68922fff0 100644 --- a/common/source/docs/common-appendix.rst +++ b/common/source/docs/common-appendix.rst @@ -23,7 +23,9 @@ the wiki. History of ArduPilot Partners Partners Program +[site wiki="plane, copter, rover, sub, blimp"] Ready-To-Use vehicles +[/site] Stores Top Contributors [site wiki="plane, copter, rover"] @@ -56,4 +58,4 @@ the wiki. -[copywiki destination="copter,plane,rover,planner,planner2,dev,antennatracker,mavproxy,ardupilot"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,dev,antennatracker,mavproxy,ardupilot"] diff --git a/common/source/docs/common-commercial-support.rst b/common/source/docs/common-commercial-support.rst index ea817cdf21..7fccbd7b18 100644 --- a/common/source/docs/common-commercial-support.rst +++ b/common/source/docs/common-commercial-support.rst @@ -154,7 +154,7 @@ support for ArduPilot including vehicle design, tuning, log analysis, bug fixes
ArduPilot Initiative provides tailored services to professional
and commercial users of ArduPilot. Services include log analysis,
new features, integrating sensors/payloads, developing hardware
-
and tuning assitance
+
and tuning assistance
@@ -225,7 +225,7 @@ support for ArduPilot including vehicle design, tuning, log analysis, bug fixes - +
Event 38 Unmanned Systems

USA
Event38 Unmanned Systems, help@event38.com
@@ -234,8 +234,8 @@ support for ArduPilot including vehicle design, tuning, log analysis, bug fixes
Customizations of any part of ArduPilot code
Airframe design and manufacturing
Systems integration
-
Aircraft Tuning
-
Companion Computers and offboard navigation
+
Aircraft Tuning
+
Companion Computers and offboard navigation
@@ -381,4 +381,4 @@ Fleet Management Systems - `Drone LogBook `__ - `flyfreely `__ -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-contact-us.rst b/common/source/docs/common-contact-us.rst index 43a5cc80ee..2f0426d444 100644 --- a/common/source/docs/common-contact-us.rst +++ b/common/source/docs/common-contact-us.rst @@ -45,4 +45,4 @@ DroneKit - `DroneKit for Android Gitter chat `__ - `DroneKit for Python Gitter chat `__ -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-donation.rst b/common/source/docs/common-donation.rst index 70ad52c745..6574b9153f 100644 --- a/common/source/docs/common-donation.rst +++ b/common/source/docs/common-donation.rst @@ -19,4 +19,4 @@ Australian non-profit incorporated association. `How are donations spent? `__ -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-downloads_advanced_user_tools.rst b/common/source/docs/common-downloads_advanced_user_tools.rst index 104afe8dcc..381afe55e0 100644 --- a/common/source/docs/common-downloads_advanced_user_tools.rst +++ b/common/source/docs/common-downloads_advanced_user_tools.rst @@ -426,4 +426,4 @@ Since we want you to have a great experience, please make sure that you do all o The software and hardware we provide is only for use in unmanned vehicles. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,mavproxy,ardupilot"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,mavproxy,ardupilot"] diff --git a/common/source/docs/common-downloads_developer_tools.rst b/common/source/docs/common-downloads_developer_tools.rst index 82bed47c70..00e9c4d3c7 100644 --- a/common/source/docs/common-downloads_developer_tools.rst +++ b/common/source/docs/common-downloads_developer_tools.rst @@ -158,4 +158,4 @@ Since we want you to have a great experience, please make sure that you do all o -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,mavproxy,ardupilot"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,mavproxy,ardupilot"] diff --git a/common/source/docs/common-downloads_firmware.rst b/common/source/docs/common-downloads_firmware.rst index 0d2c91831d..24c1ac8c63 100644 --- a/common/source/docs/common-downloads_firmware.rst +++ b/common/source/docs/common-downloads_firmware.rst @@ -102,4 +102,4 @@ Since we want you to have a great experience, please make sure that you do all o -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-glossary.rst b/common/source/docs/common-glossary.rst index 0a5567a0b4..1ec9d8357a 100644 --- a/common/source/docs/common-glossary.rst +++ b/common/source/docs/common-glossary.rst @@ -290,4 +290,4 @@ from \ `sparkfun `__. than Bluetooth but lower power consumption than WiFi. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-history-of-ardupilot.rst b/common/source/docs/common-history-of-ardupilot.rst index b3d14c6aa8..62b6c5d959 100644 --- a/common/source/docs/common-history-of-ardupilot.rst +++ b/common/source/docs/common-history-of-ardupilot.rst @@ -241,4 +241,4 @@ Dec 2019 - Copter 4.0.0 with RCx_OPTION support, LUA Scripting support, new mode for a more complete list of contributors to the project. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-makeflyeasy-fighter-hand-throw.rst b/common/source/docs/common-makeflyeasy-fighter-hand-throw.rst index fe43f496ff..bb07f35631 100644 --- a/common/source/docs/common-makeflyeasy-fighter-hand-throw.rst +++ b/common/source/docs/common-makeflyeasy-fighter-hand-throw.rst @@ -35,12 +35,4 @@ Where to Buy `Aliexpress `__ -.. toctree:: - :hidden: - - MakeFLyEasy - Striver Mini - MakeFLyEasy - Fighter VTOL - MakeFLyEasy - Striver Mini VTOL - - -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="plane,copter,rover,blimp"] diff --git a/common/source/docs/common-makeflyeasy-fighter-vtol.rst b/common/source/docs/common-makeflyeasy-fighter-vtol.rst index cd039de5c8..15c44840a5 100644 --- a/common/source/docs/common-makeflyeasy-fighter-vtol.rst +++ b/common/source/docs/common-makeflyeasy-fighter-vtol.rst @@ -37,4 +37,4 @@ Where to Buy `Aliexpress `__ -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="plane,copter,rover,blimp"] diff --git a/common/source/docs/common-makeflyeasy-striver-mini-hand-throw.rst b/common/source/docs/common-makeflyeasy-striver-mini-hand-throw.rst index a70b4c38d2..0bc26df241 100644 --- a/common/source/docs/common-makeflyeasy-striver-mini-hand-throw.rst +++ b/common/source/docs/common-makeflyeasy-striver-mini-hand-throw.rst @@ -38,5 +38,5 @@ Where to Buy `Aliexpress `__ -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="plane,copter,rover,blimp"] diff --git a/common/source/docs/common-makeflyeasy-striver-mini-vtol.rst b/common/source/docs/common-makeflyeasy-striver-mini-vtol.rst index d99fcaef7e..4d4d9f5270 100644 --- a/common/source/docs/common-makeflyeasy-striver-mini-vtol.rst +++ b/common/source/docs/common-makeflyeasy-striver-mini-vtol.rst @@ -37,10 +37,4 @@ Where to Buy `Aliexpress `__ -.. toctree:: - :hidden: - - MakeFLyEasy - Fighter - -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] - +[copywiki destination="plane,copter,rover,blimp"] diff --git a/common/source/docs/common-partners-program.rst b/common/source/docs/common-partners-program.rst index 227132f1a1..ac8e6fed1c 100644 --- a/common/source/docs/common-partners-program.rst +++ b/common/source/docs/common-partners-program.rst @@ -111,5 +111,5 @@ I want a new feature, do I have to be a partner to get it? ========================================================== No. ArduPilot is, and always will be, open source. Contributions to the code base, wherever they come from, are accepted based on their technical merits. If you're not in a position to make the changes yourself, please add it to the `Issues list `__ or consider contracting one of the companies listed on the :ref:`Commercial Support page ` to make the change. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-partners.rst b/common/source/docs/common-partners.rst index 70557bd7ce..5700849be3 100644 --- a/common/source/docs/common-partners.rst +++ b/common/source/docs/common-partners.rst @@ -846,4 +846,4 @@ Details on the Partners Program and how to join can be found on the :doc:`Partne :align: center :target: https://arcoworldwide.ng/ -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-rtf.rst b/common/source/docs/common-rtf.rst index 379e34f60e..ac1a45f862 100644 --- a/common/source/docs/common-rtf.rst +++ b/common/source/docs/common-rtf.rst @@ -48,6 +48,8 @@ Planes from Partners * `MakeFLyEasy - Believer `__ * :ref:`MakeFLyEasy - Fighter ` * :ref:`MakeFLyEasy - Striver Mini ` +* :ref:`MakeFLyEasy - Fighter Hand Throw ` +* :ref:`MakeFLyEasy - Striver Mini Hand Throw ` * `mRobotics - Nano Talon `__ * Various from `UAVSystems `__ @@ -65,8 +67,8 @@ VTOL/QuadPlanes from Partners * `FlyDragonDroneTech - FDG50F `__ * :ref:`Holybro Swan-K1 ` * :ref:`MakeFLyEasy - Fighter VTOL ` -* `MakeFLyEasy - Freeman 2300 `__ -* `MakeFLyEasy - Freeman 2100 `__ +* `MakeFLyEasy - Freeman 2300 `__ +* `MakeFLyEasy - Freeman 2100 `__ * :ref:`MakeFLyEasy - Striver Mini VTOL ` Rovers from Partners @@ -105,4 +107,12 @@ Vehicles from Non-Partners If you are a manufacturer of a RTF vehicle based on ArduPilot and do not appear in this list, please get in touch through one of the methods listed on our :ref:`Contact Us page `. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +.. toctree:: + :hidden: + + MakeFLyEasy Fighter Hand Throw + MakeFLyEasy Fighter VTOL + MakeFLyEasy Striver Mini Hand Throw + MakeFLyEasy Striver Mini VTOL + +[copywiki destination="plane,copter,rover,blimp"] diff --git a/common/source/docs/common-stores.rst b/common/source/docs/common-stores.rst index ff42d1aa0f..aaac3f1ad8 100644 --- a/common/source/docs/common-stores.rst +++ b/common/source/docs/common-stores.rst @@ -42,4 +42,4 @@ recommended for use with ArduPilot (in alphabetical order). You may also want t The `ArduPilot Swag store is here `__. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-team.rst b/common/source/docs/common-team.rst index 0b9e73481e..5f9e2095d6 100644 --- a/common/source/docs/common-team.rst +++ b/common/source/docs/common-team.rst @@ -24,4 +24,4 @@ with some related projects, including: - The `MatrixPilot team `__ -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-wiki-editing-archiving.rst b/common/source/docs/common-wiki-editing-archiving.rst index 3ea85105b3..26ac4b533c 100644 --- a/common/source/docs/common-wiki-editing-archiving.rst +++ b/common/source/docs/common-wiki-editing-archiving.rst @@ -40,4 +40,4 @@ Wiki pages can be deleted by removing them from github and any menu in which the Before deleting a wiki page it is important to ensure that it is not the parent of other menu items (e.g. it does not contain a "toctree") -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-wiki-editing-infra-overview.rst b/common/source/docs/common-wiki-editing-infra-overview.rst index 13e4843674..7827560f98 100644 --- a/common/source/docs/common-wiki-editing-infra-overview.rst +++ b/common/source/docs/common-wiki-editing-infra-overview.rst @@ -20,4 +20,4 @@ manually set up a build environment (just inspect the Vagrantfile for dependenci The wikis use a `common theme `__ that provides the top menu bar. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-wiki-editing-quick-edit.rst b/common/source/docs/common-wiki-editing-quick-edit.rst index b787da06e7..29776bee52 100644 --- a/common/source/docs/common-wiki-editing-quick-edit.rst +++ b/common/source/docs/common-wiki-editing-quick-edit.rst @@ -31,4 +31,4 @@ For more information see the Github Help topic: `Editing files in another user's Wiki home pages (named "index.html") do not have the **Edit on GitHub** link. You can still edit them by manually navigating to the desired page on Github. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-wiki-editing-setup.rst b/common/source/docs/common-wiki-editing-setup.rst index ce03cf1e22..ac6d832be8 100644 --- a/common/source/docs/common-wiki-editing-setup.rst +++ b/common/source/docs/common-wiki-editing-setup.rst @@ -234,4 +234,4 @@ RST rendering on Linux -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-wiki-editing-style-guide.rst b/common/source/docs/common-wiki-editing-style-guide.rst index 57b47e0581..b886c32313 100644 --- a/common/source/docs/common-wiki-editing-style-guide.rst +++ b/common/source/docs/common-wiki-editing-style-guide.rst @@ -381,4 +381,4 @@ Note that the path is absolute, and relative to the source directory for the wik .. image:: /images/image_file_name.jpg -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-wiki-editing-submitting-changes.rst b/common/source/docs/common-wiki-editing-submitting-changes.rst index 038205171f..4bc8803da0 100644 --- a/common/source/docs/common-wiki-editing-submitting-changes.rst +++ b/common/source/docs/common-wiki-editing-submitting-changes.rst @@ -87,4 +87,4 @@ How to get changes approved All changes to the wiki are `reviewed `__ by the wiki "maintainers" to help reduce the chance of misleading or incorrect information being posted. Feel free to post comments in the PullRequest and/or attend the :ref:`weekly dev meeting ` to escalate getting your changes submitted. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] diff --git a/common/source/docs/common-wiki_editing_guide.rst b/common/source/docs/common-wiki_editing_guide.rst index e64a82490a..7c461dabcf 100644 --- a/common/source/docs/common-wiki_editing_guide.rst +++ b/common/source/docs/common-wiki_editing_guide.rst @@ -40,4 +40,4 @@ FAQ - Why are my changes not published? All changes to the wiki are `reviewed `__ by the wiki "maintainers" to help reduce the chance of misleading or incorrect information being posted. Feel free to post comments in the PullRequest and/or attend the :ref:`weekly dev meeting ` to escalate getting your changes submitted. -[copywiki destination="copter,plane,rover,planner,planner2,antennatracker,dev,ardupilot,mavproxy"] +[copywiki destination="copter,plane,rover,blimp,planner,planner2,antennatracker,dev,ardupilot,mavproxy"]