From e8b27db402f17cda8b3a8c5bf9e4535d0ad9621a Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 22 Dec 2021 22:25:50 +0200
Subject: [PATCH 01/17] Switch to the new registry

---
 _templates/navbar.html | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/_templates/navbar.html b/_templates/navbar.html
index 99961d7fdd..8070ab31dc 100644
--- a/_templates/navbar.html
+++ b/_templates/navbar.html
@@ -49,17 +49,7 @@
               <li role="menuitem"><a href="https://docs.platformio.org/page/ci/index.html"><i class="fa fa-refresh"></i>Continuous Integration</a></li>\
             </ul>\
           </li>\
-          <li class="dropdown">\
-            <a role="button" data-target="#" href="https://platformio.org/lib" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-code fa-lg"></i>Registry<span class="caret"></span>\
-            </a>\
-            <ul class="dropdown-menu" role="menu">\
-              <li role="menuitem"><a href="https://platformio.org/lib"><i class="fa fa-code"></i>Libraries</a></li>\
-              <li role="separator" class="divider"></li>\
-              <li role="menuitem"><a href="https://platformio.org/platforms"><i class="fa fa-laptop"></i>Platforms</a></li>\
-              <li role="menuitem"><a href="https://platformio.org/frameworks"><i class="fa fa-cog"></i>Frameworks</a></li>\
-              <li role="menuitem"><a href="https://platformio.org/boards"><i class="fa fa-microchip"></i>Boards</a></li>\
-            </ul>\
-          </li>\
+          <li><a href="https://registry.platformio.org/"><i class="fa fa-code fa-lg"></i>Registry</a></li>\
         </ul>\
         <ul class="nav navbar-nav navbar-right">\
           <li class="active"><a href="https://docs.platformio.org"><i class="fa fa-book fa-lg"></i>Docs</a></li>\

From 4be19c60c91430ad171fc060ce953c1d1b2a5a5d Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 24 Dec 2021 15:03:17 +0200
Subject: [PATCH 02/17] Improve docs for "dependencies" field of library.json

---
 librarymanager/config.rst | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/librarymanager/config.rst b/librarymanager/config.rst
index fd47e63ca5..072925274e 100644
--- a/librarymanager/config.rst
+++ b/librarymanager/config.rst
@@ -319,6 +319,18 @@ The rest possible values including VCS repository URLs are documented in
 
 Example:
 
+.. code-block:: javascript
+
+    "dependencies":
+    {
+        "bblanchon/ArduinoJson": "^6.16.1",
+        "me-no-dev/AsyncTCP": "*",
+        "external-repo": "https://github.com/user/package.git#1.2.3",
+        "external-zip": "https://github.com/me-no-dev/AsyncTCP/archive/master.zip"
+    }
+
+More advanced usage:
+
 .. code-block:: javascript
 
     "dependencies":
@@ -344,18 +356,6 @@ Example:
         }
     ]
 
-A short definition of dependencies is allowed:
-
-.. code-block:: javascript
-
-    "dependencies":
-    {
-        "bblanchon/ArduinoJson": "^6.16.1",
-        "me-no-dev/AsyncTCP": "*",
-        "external-repo": "https://github.com/user/package.git#1.2.3",
-        "external-zip": "https://github.com/me-no-dev/AsyncTCP/archive/master.zip"
-    }
-
 .. _libjson_export:
 
 ``export``

From 1b50a61f325b8a3f957e13c38bed5eb4349ee106 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sun, 2 Jan 2022 19:01:45 +0200
Subject: [PATCH 03/17] Add "NEW" badge to the registry

---
 _static/css/extra.css  | 19 +++++++++++++++++++
 _templates/navbar.html |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/_static/css/extra.css b/_static/css/extra.css
index f0a00301db..5c0d19213f 100644
--- a/_static/css/extra.css
+++ b/_static/css/extra.css
@@ -522,9 +522,28 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
     left: 0;
   }
 }
+.badge {
+   display: inline-block;
+   min-width: 10px;
+   padding: 3px 7px;
+   font-size: 12px;
+   font-weight: 700;
+   line-height: 1;
+   color: #fff;
+   text-align: center;
+   white-space: nowrap;
+   vertical-align: middle;
+   background-color: #777;
+   border-radius: 10px;
+}
 
 /* Misc */
 
+.nav .badge {
+  background-color: #5cb85c;
+  margin-left: 5px;
+}
+
 .wy-nav-content {
   max-width: 1000px !important;
 }
diff --git a/_templates/navbar.html b/_templates/navbar.html
index 8070ab31dc..b73230f2e9 100644
--- a/_templates/navbar.html
+++ b/_templates/navbar.html
@@ -49,7 +49,7 @@
               <li role="menuitem"><a href="https://docs.platformio.org/page/ci/index.html"><i class="fa fa-refresh"></i>Continuous Integration</a></li>\
             </ul>\
           </li>\
-          <li><a href="https://registry.platformio.org/"><i class="fa fa-code fa-lg"></i>Registry</a></li>\
+          <li><a href="https://registry.platformio.org/"><i class="fa fa-code fa-lg"></i>Registry<sup class="badge"><small>NEW</small></sup></a></li>\
         </ul>\
         <ul class="nav navbar-nav navbar-right">\
           <li class="active"><a href="https://docs.platformio.org"><i class="fa fa-book fa-lg"></i>Docs</a></li>\

From c0282f93768a75aa61af43c4027aa73b07d8691d Mon Sep 17 00:00:00 2001
From: valeros <valeros08@gmail.com>
Date: Mon, 3 Jan 2022 12:19:51 +0200
Subject: [PATCH 04/17] Typo fixes

---
 projectconf/section_env.rst        | 2 +-
 projectconf/section_platformio.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projectconf/section_env.rst b/projectconf/section_env.rst
index ed4445129c..8f5988677c 100644
--- a/projectconf/section_env.rst
+++ b/projectconf/section_env.rst
@@ -29,7 +29,7 @@ Common ``[env]``
 ----------------
 
 An optional configuration environment with common options that will be
-shared between all ``[env:NAME]`` environments in the platform.ini
+shared between all ``[env:NAME]`` environments in the platformio.ini
 file. It is very useful if the configuration file has a lot of
 environments ``[env:NAME]`` and they share common settings.
 
diff --git a/projectconf/section_platformio.rst b/projectconf/section_platformio.rst
index c56d758296..53343ced46 100644
--- a/projectconf/section_platformio.rst
+++ b/projectconf/section_platformio.rst
@@ -17,7 +17,7 @@ Section ``[platformio]``
 .. contents::
     :local:
 
-The platform.ini ``platformio`` section is used for overriding the
+The ``platformio`` section in the platformio.ini file is used for overriding the
 default configuration options for :ref:`piocore`.
 
 .. note::

From ab1e44c06099f7c61316555bd28b451214bc5c0a Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Mon, 3 Jan 2022 13:05:37 +0200
Subject: [PATCH 05/17] Split advanced scripting into the multiple pages

---
 core/migration.rst                            |   4 +-
 index.rst                                     |   2 +-
 integration/compile_commands.rst              |   2 +-
 projectconf/advanced_scripting.rst            | 971 ------------------
 projectconf/section_env_advanced.rst          |   2 +-
 projectconf/section_env_build.rst             |   2 +-
 redirects.txt                                 |   1 +
 scripting/actions.rst                         | 113 ++
 scripting/construction_environments.rst       |  86 ++
 scripting/custom_targets.rst                  | 179 ++++
 scripting/examples/custom_debug_flags.rst     |  43 +
 scripting/examples/custom_program_name.rst    |  39 +
 scripting/examples/custom_upload_tool.rst     | 108 ++
 scripting/examples/external_sources.rst       |  41 +
 scripting/examples/extra_linker_flags.rst     |  45 +
 scripting/examples/extra_python_packages.rst  |  42 +
 scripting/examples/index.rst                  |  31 +
 .../examples/override_board_configuration.rst |  46 +
 scripting/examples/override_package_files.rst |  99 ++
 .../platformio_ini_custom_options.rst         |  61 ++
 scripting/examples/split_build_flags.rst      |  36 +
 scripting/examples/upload_to_cloud.rst        |  15 +
 scripting/index.rst                           |  56 +
 scripting/launch_types.rst                    |  39 +
 scripting/middlewares.rst                     |  89 ++
 25 files changed, 1175 insertions(+), 977 deletions(-)
 delete mode 100644 projectconf/advanced_scripting.rst
 create mode 100644 scripting/actions.rst
 create mode 100644 scripting/construction_environments.rst
 create mode 100644 scripting/custom_targets.rst
 create mode 100644 scripting/examples/custom_debug_flags.rst
 create mode 100644 scripting/examples/custom_program_name.rst
 create mode 100644 scripting/examples/custom_upload_tool.rst
 create mode 100644 scripting/examples/external_sources.rst
 create mode 100644 scripting/examples/extra_linker_flags.rst
 create mode 100644 scripting/examples/extra_python_packages.rst
 create mode 100644 scripting/examples/index.rst
 create mode 100644 scripting/examples/override_board_configuration.rst
 create mode 100644 scripting/examples/override_package_files.rst
 create mode 100644 scripting/examples/platformio_ini_custom_options.rst
 create mode 100644 scripting/examples/split_build_flags.rst
 create mode 100644 scripting/examples/upload_to_cloud.rst
 create mode 100644 scripting/index.rst
 create mode 100644 scripting/launch_types.rst
 create mode 100644 scripting/middlewares.rst

diff --git a/core/migration.rst b/core/migration.rst
index 4ebd0b99f4..faaa1af242 100644
--- a/core/migration.rst
+++ b/core/migration.rst
@@ -118,7 +118,7 @@ SCons 4.0
 
 PlatformIO Core 5.0 build engine has been upgraded to the latest `SCons 4.0 - a next-generation software construction tool <https://scons.org/>`__:
 
-* :ref:`Configuration files are Python scripts <projectconf_advanced_scripting>` – use the power of a real programming language to solve build problems
+* :ref:`Configuration files are Python scripts <scripting>` – use the power of a real programming language to solve build problems
 * Built-in reliable and automatic dependency analysis
 * Improved support for parallel builds
 * Ability to :ref:`share built files in a cache <projectconf_pio_cache_dir>` to speed up multiple builds.
@@ -127,7 +127,7 @@ Custom Targets
 ''''''''''''''
 
 PlatformIO Core 5.0 gives more freedom to developers and :ref:`platforms` maintainers.
-They can now declare the :ref:`projectconf_advanced_scripting_custom_targets`:
+They can now declare the :ref:`scripting_custom_targets`:
 
 * Pre/Post processing based on dependent sources (another target, source file, etc.)
 * Command launcher with own arguments
diff --git a/index.rst b/index.rst
index 8ebc99cc55..ea068b6fc7 100644
--- a/index.rst
+++ b/index.rst
@@ -48,7 +48,7 @@ Contents
 
     platformio.ini <projectconf/index>
     envvars
-    projectconf/advanced_scripting
+    scripting/index
 
 .. toctree::
     :caption: Instruments
diff --git a/integration/compile_commands.rst b/integration/compile_commands.rst
index 5e580065ee..c3da42aab0 100644
--- a/integration/compile_commands.rst
+++ b/integration/compile_commands.rst
@@ -28,7 +28,7 @@ contains structured data about every compilation unit in your project.
 
 
 A default path for ``compile_commands.json`` is ":ref:`projectconf_pio_build_dir`/envname".
-You can override this path with :ref:`projectconf_advanced_scripting` and
+You can override this path with :ref:`scripting` and
 ``COMPILATIONDB_PATH`` environment variable. For example, generate ``compile_commands.json``
 in a root of project:
 
diff --git a/projectconf/advanced_scripting.rst b/projectconf/advanced_scripting.rst
deleted file mode 100644
index 13da12fc7b..0000000000
--- a/projectconf/advanced_scripting.rst
+++ /dev/null
@@ -1,971 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _projectconf_advanced_scripting:
-
-Advanced Scripting
-------------------
-
-.. warning::
-
-  Advanced Scripting is recommended for Advanced Users and requires
-  knowledge of the Python language.
-
-.. warning::
-
-  :ref:`projectconf_dynamic_build_flags` is a highly recommended
-  alternative to advanced scripting, where you can use any programming
-  language. Also, that option is useful if you need to apply changes
-  to the project before the building/uploading process, such as:
-
-  * Macro with the latest VCS revision/tag "on-the-fly"
-  * Generate dynamic headers (``*.h``)
-  * Process media content before generating SPIFFS image
-  * Make some changes to source code or related libraries
-
-.. contents::
-
-The PlatformIO Build System allows the user to extend the build process with
-custom scripts using the Python interpreter and
-the `SCons <http://www.scons.org>`_ construction tool.
-Build flags, upload flags, targets, toolchains data and other information are
-available for modification as `SCons Construction Environments <http://www.scons.org/doc/production/HTML/scons-user.html#chap-environments>`_.
-Custom scripts are included with :ref:`projectconf_extra_scripts`
-
-.. warning::
-  You can not run or debug these scripts manually with a Python
-  interpreter. They will be loaded automatically when the
-  :ref:`cmd_run` command processes the project environment.
-
-Launch types
-~~~~~~~~~~~~
-
-There are two execution orders for extra scripts:
-
-1. **PRE** - executes before the main script of :ref:`platforms`
-2. **POST** - executes after the main script of :ref:`platforms`
-
-Multiple extra scripts are allowed. Please split them via  ", "
-(comma + space) in the same line or use multi-line values.
-
-For example, in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:my_env_1]
-  platform = ...
-  ; Defaults to POST script since no prefix is used
-  extra_scripts = post_extra_script.py
-
-  [env:my_env_2]
-  platform = ...
-  extra_scripts =
-    pre:pre_extra_script.py
-    post:post_extra_script1.py
-    post_extra_script2.py
-
-This option can also be set by the global environment variable :envvar:`PLATFORMIO_EXTRA_SCRIPTS`.
-
-Construction Environments
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The PlatformIO Build System uses two built-in construction environments
-to process each project:
-
-* ``env``, ``Import("env")`` - the global construction environment used
-  for the :ref:`platforms` and :ref:`frameworks` build scripts, upload tools,
-  :ref:`ldf`, and other internal operations
-* ``projenv``, ``Import("projenv")`` - the isolated construction environment
-  used for processing the project source code in :ref:`projectconf_pio_src_dir`.
-  Please note that any :ref:`projectconf_src_build_flags` specified in
-  :ref:`projectconf` will be passed to ``projenv`` and not to ``env``.
-
-
-.. warning::
-  1. ``projenv`` is available only for POST-type scripts
-  2. Flags passed to ``env`` using PRE-type script will affect ``projenv`` too.
-
-``my_pre_extra_script.py``:
-
-.. code-block:: python
-
-    Import("env")
-
-    # access to global construction environment
-    print(env)
-
-    # Dump construction environment (for debug purpose)
-    print(env.Dump())
-
-    # append extra flags to global build environment
-    # which later will be used to build:
-    # - project source code
-    # - frameworks
-    # - dependent libraries
-    env.Append(CPPDEFINES=[
-      "MACRO_1_NAME",
-      ("MACRO_2_NAME", "MACRO_2_VALUE")
-    ])
-
-
-``my_post_extra_script.py``:
-
-.. code-block:: python
-
-    Import("env", "projenv")
-
-    # access to global construction environment
-    print(env)
-
-    # access to project construction environment
-    print(projenv)
-
-    # Dump construction environments (for debug purpose)
-    print(env.Dump())
-    print(projenv.Dump())
-
-    # append extra flags to global build environment
-    # which later will be used to build:
-    # - frameworks
-    # - dependent libraries
-    env.Append(CPPDEFINES=[
-      "MACRO_1_NAME",
-      ("MACRO_2_NAME", "MACRO_2_VALUE")
-    ])
-
-    # append extra flags to only project build environment
-    projenv.Append(CPPDEFINES=[
-      "PROJECT_EXTRA_MACRO_1_NAME",
-      ("ROJECT_EXTRA_MACRO_2_NAME", "ROJECT_EXTRA_MACRO_2_VALUE")
-    ])
-
-
-See examples below how to import construction environments and modify existing
-data or add new.
-
-Before/Pre and After/Post actions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The PlatformIO Build System has a rich API that allows one to attach different pre-/post
-actions (hooks) using ``env.AddPreAction(target, callback)`` or
-``env.AddPreAction(target, [callback1, callback2, ...])`` function. The first
-argument ``target`` can be the name of a target that is passed using the
-:option:`pio run --target` command, the name of a built-in target
-(buildprog, size, upload, program, buildfs, uploadfs, uploadfsota) or the path
-to a file which PlatformIO processes (ELF, HEX, BIN, OBJ, etc.).
-
-**Examples**
-
-The ``extra_script.py`` file is located in the same directory as ``platformio.ini``.
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:pre_and_post_hooks]
-    extra_scripts = post:extra_script.py
-
-``extra_script.py``:
-
-.. code-block:: python
-
-    Import("env", "projenv")
-
-    # access to global build environment
-    print(env)
-
-    # access to project build environment (is used source files in "src" folder)
-    print(projenv)
-
-    #
-    # Dump build environment (for debug purpose)
-    # print(env.Dump())
-    #
-
-    #
-    # (Optional) Do not run extra script when IDE fetches C/C++ project metadata
-    #
-    from SCons.Script import COMMAND_LINE_TARGETS
-
-    if "idedata" in COMMAND_LINE_TARGETS:
-        env.Exit(0)
-
-    #
-    # Change build flags in runtime
-    #
-    env.ProcessUnFlags("-DVECT_TAB_ADDR")
-    env.Append(CPPDEFINES=("VECT_TAB_ADDR", 0x123456789))
-
-    #
-    # Upload actions
-    #
-
-    def before_upload(source, target, env):
-        print("before_upload")
-        # do some actions
-
-        # call Node.JS or other script
-        env.Execute("node --version")
-
-
-    def after_upload(source, target, env):
-        print("after_upload")
-        # do some actions
-
-    print("Current build targets", map(str, BUILD_TARGETS))
-
-    env.AddPreAction("upload", before_upload)
-    env.AddPostAction("upload", after_upload)
-
-    #
-    # Custom actions when building program/firmware
-    #
-
-    env.AddPreAction("buildprog", callback...)
-    env.AddPostAction("buildprog", callback...)
-
-    #
-    # Custom actions for specific files/objects
-    #
-
-    env.AddPreAction("$BUILD_DIR/${PROGNAME}.elf", [callback1, callback2,...])
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex", callback...)
-
-    # custom action before building SPIFFS image. For example, compress HTML, etc.
-    env.AddPreAction("$BUILD_DIR/spiffs.bin", callback...)
-
-    # custom action for project's main.cpp
-    env.AddPostAction("$BUILD_DIR/src/main.cpp.o", callback...)
-
-    # Custom HEX from ELF
-    env.AddPostAction(
-        "$BUILD_DIR/${PROGNAME}.elf",
-        env.VerboseAction(" ".join([
-            "$OBJCOPY", "-O", "ihex", "-R", ".eeprom",
-            "$BUILD_DIR/${PROGNAME}.elf", "$BUILD_DIR/${PROGNAME}.hex"
-        ]), "Building $BUILD_DIR/${PROGNAME}.hex")
-    )
-
-
-Build Middlewares
-~~~~~~~~~~~~~~~~~
-
-PlatformIO Build System allows you to add middleware functions that can be used for
-Build Node(Object) construction. This is very useful if you need to add custom flags
-for the specific file nodes or exclude them from a build process.
-
-There is ``env.AddBuildMiddleware(callback, pattern)`` helper which instructs
-PlatformIO Build System to call ``callback`` for each `SCons File System Node <https://scons.org/doc/latest/HTML/scons-api/SCons.Node.FS.Dir-class.html>`_
-whose path matches with `Unix shell-style "pattern" (wildcards) <https://docs.python.org/3.8/library/fnmatch.html>`_.
-
-If a ``pattern`` is omitted, the ``callback`` will be called for each File System Node
-which is added for the build process.
-
-You can add an unlimited number of build middlewares. They will be called in order of
-registration. Please note, if the first middleware ignores some File Nodes, they will
-not be passed to the next middleware in chain.
-
-**Examples**
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:build_middleware]
-    extra_scripts = pre:extra_script.py
-
-``extra_script.py``:
-
-.. code-block:: python
-
-    Import("env")
-
-
-    # --- Add custom macros for the ALL files which name contains "http"
-    def extra_http_configuration(node):
-        """
-        `node.name` - a name of File System Node
-        `node.get_path()` - a relative path
-        `node.get_abspath()` - an absolute path
-        """
-
-        # do not modify node if file name does not contain "http"
-        if "http" not in node.name:
-            return node
-
-        # now, we can override ANY SCons variables (CPPDEFINES, CCFLAGS, etc.,) for the specific file
-        # pass SCons variables as extra keyword arguments to `env.Object()` function
-        # p.s: run `pio run -t envdump` to see a list with SCons variables
-
-        return env.Object(
-            node,
-            CPPDEFINES=env["CPPDEFINES"]
-            + [("HTTP_HOST", "device.local"), ("HTTP_PORT", 8080)],
-            CCFLAGS=env["CCFLAGS"] + ["-fno-builtin-printf"]
-        )
-
-    env.AddBuildMiddleware(extra_http_configuration)
-
-
-    # --- Replace some file from a build process with another
-
-    def replace_node_with_another(node):
-        return env.File("path/to/patched/RtosTimer.cpp")
-
-    env.AddBuildMiddleware(
-        replace_node_with_another,
-        "framework-mbed/rtos/RtosTimer.cpp"
-    )
-
-
-    # --- Skip assembly *.S files from build process
-
-    def skip_asm_from_build(node):
-        # to ignore file from a build process, just return None
-        return None
-
-    env.AddBuildMiddleware(skip_asm_from_build, "*.S")
-
-
-.. _projectconf_advanced_scripting_custom_targets:
-
-Custom Targets
-~~~~~~~~~~~~~~
-
-.. versionadded:: 5.0
-
-PlatformIO allows you to declare unlimited number of the custom targets. There are a
-lot of use cases for them:
-
-- Pre/Post processing based on a dependent sources (other target, source file, etc.)
-- Command launcher with own arguments
-- Launch command with custom options declared in :ref:`projectconf`
-- Python callback as a target (use the power of Python interpreter and PlatformIO Build API).
-
-A custom target can be processed using :option:`pio run --target` option and
-you can list them via :option:`pio run --list-targets` command.
-
-Build System API
-^^^^^^^^^^^^^^^^
-
-.. code-block:: python
-
-    Import("env")
-
-    env.AddCustomTarget(
-        name,
-        dependencies,
-        actions,
-        title=None,
-        description=None,
-        always_build=True
-    )
-
-
-``AddCustomTarget`` arguments:
-
-:name:
-    A name of target. ASCII chars (a-z, 0-9, _, -) are recommended. Good names are
-    "gen_headers", "program_bitstream", etc.
-
-:dependencies:
-    A list of dependencies that should be built BEFORE target will be launched. It is
-    possible pass multiple dependencies as a Python list ``["dep1", dep_target_2]``.
-    If a target does not have dependencies, ``None`` should be passed.
-
-:actions:
-    A list of actions to call on a target. It is possible to pass multiple actions as
-    a Python list ``["python --version", my_calback]``.
-
-:title:
-    A title of a target. It will be printed when using :ref:`piocore` or :ref:`pioide`.
-    We recommend to keep a title very short, 1-2 words.
-
-:description:
-    The same as a ``title`` argument but allows you to provide detailed explanation
-    what target does.
-
-:always_build:
-    If there are declared ``dependencies`` and they are already built, this target
-    will not be called if ``always_build=False``. A default value is
-    ``always_build=True`` and means always building/calling target.
-
-
-Examples
-^^^^^^^^
-
-Command shortcut
-''''''''''''''''
-
-Create a custom ``node`` target (alias) which will print a NodeJS version
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:myenv]
-    platform = ...
-    ...
-    extra_scripts = extra_script.py
-
-``extra_script.py``:
-
-.. code-block:: python
-
-    Import("env")
-
-    # Single action/command per 1 target
-    env.AddCustomTarget("sysenv", None, 'python -c "import os; print(os.environ)"')
-
-    # Multiple actions
-    env.AddCustomTarget(
-        name="pioenv",
-        dependencies=None,
-        actions=[
-            "pio --version",
-            "python --version"
-        ],
-        title="Core Env",
-        description="Show PlatformIO Core and Python versions"
-    )
-
-
-Now, run ``pio run --target sysenv`` or ``pio run -t pioenv`` (short version).
-
-Dependent target
-''''''''''''''''
-
-Sometimes you need to run a command which depends on another target (file,
-firmware, etc). Let's create an ``ota`` target and declare command which will
-depend on a project firmware. If a build process successes, declared command
-will be run.
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:myenv]
-    platform = ...
-    ...
-    extra_scripts = extra_script.py
-
-
-``extra_script.py``:
-
-.. code-block:: python
-
-    Import("env")
-
-    env.AddCustomTarget(
-        "ota",
-        "$BUILD_DIR/${PROGNAME}.elf",
-        "ota_script --firmware-path $SOURCE"
-    )
-
-
-Now, run ``pio run -t ota``.
-
-Target with options
-'''''''''''''''''''
-
-Let's create a simple ``ping`` target and process it with
-``pio run --target ping`` command:
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:env_custom_target]
-    platform = ...
-    ...
-    extra_scripts = extra_script.py
-    custom_ping_host = google.com
-
-``extra_script.py``:
-
-.. code-block:: python
-
-    Import("env")
-
-    host = env.GetProjectOption("custom_ping_host")
-
-    def mytarget_callback(*args, **kwargs):
-        print("Hello PlatformIO!")
-        env.Execute("ping " + host)
-
-
-    env.AddCustomTarget("ping", None, mytarget_callback)
-
-Other Use Cases
-~~~~~~~~~~~~~~~
-
-The best examples are `PlatformIO development platforms <https://github.com/topics/platformio-platform>`__.
-Please check ``builder`` folder for the main and framework scripts.
-
-Custom options in ``platformio.ini``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-PlatformIO allows you extending project configuration with own data. You can read
-these values later using `ProjectConfig API <https://github.com/platformio/platformio-core/blob/develop/platformio/project/config.py>`__:
-
-:``ProjectConfig::get(section, option, default=None)``:
-    Get an option value for the named section
-
-:``ProjectConfig::options(section)``:
-    Returns a list of the sections available
-
-:``ProjectConfig::items(section, as_dict=False)``:
-    Returns a list of "name", "value" pairs for the options in the given section or a dictionary when ``as_dict=True`` is passed
-
-:``ProjectConfig::has_section(section)``:
-    Indicates whether the named section is present in the configuration
-
-:``ProjectConfig::has_option(section, option)``:
-    If the given section exists, and contains the given option, returns ``True``; otherwise returns ``False``.
-
-PlatformIO's "ProjectConfig" is compatible with a native Python's `ConfigParser <https://docs.python.org/3/library/configparser.html>`__ API.
-
-**Example**
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [universe]
-    hello = world
-
-    [env:my_env]
-    platform = ...
-    extra_scripts = extra_script.py
-
-    custom_option1 = value1
-    custom_option2 = value2
-
-``extra_script.py``:
-
-.. code-block:: python
-
-    # "env.GetProjectOption" shortcut for the active environment
-    value1 = env.GetProjectOption("custom_option1")
-    value2 = env.GetProjectOption("custom_option2")
-
-    # Read value from other environments
-    config = env.GetProjectConfig()
-    world = config.get("universe", "hello")
-
-Split C/C++ build flags
-^^^^^^^^^^^^^^^^^^^^^^^
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:my_env]
-    platform = ...
-    extra_scripts = extra_script.py
-
-``extra_script.py`` (place it near ``platformio.ini``):
-
-.. code-block:: python
-
-    Import("env")
-
-    # General options that are passed to the C and C++ compilers
-    env.Append(CCFLAGS=["flag1", "flag2"])
-
-    # General options that are passed to the C compiler (C only; not C++).
-    env.Append(CFLAGS=["flag1", "flag2"])
-
-    # General options that are passed to the C++ compiler
-    env.Append(CXXFLAGS=["flag1", "flag2"])
-
-Extra Linker Flags without ``-Wl,`` prefix
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Sometimes you need to pass extra flags to GCC linker without ``Wl,``. You could
-use :ref:`projectconf_build_flags` option but it will not work. PlatformIO
-will not parse these flags to ``LINKFLAGS`` scope. In this case, simple
-extra script will help:
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:env_extra_link_flags]
-    platform = windows_x86
-    extra_scripts = extra_script.py
-
-``extra_script.py`` (place it near ``platformio.ini``):
-
-.. code-block:: python
-
-    Import("env")
-
-    #
-    # Dump build environment (for debug)
-    # print(env.Dump())
-    #
-
-    env.Append(
-      LINKFLAGS=[
-          "-static",
-          "-static-libgcc",
-          "-static-libstdc++"
-      ]
-    )
-
-Custom upload tool
-^^^^^^^^^^^^^^^^^^
-
-You can override default upload command of development platform using extra
-script. There is the common environment variable ``UPLOADCMD`` which PlatformIO
-Build System will handle when you :ref:`pio run -t upload <cmd_run>`.
-
-Please note that some development platforms can have more than 1 upload command.
-For example, :ref:`platform_atmelavr` has ``UPLOADHEXCMD``
-(firmware) and ``UPLOADEEPCMD`` (EEPROM data).
-
-See examples below:
-
-**Template**
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:my_custom_upload_tool]
-    platform = ...
-    ; place it into the root of project or use full path
-    extra_scripts = extra_script.py
-    upload_protocol = custom
-    ; each flag in a new line
-    upload_flags =
-      -arg1
-      -arg2
-      -argN
-
-``extra_script.py`` (place it near ``platformio.ini``):
-
-.. code-block:: python
-
-    Import("env")
-
-    # please keep $SOURCE variable, it will be replaced with a path to firmware
-
-    # Generic
-    env.Replace(
-        UPLOADER="executable or path to executable",
-        UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCE"
-    )
-
-    # In-line command with arguments
-    env.Replace(
-        UPLOADCMD="executable -arg1 -arg2 $SOURCE"
-    )
-
-    # Python callback
-    def on_upload(source, target, env):
-        print(source, target)
-        firmware_path = str(source[0])
-        # do something
-        env.Execute("executable arg1 arg2")
-
-    env.Replace(UPLOADCMD=on_upload)
-
-
-**Custom openOCD command**
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:disco_f407vg]
-    platform = ststm32
-    board = disco_f407vg
-    framework = mbed
-
-    extra_scripts = extra_script.py
-    upload_protocol = custom
-    ; each flag in a new line
-    upload_flags =
-        -f
-        scripts/interface/stlink.cfg
-        -f
-        scripts/target/stm32f4x.cfg
-
-``extra_script.py`` (place it near ``platformio.ini``):
-
-.. code-block:: python
-
-    Import("env")
-
-    platform = env.PioPlatform()
-
-    env.Prepend(
-        UPLOADERFLAGS=["-s", platform.get_package_dir("tool-openocd") or ""]
-    )
-    env.Append(
-        UPLOADERFLAGS=["-c", "program {{$SOURCE}} verify reset; shutdown"]
-    )
-    env.Replace(
-        UPLOADER="openocd",
-        UPLOADCMD="$UPLOADER $UPLOADERFLAGS"
-    )
-
-
-Upload to Cloud (OTA)
-^^^^^^^^^^^^^^^^^^^^^
-
-See project example https://github.com/platformio/bintray-secure-ota
-
-Custom firmware/program name
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Sometimes is useful to have a different firmware/program name in
-:ref:`projectconf_pio_build_dir`.
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:env_custom_prog_name]
-    platform = espressif8266
-    board = nodemcuv2
-    framework = arduino
-    build_flags = -D VERSION=13
-    extra_scripts = pre:extra_script.py
-
-``extra_script.py``:
-
-.. code-block:: python
-
-    Import("env")
-
-    my_flags = env.ParseFlags(env['BUILD_FLAGS'])
-    defines = {k: v for (k, v) in my_flags.get("CPPDEFINES")}
-    # print(defines)
-
-    env.Replace(PROGNAME="firmware_%s" % defines.get("VERSION"))
-
-Override package files
-^^^^^^^^^^^^^^^^^^^^^^
-
-PlatformIO Package Manager automatically installs pre-built packages
-(:ref:`frameworks`, toolchains, libraries) required by development
-:ref:`platforms` and build process. Sometimes you need to override original
-files with own versions: configure custom GPIO, do changes to built-in LD
-scripts, or some patching to installed library dependency.
-
-The simplest way is using `Diff and Patch technique <https://linuxacademy.com/blog/linux/introduction-using-diff-and-patch/>`_. How does it work?
-
-1. Modify original source files
-2. Generate patches
-3. Apply patches via PlatformIO extra script before build process.
-
-**Example**
-
-We need to patch the original ``standard/pins_arduino.h`` variant from
-:ref:`framework_arduino` framework and add extra macro ``#define PIN_A8   (99)``.
-Let's duplicate ``standard/pins_arduino.h`` and apply changes. Generate a
-patch file and place it into ``patches`` folder located in the root of a project:
-
-.. code-block:: shell
-
-    diff ~/.platformio/packages/framework-arduinoavr/variants/standard/pins_arduino.h /tmp/pins_arduino_modified.h > /path/to/platformio/project/patches/1-framework-arduinoavr-add-pin-a8.patch
-
-The result of ``1-framework-arduinoavr-add-pin-a8.patch``:
-
-.. code-block:: diff
-
-    63a64
-    > #define PIN_A8   (99)
-    112c113
-    < // 14-21 PA0-PA7 works
-    ---
-    > // 14-21 PA0-PA7 works
-
-Using extra scripting we can apply patching before a build process. The final
-result of :ref:`projectconf` and "PRE" extra script named ``apply_patches.py``:
-
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:uno]
-    platform = atmelavr
-    board = uno
-    framework = arduino
-    extra_scripts = pre:apply_patches.py
-
-``apply_patches.py``:
-
-.. code-block:: python
-
-    from os.path import join, isfile
-
-    Import("env")
-
-    FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoavr")
-    patchflag_path = join(FRAMEWORK_DIR, ".patching-done")
-
-    # patch file only if we didn't do it before
-    if not isfile(join(FRAMEWORK_DIR, ".patching-done")):
-        original_file = join(FRAMEWORK_DIR, "variants", "standard", "pins_arduino.h")
-        patched_file = join("patches", "1-framework-arduinoavr-add-pin-a8.patch")
-
-        assert isfile(original_file) and isfile(patched_file)
-
-        env.Execute("patch %s %s" % (original_file, patched_file))
-        # env.Execute("touch " + patchflag_path)
-
-
-        def _touch(path):
-            with open(path, "w") as fp:
-                fp.write("")
-
-        env.Execute(lambda *args, **kwargs: _touch(patchflag_path))
-
-
-Please note that this example will work on a system where a ``patch`` tool
-is available. For Windows OS, you can use ``patch`` and ``diff`` tools
-provided by `Git client utility <https://git-scm.com/>`__
-(located inside installation directory).
-
-If you need to make it more independent to the operating system,
-please replace the ``patch`` with a multi-platform
-`python-patch <https://github.com/techtonik/python-patch>`_ script.
-
-Override Board Configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-PlatformIO allows one to override some basic options (integer or string values)
-using :ref:`projectconf_board_more_options` in :ref:`projectconf`.
-Sometimes you need to do complex changes to default board manifest and
-extra PRE scripting work well here. See example below how to override default
-hardware VID/PIDs.
-
-.. warning::
-    Due to a technical limitation these board changes will not work for
-    :ref:`cmd_device_monitor` command.
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:uno]
-    platform = atmelavr
-    board = uno
-    framework = arduino
-    extra_scripts = pre:custon_hwids.py
-
-``custon_hwids.py``:
-
-.. code-block:: python
-
-    Import("env")
-
-    board_config = env.BoardConfig()
-    # should be array of VID:PID pairs
-    board_config.update("build.hwids", [
-      ["0x2341", "0x0243"],  # 1st pair
-      ["0x2A03", "0x0043"].  # 2nd pair, etc.
-    ])
-
-Custom debug flags
-^^^^^^^^^^^^^^^^^^
-
-PlatformIO removes all debug/optimization flags before a debug session or when
-:ref:`build_configurations` is set to ``debug`` and overrides them with
-``-0g -g2 -ggdb2`` for ``ASFLAGS``, ``CCFLAGS``, and ``LINKFLAGS`` build
-scopes.
-
-An extra script allows us to override PlatformIO's default behavior and declare
-custom flags. See example below where we override ``-Og`` with ``-O0``:
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:teensy31]
-    platform = teensy
-    board = teensy31
-    framework = arduino
-    extra_scripts = custom_debug_flags.py
-
-``custom_debug_flags.py``:
-
-.. code-block:: python
-
-    Import("env")
-
-    if env.GetBuildType() == "debug":
-       for scope in ("ASFLAGS", "CCFLAGS", "LINKFLAGS"):
-          for i, flag in enumerate(env[scope]):
-             if flag == "-Og":
-                env[scope][i] = "-O0"
-
-Extra Python packages
-^^^^^^^^^^^^^^^^^^^^^
-
-If your project depends on the extra Python packages, you can use extra script to
-install them into the same virtual environment where :ref:`piocore` is installed.
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:my_env]
-    platform = ...
-    extra_scripts = extra_script.py
-
-``extra_script.py`` (place it near ``platformio.ini``):
-
-.. code-block:: python
-
-    Import("env")
-
-    # List installed packages
-    env.Execute("$PYTHONEXE -m pip list")
-
-    # Install custom packages from the PyPi registry
-    env.Execute("$PYTHONEXE -m pip install pkg1 pkg2")
-
-Build external sources
-^^^^^^^^^^^^^^^^^^^^^^
-
-If your project depends on some arbitrary source files that are located outside of the
-usual source directory :ref:`projectconf_pio_src_dir` then you can use a preliminary
-extra script to add them to the build process. A typical situation when this approach
-may be useful is when a project depends on pregenerated files in a temporary folder.
-Here is a typical configuration with an extra_script that instructs PlatformIO to build
-all sources in an external folder:
-
-``platformio.ini``:
-
-.. code-block:: ini
-
-    [env:my_env]
-    platform = ...
-    extra_scripts = pre:extra_script.py
-
-``extra_script.py`` (place it near ``platformio.ini``):
-
-.. code-block:: python
-
-    import os
-
-    Import("env")
-
-    env.BuildSources(
-        os.path.join("$BUILD_DIR", "external", "build"),
-        os.path.join("$PROJECT_DIR", "external", "sources")
-    )
diff --git a/projectconf/section_env_advanced.rst b/projectconf/section_env_advanced.rst
index 49d5d8d8ed..c0d462ba12 100644
--- a/projectconf/section_env_advanced.rst
+++ b/projectconf/section_env_advanced.rst
@@ -93,7 +93,7 @@ Type: ``FilePath`` | Multiple: ``Yes``
 
 A list of PRE and POST extra scripts.
 
-See details and examples in :ref:`projectconf_advanced_scripting` section.
+See details and examples in :ref:`scripting` section.
 
 If you plan to share these scripts with :ref:`pioremote` machine, please
 put them to :ref:`projectconf_pio_shared_dir`.
diff --git a/projectconf/section_env_build.rst b/projectconf/section_env_build.rst
index b7eacd0825..5de32ea868 100644
--- a/projectconf/section_env_build.rst
+++ b/projectconf/section_env_build.rst
@@ -189,7 +189,7 @@ Use cases:
 
 .. note::
   If you need more advanced control and would like to apply changes to
-  a PlatformIO Build System environment, please refer to :ref:`projectconf_advanced_scripting`.
+  a PlatformIO Build System environment, please refer to :ref:`scripting`.
 
 Example:
 
diff --git a/redirects.txt b/redirects.txt
index 0493c8e51f..8a126d4689 100644
--- a/redirects.txt
+++ b/redirects.txt
@@ -30,6 +30,7 @@
 /platforms/espressif.html -> /platforms/espressif8266.html
 /platforms/unit_testing.html -> /plus/unit-testing.html
 /projectconf.html -> projectconf/index.html
+/projectconf/advanced_scripting.html -> /scripting/index.html
 /projectconf/dynamic_variables.html -> /projectconf/interpolation.html
 /projectconf/section_env_board.html -> /projectconf/section_env_platform.html
 /projectconf/section_env_general.html -> /projectconf/section_env_platform.html
diff --git a/scripting/actions.rst b/scripting/actions.rst
new file mode 100644
index 0000000000..e5237f3a80
--- /dev/null
+++ b/scripting/actions.rst
@@ -0,0 +1,113 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Before/Pre and After/Post Actions
+---------------------------------
+
+The PlatformIO Build System has a rich API that allows one to attach different pre-/post
+actions (hooks) using ``env.AddPreAction(target, callback)`` or
+``env.AddPreAction(target, [callback1, callback2, ...])`` function. The first
+argument ``target`` can be the name of a target that is passed using the
+:option:`pio run --target` command, the name of a built-in target
+(buildprog, size, upload, program, buildfs, uploadfs, uploadfsota) or the path
+to a file which PlatformIO processes (ELF, HEX, BIN, OBJ, etc.).
+
+**Examples**
+
+The ``extra_script.py`` file is located in the same directory as ``platformio.ini``.
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:pre_and_post_hooks]
+    extra_scripts = post:extra_script.py
+
+``extra_script.py``:
+
+.. code-block:: python
+
+    Import("env", "projenv")
+
+    # access to global build environment
+    print(env)
+
+    # access to project build environment (is used source files in "src" folder)
+    print(projenv)
+
+    #
+    # Dump build environment (for debug purpose)
+    # print(env.Dump())
+    #
+
+    #
+    # (Optional) Do not run extra script when IDE fetches C/C++ project metadata
+    #
+    from SCons.Script import COMMAND_LINE_TARGETS
+
+    if "idedata" in COMMAND_LINE_TARGETS:
+        env.Exit(0)
+
+    #
+    # Change build flags in runtime
+    #
+    env.ProcessUnFlags("-DVECT_TAB_ADDR")
+    env.Append(CPPDEFINES=("VECT_TAB_ADDR", 0x123456789))
+
+    #
+    # Upload actions
+    #
+
+    def before_upload(source, target, env):
+        print("before_upload")
+        # do some actions
+
+        # call Node.JS or other script
+        env.Execute("node --version")
+
+
+    def after_upload(source, target, env):
+        print("after_upload")
+        # do some actions
+
+    print("Current build targets", map(str, BUILD_TARGETS))
+
+    env.AddPreAction("upload", before_upload)
+    env.AddPostAction("upload", after_upload)
+
+    #
+    # Custom actions when building program/firmware
+    #
+
+    env.AddPreAction("buildprog", callback...)
+    env.AddPostAction("buildprog", callback...)
+
+    #
+    # Custom actions for specific files/objects
+    #
+
+    env.AddPreAction("$BUILD_DIR/${PROGNAME}.elf", [callback1, callback2,...])
+    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex", callback...)
+
+    # custom action before building SPIFFS image. For example, compress HTML, etc.
+    env.AddPreAction("$BUILD_DIR/spiffs.bin", callback...)
+
+    # custom action for project's main.cpp
+    env.AddPostAction("$BUILD_DIR/src/main.cpp.o", callback...)
+
+    # Custom HEX from ELF
+    env.AddPostAction(
+        "$BUILD_DIR/${PROGNAME}.elf",
+        env.VerboseAction(" ".join([
+            "$OBJCOPY", "-O", "ihex", "-R", ".eeprom",
+            "$BUILD_DIR/${PROGNAME}.elf", "$BUILD_DIR/${PROGNAME}.hex"
+        ]), "Building $BUILD_DIR/${PROGNAME}.hex")
+    )
diff --git a/scripting/construction_environments.rst b/scripting/construction_environments.rst
new file mode 100644
index 0000000000..62fe5b21c1
--- /dev/null
+++ b/scripting/construction_environments.rst
@@ -0,0 +1,86 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Construction Environments
+-------------------------
+
+The PlatformIO Build System uses two built-in construction environments
+to process each project:
+
+* ``env``, ``Import("env")`` - the global construction environment used
+  for the :ref:`platforms` and :ref:`frameworks` build scripts, upload tools,
+  :ref:`ldf`, and other internal operations
+* ``projenv``, ``Import("projenv")`` - the isolated construction environment
+  used for processing the project source code in :ref:`projectconf_pio_src_dir`.
+  Please note that any :ref:`projectconf_src_build_flags` specified in
+  :ref:`projectconf` will be passed to ``projenv`` and not to ``env``.
+
+
+.. warning::
+  1. ``projenv`` is available only for POST-type scripts
+  2. Flags passed to ``env`` using PRE-type script will affect ``projenv`` too.
+
+``my_pre_extra_script.py``:
+
+.. code-block:: python
+
+    Import("env")
+
+    # access to global construction environment
+    print(env)
+
+    # Dump construction environment (for debug purpose)
+    print(env.Dump())
+
+    # append extra flags to global build environment
+    # which later will be used to build:
+    # - project source code
+    # - frameworks
+    # - dependent libraries
+    env.Append(CPPDEFINES=[
+      "MACRO_1_NAME",
+      ("MACRO_2_NAME", "MACRO_2_VALUE")
+    ])
+
+
+``my_post_extra_script.py``:
+
+.. code-block:: python
+
+    Import("env", "projenv")
+
+    # access to global construction environment
+    print(env)
+
+    # access to project construction environment
+    print(projenv)
+
+    # Dump construction environments (for debug purpose)
+    print(env.Dump())
+    print(projenv.Dump())
+
+    # append extra flags to global build environment
+    # which later will be used to build:
+    # - frameworks
+    # - dependent libraries
+    env.Append(CPPDEFINES=[
+      "MACRO_1_NAME",
+      ("MACRO_2_NAME", "MACRO_2_VALUE")
+    ])
+
+    # append extra flags to only project build environment
+    projenv.Append(CPPDEFINES=[
+      "PROJECT_EXTRA_MACRO_1_NAME",
+      ("ROJECT_EXTRA_MACRO_2_NAME", "ROJECT_EXTRA_MACRO_2_VALUE")
+    ])
+
+See examples below how to import construction environments and modify existing
+data or add new.
\ No newline at end of file
diff --git a/scripting/custom_targets.rst b/scripting/custom_targets.rst
new file mode 100644
index 0000000000..78eeed9efc
--- /dev/null
+++ b/scripting/custom_targets.rst
@@ -0,0 +1,179 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _scripting_custom_targets:
+
+Custom Targets
+--------------
+
+.. versionadded:: 5.0
+
+PlatformIO allows you to declare unlimited number of the custom targets. There are a
+lot of use cases for them:
+
+- Pre/Post processing based on a dependent sources (other target, source file, etc.)
+- Command launcher with own arguments
+- Launch command with custom options declared in :ref:`projectconf`
+- Python callback as a target (use the power of Python interpreter and PlatformIO Build API).
+
+A custom target can be processed using :option:`pio run --target` option and
+you can list them via :option:`pio run --list-targets` command.
+
+Build System API
+~~~~~~~~~~~~~~~~
+
+.. code-block:: python
+
+    Import("env")
+
+    env.AddCustomTarget(
+        name,
+        dependencies,
+        actions,
+        title=None,
+        description=None,
+        always_build=True
+    )
+
+
+``AddCustomTarget`` arguments:
+
+:name:
+    A name of target. ASCII chars (a-z, 0-9, _, -) are recommended. Good names are
+    "gen_headers", "program_bitstream", etc.
+
+:dependencies:
+    A list of dependencies that should be built BEFORE target will be launched. It is
+    possible pass multiple dependencies as a Python list ``["dep1", dep_target_2]``.
+    If a target does not have dependencies, ``None`` should be passed.
+
+:actions:
+    A list of actions to call on a target. It is possible to pass multiple actions as
+    a Python list ``["python --version", my_calback]``.
+
+:title:
+    A title of a target. It will be printed when using :ref:`piocore` or :ref:`pioide`.
+    We recommend to keep a title very short, 1-2 words.
+
+:description:
+    The same as a ``title`` argument but allows you to provide detailed explanation
+    what target does.
+
+:always_build:
+    If there are declared ``dependencies`` and they are already built, this target
+    will not be called if ``always_build=False``. A default value is
+    ``always_build=True`` and means always building/calling target.
+
+
+Examples
+~~~~~~~~
+
+Command shortcut
+^^^^^^^^^^^^^^^^
+
+Create a custom ``node`` target (alias) which will print a NodeJS version
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:myenv]
+    platform = ...
+    ...
+    extra_scripts = extra_script.py
+
+``extra_script.py``:
+
+.. code-block:: python
+
+    Import("env")
+
+    # Single action/command per 1 target
+    env.AddCustomTarget("sysenv", None, 'python -c "import os; print(os.environ)"')
+
+    # Multiple actions
+    env.AddCustomTarget(
+        name="pioenv",
+        dependencies=None,
+        actions=[
+            "pio --version",
+            "python --version"
+        ],
+        title="Core Env",
+        description="Show PlatformIO Core and Python versions"
+    )
+
+
+Now, run ``pio run --target sysenv`` or ``pio run -t pioenv`` (short version).
+
+Dependent target
+^^^^^^^^^^^^^^^^
+
+Sometimes you need to run a command which depends on another target (file,
+firmware, etc). Let's create an ``ota`` target and declare command which will
+depend on a project firmware. If a build process successes, declared command
+will be run.
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:myenv]
+    platform = ...
+    ...
+    extra_scripts = extra_script.py
+
+
+``extra_script.py``:
+
+.. code-block:: python
+
+    Import("env")
+
+    env.AddCustomTarget(
+        "ota",
+        "$BUILD_DIR/${PROGNAME}.elf",
+        "ota_script --firmware-path $SOURCE"
+    )
+
+
+Now, run ``pio run -t ota``.
+
+Target with options
+^^^^^^^^^^^^^^^^^^^
+
+Let's create a simple ``ping`` target and process it with
+``pio run --target ping`` command:
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:env_custom_target]
+    platform = ...
+    ...
+    extra_scripts = extra_script.py
+    custom_ping_host = google.com
+
+``extra_script.py``:
+
+.. code-block:: python
+
+    Import("env")
+
+    host = env.GetProjectOption("custom_ping_host")
+
+    def mytarget_callback(*args, **kwargs):
+        print("Hello PlatformIO!")
+        env.Execute("ping " + host)
+
+
+    env.AddCustomTarget("ping", None, mytarget_callback)
diff --git a/scripting/examples/custom_debug_flags.rst b/scripting/examples/custom_debug_flags.rst
new file mode 100644
index 0000000000..42f72dfc14
--- /dev/null
+++ b/scripting/examples/custom_debug_flags.rst
@@ -0,0 +1,43 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Custom debug flags
+~~~~~~~~~~~~~~~~~~
+
+PlatformIO removes all debug/optimization flags before a debug session or when
+:ref:`build_configurations` is set to ``debug`` and overrides them with
+``-0g -g2 -ggdb2`` for ``ASFLAGS``, ``CCFLAGS``, and ``LINKFLAGS`` build
+scopes.
+
+An extra script allows us to override PlatformIO's default behavior and declare
+custom flags. See example below where we override ``-Og`` with ``-O0``:
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:teensy31]
+    platform = teensy
+    board = teensy31
+    framework = arduino
+    extra_scripts = custom_debug_flags.py
+
+``custom_debug_flags.py``:
+
+.. code-block:: python
+
+    Import("env")
+
+    if env.GetBuildType() == "debug":
+       for scope in ("ASFLAGS", "CCFLAGS", "LINKFLAGS"):
+          for i, flag in enumerate(env[scope]):
+             if flag == "-Og":
+                env[scope][i] = "-O0"
\ No newline at end of file
diff --git a/scripting/examples/custom_program_name.rst b/scripting/examples/custom_program_name.rst
new file mode 100644
index 0000000000..b1744cb794
--- /dev/null
+++ b/scripting/examples/custom_program_name.rst
@@ -0,0 +1,39 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Custom firmware/program name
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sometimes is useful to have a different firmware/program name in
+:ref:`projectconf_pio_build_dir`.
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:env_custom_prog_name]
+    platform = espressif8266
+    board = nodemcuv2
+    framework = arduino
+    build_flags = -D VERSION=13
+    extra_scripts = pre:extra_script.py
+
+``extra_script.py``:
+
+.. code-block:: python
+
+    Import("env")
+
+    my_flags = env.ParseFlags(env['BUILD_FLAGS'])
+    defines = {k: v for (k, v) in my_flags.get("CPPDEFINES")}
+    # print(defines)
+
+    env.Replace(PROGNAME="firmware_%s" % defines.get("VERSION"))
\ No newline at end of file
diff --git a/scripting/examples/custom_upload_tool.rst b/scripting/examples/custom_upload_tool.rst
new file mode 100644
index 0000000000..9a69fb30c0
--- /dev/null
+++ b/scripting/examples/custom_upload_tool.rst
@@ -0,0 +1,108 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Custom upload tool
+~~~~~~~~~~~~~~~~~~
+
+You can override default upload command of development platform using extra
+script. There is the common environment variable ``UPLOADCMD`` which PlatformIO
+Build System will handle when you :ref:`pio run -t upload <cmd_run>`.
+
+Please note that some development platforms can have more than 1 upload command.
+For example, :ref:`platform_atmelavr` has ``UPLOADHEXCMD``
+(firmware) and ``UPLOADEEPCMD`` (EEPROM data).
+
+See examples below:
+
+**Template**
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:my_custom_upload_tool]
+    platform = ...
+    ; place it into the root of project or use full path
+    extra_scripts = extra_script.py
+    upload_protocol = custom
+    ; each flag in a new line
+    upload_flags =
+      -arg1
+      -arg2
+      -argN
+
+``extra_script.py`` (place it near ``platformio.ini``):
+
+.. code-block:: python
+
+    Import("env")
+
+    # please keep $SOURCE variable, it will be replaced with a path to firmware
+
+    # Generic
+    env.Replace(
+        UPLOADER="executable or path to executable",
+        UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCE"
+    )
+
+    # In-line command with arguments
+    env.Replace(
+        UPLOADCMD="executable -arg1 -arg2 $SOURCE"
+    )
+
+    # Python callback
+    def on_upload(source, target, env):
+        print(source, target)
+        firmware_path = str(source[0])
+        # do something
+        env.Execute("executable arg1 arg2")
+
+    env.Replace(UPLOADCMD=on_upload)
+
+
+**Custom openOCD command**
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:disco_f407vg]
+    platform = ststm32
+    board = disco_f407vg
+    framework = mbed
+
+    extra_scripts = extra_script.py
+    upload_protocol = custom
+    ; each flag in a new line
+    upload_flags =
+        -f
+        scripts/interface/stlink.cfg
+        -f
+        scripts/target/stm32f4x.cfg
+
+``extra_script.py`` (place it near ``platformio.ini``):
+
+.. code-block:: python
+
+    Import("env")
+
+    platform = env.PioPlatform()
+
+    env.Prepend(
+        UPLOADERFLAGS=["-s", platform.get_package_dir("tool-openocd") or ""]
+    )
+    env.Append(
+        UPLOADERFLAGS=["-c", "program {{$SOURCE}} verify reset; shutdown"]
+    )
+    env.Replace(
+        UPLOADER="openocd",
+        UPLOADCMD="$UPLOADER $UPLOADERFLAGS"
+    )
\ No newline at end of file
diff --git a/scripting/examples/external_sources.rst b/scripting/examples/external_sources.rst
new file mode 100644
index 0000000000..ef239b19aa
--- /dev/null
+++ b/scripting/examples/external_sources.rst
@@ -0,0 +1,41 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Build external sources
+^^^^^^^^^^^^^^^^^^^^^^
+
+If your project depends on some arbitrary source files that are located outside of the
+usual source directory :ref:`projectconf_pio_src_dir` then you can use a preliminary
+extra script to add them to the build process. A typical situation when this approach
+may be useful is when a project depends on pregenerated files in a temporary folder.
+Here is a typical configuration with an extra_script that instructs PlatformIO to build
+all sources in an external folder:
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:my_env]
+    platform = ...
+    extra_scripts = pre:extra_script.py
+
+``extra_script.py`` (place it near ``platformio.ini``):
+
+.. code-block:: python
+
+    import os
+
+    Import("env")
+
+    env.BuildSources(
+        os.path.join("$BUILD_DIR", "external", "build"),
+        os.path.join("$PROJECT_DIR", "external", "sources")
+    )
\ No newline at end of file
diff --git a/scripting/examples/extra_linker_flags.rst b/scripting/examples/extra_linker_flags.rst
new file mode 100644
index 0000000000..e991168fdc
--- /dev/null
+++ b/scripting/examples/extra_linker_flags.rst
@@ -0,0 +1,45 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Extra linker flags without ``-Wl,`` prefix
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sometimes you need to pass extra flags to GCC linker without ``Wl,``. You could
+use :ref:`projectconf_build_flags` option but it will not work. PlatformIO
+will not parse these flags to ``LINKFLAGS`` scope. In this case, simple
+extra script will help:
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:env_extra_link_flags]
+    platform = windows_x86
+    extra_scripts = extra_script.py
+
+``extra_script.py`` (place it near ``platformio.ini``):
+
+.. code-block:: python
+
+    Import("env")
+
+    #
+    # Dump build environment (for debug)
+    # print(env.Dump())
+    #
+
+    env.Append(
+      LINKFLAGS=[
+          "-static",
+          "-static-libgcc",
+          "-static-libstdc++"
+      ]
+    )
diff --git a/scripting/examples/extra_python_packages.rst b/scripting/examples/extra_python_packages.rst
new file mode 100644
index 0000000000..82c6b77227
--- /dev/null
+++ b/scripting/examples/extra_python_packages.rst
@@ -0,0 +1,42 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Extra Python packages
+~~~~~~~~~~~~~~~~~~~~~
+
+If your project or library depends on the extra Python packages, you can use extra script to
+install them into the same virtual environment where :ref:`piocore` is installed.
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:my_env]
+    platform = ...
+    extra_scripts = extra_script.py
+
+``extra_script.py`` (place it near ``platformio.ini``):
+
+.. code-block:: python
+
+    Import("env")
+
+    # List installed packages
+    env.Execute("$PYTHONEXE -m pip list")
+
+    # Install custom packages from the PyPi registry
+    env.Execute("$PYTHONEXE -m pip install pkg1 pkg2")
+
+    # Install missed package
+    try:
+    	import some_package
+    except ImportError:
+    	env.Execute("$PYTHONEXE -m pip install some_package")
\ No newline at end of file
diff --git a/scripting/examples/index.rst b/scripting/examples/index.rst
new file mode 100644
index 0000000000..0241b748ac
--- /dev/null
+++ b/scripting/examples/index.rst
@@ -0,0 +1,31 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Scripting Examples
+------------------
+
+The best examples are `PlatformIO development platforms <https://github.com/topics/platformio-platform>`__.
+Please check ``builder`` folder for the main and framework scripts.
+
+.. toctree::
+    :maxdepth: 2
+
+    platformio_ini_custom_options
+    split_build_flags
+    extra_linker_flags
+    custom_upload_tool
+    upload_to_cloud
+    custom_program_name
+    override_package_files
+    override_board_configuration
+    custom_debug_flags
+    extra_python_packages
+    external_sources
diff --git a/scripting/examples/override_board_configuration.rst b/scripting/examples/override_board_configuration.rst
new file mode 100644
index 0000000000..fb360971c3
--- /dev/null
+++ b/scripting/examples/override_board_configuration.rst
@@ -0,0 +1,46 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Override board configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+PlatformIO allows one to override some basic options (integer or string values)
+using :ref:`projectconf_board_more_options` in :ref:`projectconf`.
+Sometimes you need to do complex changes to default board manifest and
+extra PRE scripting work well here. See example below how to override default
+hardware VID/PIDs.
+
+.. warning::
+    Due to a technical limitation these board changes will not work for
+    :ref:`cmd_device_monitor` command.
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:uno]
+    platform = atmelavr
+    board = uno
+    framework = arduino
+    extra_scripts = pre:custon_hwids.py
+
+``custon_hwids.py``:
+
+.. code-block:: python
+
+    Import("env")
+
+    board_config = env.BoardConfig()
+    # should be array of VID:PID pairs
+    board_config.update("build.hwids", [
+      ["0x2341", "0x0243"],  # 1st pair
+      ["0x2A03", "0x0043"].  # 2nd pair, etc.
+    ])
\ No newline at end of file
diff --git a/scripting/examples/override_package_files.rst b/scripting/examples/override_package_files.rst
new file mode 100644
index 0000000000..3fe6c83884
--- /dev/null
+++ b/scripting/examples/override_package_files.rst
@@ -0,0 +1,99 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Override package files
+~~~~~~~~~~~~~~~~~~~~~~
+
+PlatformIO Package Manager automatically installs pre-built packages
+(:ref:`frameworks`, toolchains, libraries) required by development
+:ref:`platforms` and build process. Sometimes you need to override original
+files with own versions: configure custom GPIO, do changes to built-in LD
+scripts, or some patching to installed library dependency.
+
+The simplest way is using `Diff and Patch technique <https://linuxacademy.com/blog/linux/introduction-using-diff-and-patch/>`_. How does it work?
+
+1. Modify original source files
+2. Generate patches
+3. Apply patches via PlatformIO extra script before build process.
+
+**Example**
+
+We need to patch the original ``standard/pins_arduino.h`` variant from
+:ref:`framework_arduino` framework and add extra macro ``#define PIN_A8   (99)``.
+Let's duplicate ``standard/pins_arduino.h`` and apply changes. Generate a
+patch file and place it into ``patches`` folder located in the root of a project:
+
+.. code-block:: shell
+
+    diff ~/.platformio/packages/framework-arduinoavr/variants/standard/pins_arduino.h /tmp/pins_arduino_modified.h > /path/to/platformio/project/patches/1-framework-arduinoavr-add-pin-a8.patch
+
+The result of ``1-framework-arduinoavr-add-pin-a8.patch``:
+
+.. code-block:: diff
+
+    63a64
+    > #define PIN_A8   (99)
+    112c113
+    < // 14-21 PA0-PA7 works
+    ---
+    > // 14-21 PA0-PA7 works
+
+Using extra scripting we can apply patching before a build process. The final
+result of :ref:`projectconf` and "PRE" extra script named ``apply_patches.py``:
+
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:uno]
+    platform = atmelavr
+    board = uno
+    framework = arduino
+    extra_scripts = pre:apply_patches.py
+
+``apply_patches.py``:
+
+.. code-block:: python
+
+    from os.path import join, isfile
+
+    Import("env")
+
+    FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoavr")
+    patchflag_path = join(FRAMEWORK_DIR, ".patching-done")
+
+    # patch file only if we didn't do it before
+    if not isfile(join(FRAMEWORK_DIR, ".patching-done")):
+        original_file = join(FRAMEWORK_DIR, "variants", "standard", "pins_arduino.h")
+        patched_file = join("patches", "1-framework-arduinoavr-add-pin-a8.patch")
+
+        assert isfile(original_file) and isfile(patched_file)
+
+        env.Execute("patch %s %s" % (original_file, patched_file))
+        # env.Execute("touch " + patchflag_path)
+
+
+        def _touch(path):
+            with open(path, "w") as fp:
+                fp.write("")
+
+        env.Execute(lambda *args, **kwargs: _touch(patchflag_path))
+
+
+Please note that this example will work on a system where a ``patch`` tool
+is available. For Windows OS, you can use ``patch`` and ``diff`` tools
+provided by `Git client utility <https://git-scm.com/>`__
+(located inside installation directory).
+
+If you need to make it more independent to the operating system,
+please replace the ``patch`` with a multi-platform
+`python-patch <https://github.com/techtonik/python-patch>`_ script.
\ No newline at end of file
diff --git a/scripting/examples/platformio_ini_custom_options.rst b/scripting/examples/platformio_ini_custom_options.rst
new file mode 100644
index 0000000000..b191b3a89b
--- /dev/null
+++ b/scripting/examples/platformio_ini_custom_options.rst
@@ -0,0 +1,61 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Custom options in ``platformio.ini``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+PlatformIO allows you extending project configuration with own data. You can read
+these values later using `ProjectConfig API <https://github.com/platformio/platformio-core/blob/develop/platformio/project/config.py>`__:
+
+:``ProjectConfig::get(section, option, default=None)``:
+    Get an option value for the named section
+
+:``ProjectConfig::options(section)``:
+    Returns a list of the sections available
+
+:``ProjectConfig::items(section, as_dict=False)``:
+    Returns a list of "name", "value" pairs for the options in the given section or a dictionary when ``as_dict=True`` is passed
+
+:``ProjectConfig::has_section(section)``:
+    Indicates whether the named section is present in the configuration
+
+:``ProjectConfig::has_option(section, option)``:
+    If the given section exists, and contains the given option, returns ``True``; otherwise returns ``False``.
+
+PlatformIO's "ProjectConfig" is compatible with a native Python's `ConfigParser <https://docs.python.org/3/library/configparser.html>`__ API.
+
+**Example**
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [universe]
+    hello = world
+
+    [env:my_env]
+    platform = ...
+    extra_scripts = extra_script.py
+
+    custom_option1 = value1
+    custom_option2 = value2
+
+``extra_script.py``:
+
+.. code-block:: python
+
+    # "env.GetProjectOption" shortcut for the active environment
+    value1 = env.GetProjectOption("custom_option1")
+    value2 = env.GetProjectOption("custom_option2")
+
+    # Read value from other environments
+    config = env.GetProjectConfig()
+    world = config.get("universe", "hello")
\ No newline at end of file
diff --git a/scripting/examples/split_build_flags.rst b/scripting/examples/split_build_flags.rst
new file mode 100644
index 0000000000..fb6827b42e
--- /dev/null
+++ b/scripting/examples/split_build_flags.rst
@@ -0,0 +1,36 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Split C/C++ build flags
+~~~~~~~~~~~~~~~~~~~~~~~
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:my_env]
+    platform = ...
+    extra_scripts = extra_script.py
+
+``extra_script.py`` (place it near ``platformio.ini``):
+
+.. code-block:: python
+
+    Import("env")
+
+    # General options that are passed to the C and C++ compilers
+    env.Append(CCFLAGS=["flag1", "flag2"])
+
+    # General options that are passed to the C compiler (C only; not C++).
+    env.Append(CFLAGS=["flag1", "flag2"])
+
+    # General options that are passed to the C++ compiler
+    env.Append(CXXFLAGS=["flag1", "flag2"])
\ No newline at end of file
diff --git a/scripting/examples/upload_to_cloud.rst b/scripting/examples/upload_to_cloud.rst
new file mode 100644
index 0000000000..6da4e4c651
--- /dev/null
+++ b/scripting/examples/upload_to_cloud.rst
@@ -0,0 +1,15 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Upload to Cloud (OTA)
+~~~~~~~~~~~~~~~~~~~~~
+
+See project example https://github.com/platformio/bintray-secure-ota
\ No newline at end of file
diff --git a/scripting/index.rst b/scripting/index.rst
new file mode 100644
index 0000000000..5a2ffd4c43
--- /dev/null
+++ b/scripting/index.rst
@@ -0,0 +1,56 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _scripting:
+
+Advanced Scripting
+==================
+
+.. warning::
+
+  Advanced Scripting is recommended for Advanced Users and requires
+  knowledge of the Python language.
+
+.. warning::
+
+  :ref:`projectconf_dynamic_build_flags` is a highly recommended
+  alternative to advanced scripting, where you can use any programming
+  language. Also, that option is useful if you need to apply changes
+  to the project before the building/uploading process, such as:
+
+  * Macro with the latest VCS revision/tag "on-the-fly"
+  * Generate dynamic headers (``*.h``)
+  * Process media content before generating SPIFFS image
+  * Make some changes to source code or related libraries
+
+.. contents::
+
+The PlatformIO Build System allows the user to extend the build process with
+custom scripts using the Python interpreter and
+the `SCons <http://www.scons.org>`_ construction tool.
+Build flags, upload flags, targets, toolchains data and other information are
+available for modification as `SCons Construction Environments <http://www.scons.org/doc/production/HTML/scons-user.html#chap-environments>`_.
+Custom scripts are included with :ref:`projectconf_extra_scripts`
+
+.. warning::
+  You can not run or debug these scripts manually with a Python
+  interpreter. They will be loaded automatically when the
+  :ref:`cmd_run` command processes the project environment.
+
+.. toctree::
+    :maxdepth: 2
+
+    launch_types
+    construction_environments
+    actions
+    middlewares
+    custom_targets
+    Examples <examples/index>
\ No newline at end of file
diff --git a/scripting/launch_types.rst b/scripting/launch_types.rst
new file mode 100644
index 0000000000..ce7c12bea9
--- /dev/null
+++ b/scripting/launch_types.rst
@@ -0,0 +1,39 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Launch Types
+------------
+
+There are two execution orders for extra scripts:
+
+1. **PRE** - executes before the main script of :ref:`platforms`
+2. **POST** - executes after the main script of :ref:`platforms`
+
+Multiple extra scripts are allowed. Please split them via  ", "
+(comma + space) in the same line or use multi-line values.
+
+For example, in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:my_env_1]
+  platform = ...
+  ; Defaults to POST script since no prefix is used
+  extra_scripts = post_extra_script.py
+
+  [env:my_env_2]
+  platform = ...
+  extra_scripts =
+    pre:pre_extra_script.py
+    post:post_extra_script1.py
+    post_extra_script2.py
+
+This option can also be set by the global environment variable :envvar:`PLATFORMIO_EXTRA_SCRIPTS`.
diff --git a/scripting/middlewares.rst b/scripting/middlewares.rst
new file mode 100644
index 0000000000..a487a44cde
--- /dev/null
+++ b/scripting/middlewares.rst
@@ -0,0 +1,89 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Build Middlewares
+-----------------
+
+PlatformIO Build System allows you to add middleware functions that can be used for
+Build Node(Object) construction. This is very useful if you need to add custom flags
+for the specific file nodes or exclude them from a build process.
+
+There is ``env.AddBuildMiddleware(callback, pattern)`` helper which instructs
+PlatformIO Build System to call ``callback`` for each `SCons File System Node <https://scons.org/doc/latest/HTML/scons-api/SCons.Node.FS.Dir-class.html>`_
+whose path matches with `Unix shell-style "pattern" (wildcards) <https://docs.python.org/3.8/library/fnmatch.html>`_.
+
+If a ``pattern`` is omitted, the ``callback`` will be called for each File System Node
+which is added for the build process.
+
+You can add an unlimited number of build middlewares. They will be called in order of
+registration. Please note, if the first middleware ignores some File Nodes, they will
+not be passed to the next middleware in chain.
+
+**Examples**
+
+``platformio.ini``:
+
+.. code-block:: ini
+
+    [env:build_middleware]
+    extra_scripts = pre:extra_script.py
+
+``extra_script.py``:
+
+.. code-block:: python
+
+    Import("env")
+
+
+    # --- Add custom macros for the ALL files which name contains "http"
+    def extra_http_configuration(node):
+        """
+        `node.name` - a name of File System Node
+        `node.get_path()` - a relative path
+        `node.get_abspath()` - an absolute path
+        """
+
+        # do not modify node if file name does not contain "http"
+        if "http" not in node.name:
+            return node
+
+        # now, we can override ANY SCons variables (CPPDEFINES, CCFLAGS, etc.,) for the specific file
+        # pass SCons variables as extra keyword arguments to `env.Object()` function
+        # p.s: run `pio run -t envdump` to see a list with SCons variables
+
+        return env.Object(
+            node,
+            CPPDEFINES=env["CPPDEFINES"]
+            + [("HTTP_HOST", "device.local"), ("HTTP_PORT", 8080)],
+            CCFLAGS=env["CCFLAGS"] + ["-fno-builtin-printf"]
+        )
+
+    env.AddBuildMiddleware(extra_http_configuration)
+
+
+    # --- Replace some file from a build process with another
+
+    def replace_node_with_another(node):
+        return env.File("path/to/patched/RtosTimer.cpp")
+
+    env.AddBuildMiddleware(
+        replace_node_with_another,
+        "framework-mbed/rtos/RtosTimer.cpp"
+    )
+
+
+    # --- Skip assembly *.S files from build process
+
+    def skip_asm_from_build(node):
+        # to ignore file from a build process, just return None
+        return None
+
+    env.AddBuildMiddleware(skip_asm_from_build, "*.S")
\ No newline at end of file

From 3a7407adaaab363cc05ea301c4647cdcefa53507 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 5 Jan 2022 15:00:25 +0200
Subject: [PATCH 06/17] Update "platformio.ini" examples

---
 projectconf/examples.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/projectconf/examples.rst b/projectconf/examples.rst
index 508c8f8178..4f526fb663 100644
--- a/projectconf/examples.rst
+++ b/projectconf/examples.rst
@@ -21,7 +21,8 @@ Examples
 Community project examples with ``platformio.ini``:
 
 - `MarlinFirmware/Marlin <https://github.com/MarlinFirmware/Marlin>`_
-- `xoseperez/espurna <https://github.com/xoseperez/espurna/tree/dev/code>`_
 - `esphome/esphome <https://github.com/esphome/esphome>`_
+- `arendst/tasmota <https://github.com/arendst/tasmota/>`_
+- `xoseperez/espurna <https://github.com/xoseperez/espurna/tree/dev/code>`_
 - `cyberman54/ESP32-Paxcounter <https://github.com/cyberman54/ESP32-Paxcounter>`_
 - `1technophile/OpenMQTTGateway <https://github.com/1technophile/OpenMQTTGateway>`_

From c41beac9185aa3a0435272fcdff9d49829b608b9 Mon Sep 17 00:00:00 2001
From: Normen Hansen <normen667@gmail.com>
Date: Sat, 8 Jan 2022 13:32:01 +0100
Subject: [PATCH 07/17] add info about vim-pio (#227)

---
 integration/ide/vim.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration/ide/vim.rst b/integration/ide/vim.rst
index ef329a70a4..98c006946f 100644
--- a/integration/ide/vim.rst
+++ b/integration/ide/vim.rst
@@ -46,6 +46,7 @@ Recommended bundles:
 
 * `C/C++/ObjC language server supporting cross references, hierarchies, completion and semantic highlighting <https://github.com/MaskRay/ccls>`_
 * `Async language server protocol plugin for vim and neovim <https://github.com/prabirshrestha/vim-lsp>`_
+* `"vim-pio" Plugin <https://github.com/normen/vim-pio>`_
 * `"Neomake-PlatformIO" Plugin <https://github.com/coddingtonbear/neomake-platformio>`_
 
 Put to the project directory ``Makefile`` wrapper with contents:

From e4e01d4e3c598d9456ef556b56f0b4903feda1ca Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 11 Jan 2022 14:11:18 +0200
Subject: [PATCH 08/17] Remove icons from navbar

---
 _templates/navbar.html   | 15 +++++++--------
 _templates/versions.html |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/_templates/navbar.html b/_templates/navbar.html
index b73230f2e9..db674de55f 100644
--- a/_templates/navbar.html
+++ b/_templates/navbar.html
@@ -15,7 +15,7 @@
       <div>\
         <ul class="nav navbar-nav">\
           <li class="dropdown">\
-            <a role="button" data-target="#" href="https://platformio.org/platformio-ide" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-rocket fa-lg"></i>Get Started<span class="caret"></span>\
+            <a role="button" data-target="#" href="https://platformio.org/platformio-ide" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Get Started<span class="caret"></span>\
             </a>\
             <ul class="dropdown-menu" role="menu">\
               <li role="menuitem"><a href="https://docs.platformio.org/page/what-is-platformio.html"><i class="fa fa-heart"></i>What is PlatformIO?</a></li>\
@@ -30,8 +30,7 @@
             </ul>\
           </li>\
           <li class="dropdown">\
-            <a role="button" data-target="#" href="https://docs.platformio.org/page/plus/pio-remote.html" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-lightbulb-o fa-lg"></i>\
-              Solutions<span class="caret"></span>\
+            <a role="button" data-target="#" href="https://docs.platformio.org/page/plus/pio-remote.html" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Solutions<span class="caret"></span>\
             </a>\
             <ul class="dropdown-menu" role="menu">\
               <li role="menuitem"><a href="https://platformio.org/platformio-ide"><i class="fa fa-cube"></i>PlatformIO IDE</a></li>\
@@ -49,13 +48,13 @@
               <li role="menuitem"><a href="https://docs.platformio.org/page/ci/index.html"><i class="fa fa-refresh"></i>Continuous Integration</a></li>\
             </ul>\
           </li>\
-          <li><a href="https://registry.platformio.org/"><i class="fa fa-code fa-lg"></i>Registry<sup class="badge"><small>NEW</small></sup></a></li>\
+          <li><a href="https://registry.platformio.org/">Registry<sup class="badge"><small>NEW</small></sup></a></li>\
         </ul>\
         <ul class="nav navbar-nav navbar-right">\
-          <li class="active"><a href="https://docs.platformio.org"><i class="fa fa-book fa-lg"></i>Docs</a></li>\
-          <li><a href="https://community.platformio.org/"><i class="fa fa-comments-o fa-lg"></i>Community</a></li>\
-          <li><a href="https://platformio.org/support"><i class="fa fa-question-circle fa-lg"></i>Support</a></li>\
-          <li class="nav-pio-tech"><a href="https://piolabs.com/"><i class="fa fa-heart-o fa-lg"></i>TECHNOLOGY</a></li>\
+          <li class="active"><a href="https://docs.platformio.org">Docs</a></li>\
+          <li><a href="https://community.platformio.org/">Community</a></li>\
+          <li><a href="https://platformio.org/support">Support</a></li>\
+          <li class="nav-pio-tech"><a href="https://piolabs.com/"><i class="fa fa-rocket fa-lg"></i> FOR BUSINESS</a></li>\
         </ul>\
       </div>\
     </nav>\
diff --git a/_templates/versions.html b/_templates/versions.html
index 12cfe1788f..69bbb91434 100644
--- a/_templates/versions.html
+++ b/_templates/versions.html
@@ -15,8 +15,8 @@
     </dl>
     <dl>
       <dt>{{ _('On Github') }}</dt>
-        <dd><a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}"> {{ _('View') }}</a></dd>
-        <dd><a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/edit/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}"> {{ _('Edit') }}</a></dd>
+        <dd><a href="https://{{ github_host|default('github.com') }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}"> {{ _('View') }}</a></dd>
+        <dd><a href="https://{{ github_host|default('github.com') }}/{{ github_user }}/{{ github_repo }}/edit/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}"> {{ _('Edit') }}</a></dd>
     </dl>
     <dl>
       <dt>{{ _('Search') }}</dt>

From 3567dbd90929ff9b42f63295920c945fb145f924 Mon Sep 17 00:00:00 2001
From: Ted van den Brink <ted@digistate.nl>
Date: Wed, 12 Jan 2022 12:31:48 +0100
Subject: [PATCH 09/17] Update .travis.yml definitions (#228)

For newer Travis requirements.
---
 integration/ci/travis.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/integration/ci/travis.rst b/integration/ci/travis.rst
index fdfb99770d..f77e6f17ee 100644
--- a/integration/ci/travis.rst
+++ b/integration/ci/travis.rst
@@ -199,12 +199,13 @@ Examples
 
 .. code-block:: yaml
 
+    os: linux
+    dist: focal
     language: python
     python:
         - "3.9"
 
     # Cache PlatformIO packages using Travis CI container-based infrastructure
-    sudo: false
     cache:
         directories:
             - "~/.platformio"
@@ -238,12 +239,13 @@ Examples
 
 .. code-block:: yaml
 
+    os: linux
+    dist: focal
     language: python
     python:
         - "3.9"
 
     # Cache PlatformIO packages using Travis CI container-based infrastructure
-    sudo: false
     cache:
         directories:
             - "~/.platformio"
@@ -274,12 +276,13 @@ Examples
 
 .. code-block:: yaml
 
+    os: linux
+    dist: focal
     language: python
     python:
         - "3.9"
 
     # Cache PlatformIO packages using Travis CI container-based infrastructure
-    sudo: false
     cache:
         directories:
             - "~/.platformio"
@@ -313,12 +316,13 @@ Examples
 
 .. code-block:: yaml
 
+    os: linux
+    dist: focal
     language: python
     python:
         - "3.9"
 
     # Cache PlatformIO packages using Travis CI container-based infrastructure
-    sudo: false
     cache:
         directories:
             - "~/.platformio"

From c8148aeb2b7fa04d0dab5787889b3ed53507c6c2 Mon Sep 17 00:00:00 2001
From: Valerii Koval <valeros@users.noreply.github.com>
Date: Mon, 24 Jan 2022 12:22:13 +0200
Subject: [PATCH 10/17] Clarify the usage of "board_build.f_cpu" option

Resolve #230
---
 projectconf/section_env_platform.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/projectconf/section_env_platform.rst b/projectconf/section_env_platform.rst
index 1d973d5dc9..1ace0e5eb8 100644
--- a/projectconf/section_env_platform.rst
+++ b/projectconf/section_env_platform.rst
@@ -157,8 +157,12 @@ format of this option is ``C-like long integer`` value with ``L`` suffix. The
 1 Hertz is equal to ``1L``, then 16 MHz (Mega Hertz) is equal to ``16000000L``.
 
 The full list of ``board_build.f_cpu`` for the popular embedded platforms you can
-find in *Boards* section of :ref:`platforms`. See "Frequency" column. You can
-overclock a board by specifying a ``board_build.f_cpu`` value other than the default.
+find in *Boards* section of :ref:`platforms`. See "Frequency" column.
+
+.. note::
+    This option doesn't make any changes to real clock settings on hardware. You should
+    specify a ``board_build.f_cpu`` value  if you have changed a target's clock frequency
+    so that the underlying software will be configured accordingly to match the change.
 
 .. _projectconf_board_build.ldscript:
 

From ebbd4409120f006a0c169c088e2ff237622a4689 Mon Sep 17 00:00:00 2001
From: Matt Montag <matt.montag@gmail.com>
Date: Mon, 24 Jan 2022 07:37:59 -0800
Subject: [PATCH 11/17] Update installation.rst (#231)

Use $HOME instead of ~ (tilde) for home directory in PATH environment variable.
This can manifest in behavior such as https://community.platformio.org/t/pio-home-cant-find-platformio/25617.

See more at https://stackoverflow.com/a/11587382/264970.
---
 core/installation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/installation.rst b/core/installation.rst
index 4e31cc1c1f..2d8d973c55 100644
--- a/core/installation.rst
+++ b/core/installation.rst
@@ -234,7 +234,7 @@ If you use Bash as your default shell, you can do it by editing either
 
 .. code-block:: shell
 
-    export PATH=$PATH:~/.platformio/penv/bin
+    export PATH=$PATH:$HOME/.platformio/penv/bin
 
 If you use Zsh, you can either edit ``~/.zprofile`` and add the code above, or
 for supporting both, Bash and Zsh, you can first edit ``~/.profile`` and add

From 920ac922028b140ebe9a91b1c8e07c7d838c5069 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 28 Jan 2022 14:23:56 +0200
Subject: [PATCH 12/17] Sync dev-platforms

---
 .../cubecell_capsule_solar_sensor.rst         |   4 +-
 boards/atmelmegaavr/ATtiny1624.rst            |  79 +++++
 boards/atmelmegaavr/ATtiny1626.rst            |  79 +++++
 boards/atmelmegaavr/ATtiny1627.rst            |  79 +++++
 boards/atmelmegaavr/ATtiny3224.rst            |  79 +++++
 boards/atmelmegaavr/ATtiny3226.rst            |  79 +++++
 boards/atmelmegaavr/ATtiny3227.rst            |  79 +++++
 boards/atmelmegaavr/ATtiny424.rst             |  79 +++++
 boards/atmelmegaavr/ATtiny426.rst             |  79 +++++
 boards/atmelmegaavr/ATtiny427.rst             |  79 +++++
 boards/atmelmegaavr/ATtiny824.rst             |  79 +++++
 boards/atmelmegaavr/ATtiny826.rst             |  79 +++++
 boards/atmelmegaavr/ATtiny827.rst             |  79 +++++
 boards/atmelmegaavr/AVR128DA28.rst            |  79 +++++
 boards/atmelmegaavr/AVR128DA32.rst            |  79 +++++
 boards/atmelmegaavr/AVR128DA48.rst            |  79 +++++
 boards/atmelmegaavr/AVR128DA64.rst            |  79 +++++
 boards/atmelmegaavr/AVR128DB28.rst            |  79 +++++
 boards/atmelmegaavr/AVR128DB32.rst            |  79 +++++
 boards/atmelmegaavr/AVR128DB48.rst            |  79 +++++
 boards/atmelmegaavr/AVR128DB64.rst            |  79 +++++
 boards/atmelmegaavr/AVR32DA28.rst             |  79 +++++
 boards/atmelmegaavr/AVR32DA32.rst             |  79 +++++
 boards/atmelmegaavr/AVR32DA48.rst             |  79 +++++
 boards/atmelmegaavr/AVR32DB28.rst             |  79 +++++
 boards/atmelmegaavr/AVR32DB32.rst             |  79 +++++
 boards/atmelmegaavr/AVR32DB48.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DA28.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DA32.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DA48.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DA64.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DB28.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DB32.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DB48.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DB64.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DD14.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DD20.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DD28.rst             |  79 +++++
 boards/atmelmegaavr/AVR64DD32.rst             |  79 +++++
 boards/atmelmegaavr/curiosity_nano_da.rst     |  79 +++++
 boards/atmelmegaavr/curiosity_nano_db.rst     |  79 +++++
 boards/espressif32/esp32-s2-franzininho.rst   | 153 +++++++++
 boards/espressif32/lionbit.rst                | 156 +++++++++
 boards/index.rst                              |  42 +++
 boards/nordicnrf52/96b_nitrogen.rst           |   2 +-
 boards/nordicnrf52/adafruit_clue_nrf52840.rst |   2 +-
 boards/nordicnrf52/adafruit_cplaynrf52840.rst |   2 +-
 .../nordicnrf52/adafruit_feather_nrf52832.rst |   2 +-
 .../nordicnrf52/adafruit_feather_nrf52840.rst |   2 +-
 .../adafruit_feather_nrf52840_sense.rst       |   2 +-
 .../adafruit_itsybitsy_nrf52840.rst           |   2 +-
 .../adafruit_ledglasses_nrf52840.rst          |   2 +-
 .../nordicnrf52/adafruit_metro_nrf52840.rst   |   2 +-
 boards/nordicnrf52/bbcmicrobit_v2.rst         |   2 +-
 boards/nordicnrf52/bluey.rst                  |   2 +-
 boards/nordicnrf52/delta_dfbm_nq620.rst       |   2 +-
 boards/nordicnrf52/dwm1001_dev.rst            |   2 +-
 boards/nordicnrf52/electronut_blip.rst        |   2 +-
 boards/nordicnrf52/electronut_papyr.rst       |   2 +-
 boards/nordicnrf52/hackaBLE.rst               |   2 +-
 boards/nordicnrf52/holyiot_yj16019.rst        |   2 +-
 boards/nordicnrf52/laird_bl652_dvk.rst        |   2 +-
 boards/nordicnrf52/laird_bl653_dvk.rst        |   2 +-
 boards/nordicnrf52/laird_bl654_dvk.rst        |   2 +-
 boards/nordicnrf52/laird_pinnacle_100_dvk.rst |   2 +-
 boards/nordicnrf52/nano33ble.rst              |   2 +-
 boards/nordicnrf52/nicla_sense_me.rst         |   2 +-
 boards/nordicnrf52/nrf52832_mdk.rst           |   2 +-
 boards/nordicnrf52/nrf52833_dk.rst            |   2 +-
 boards/nordicnrf52/nrf52840_dk.rst            |   2 +-
 boards/nordicnrf52/nrf52840_dk_adafruit.rst   |   2 +-
 boards/nordicnrf52/nrf52840_mdk.rst           |   2 +-
 boards/nordicnrf52/nrf52_dk.rst               |   2 +-
 boards/nordicnrf52/particle_argon.rst         |   2 +-
 boards/nordicnrf52/particle_boron.rst         |   2 +-
 boards/nordicnrf52/particle_xenon.rst         |   2 +-
 boards/nordicnrf52/raytac_mdbt50q_rx.rst      |   2 +-
 boards/nordicnrf52/redbear_blenano2.rst       |   2 +-
 boards/nordicnrf52/redbear_blend2.rst         |   2 +-
 boards/nordicnrf52/reel_board.rst             |   2 +-
 boards/nordicnrf52/reel_board_v2.rst          |   2 +-
 boards/nordicnrf52/ruuvitag.rst               |   2 +-
 boards/nordicnrf52/sdt52832b.rst              |   2 +-
 boards/nordicnrf52/stct_nrf52_minidev.rst     |   2 +-
 boards/nordicnrf52/thingy_52.rst              |   2 +-
 .../nordicnrf52/ublox_bmd345eval_nrf52840.rst |   2 +-
 boards/nordicnrf52/ublox_evk_nina_b1.rst      |   2 +-
 boards/nordicnrf52/vbluno52.rst               |   2 +-
 boards/raspberrypi/nanorp2040connect.rst      |   2 +-
 boards/raspberrypi/pico.rst                   |   2 +-
 boards/teensy/teensy40.rst                    |   5 +-
 boards/teensy/teensy41.rst                    |   5 +-
 frameworks/arduino.rst                        | 313 +++++++++++++++++-
 frameworks/espidf.rst                         |  54 +++
 frameworks/logicromsdk.rst                    |   4 +-
 frameworks/mbed.rst                           |   2 +-
 frameworks/zephyr.rst                         |  46 ++-
 platforms/asrmicro650x.rst                    |   2 +-
 platforms/atmelmegaavr.rst                    | 243 ++++++++++++++
 platforms/espressif32.rst                     |  48 +++
 platforms/nordicnrf52.rst                     |   2 +-
 platforms/raspberrypi.rst                     |   2 +-
 platforms/teensy.rst                          |  20 ++
 plus/debug-tools/blackmagic.rst               |   2 +-
 plus/debug-tools/cmsis-dap.rst                |   4 +-
 plus/debug-tools/esp-prog.rst                 |  14 +
 plus/debug-tools/iot-bus-jtag.rst             |  14 +
 plus/debug-tools/jlink.rst                    |  18 +-
 plus/debug-tools/minimodule.rst               |  14 +
 plus/debug-tools/olimex-arm-usb-ocd-h.rst     |  14 +
 plus/debug-tools/olimex-arm-usb-ocd.rst       |  14 +
 plus/debug-tools/olimex-arm-usb-tiny-h.rst    |  14 +
 plus/debug-tools/olimex-jtag-tiny.rst         |  14 +
 plus/debug-tools/raspberrypi-swd.rst          |   2 +-
 plus/debug-tools/stlink.rst                   |   2 +-
 plus/debug-tools/tumpa.rst                    |  14 +
 plus/debugging.rst                            |  46 ++-
 117 files changed, 4470 insertions(+), 69 deletions(-)
 create mode 100644 boards/atmelmegaavr/ATtiny1624.rst
 create mode 100644 boards/atmelmegaavr/ATtiny1626.rst
 create mode 100644 boards/atmelmegaavr/ATtiny1627.rst
 create mode 100644 boards/atmelmegaavr/ATtiny3224.rst
 create mode 100644 boards/atmelmegaavr/ATtiny3226.rst
 create mode 100644 boards/atmelmegaavr/ATtiny3227.rst
 create mode 100644 boards/atmelmegaavr/ATtiny424.rst
 create mode 100644 boards/atmelmegaavr/ATtiny426.rst
 create mode 100644 boards/atmelmegaavr/ATtiny427.rst
 create mode 100644 boards/atmelmegaavr/ATtiny824.rst
 create mode 100644 boards/atmelmegaavr/ATtiny826.rst
 create mode 100644 boards/atmelmegaavr/ATtiny827.rst
 create mode 100644 boards/atmelmegaavr/AVR128DA28.rst
 create mode 100644 boards/atmelmegaavr/AVR128DA32.rst
 create mode 100644 boards/atmelmegaavr/AVR128DA48.rst
 create mode 100644 boards/atmelmegaavr/AVR128DA64.rst
 create mode 100644 boards/atmelmegaavr/AVR128DB28.rst
 create mode 100644 boards/atmelmegaavr/AVR128DB32.rst
 create mode 100644 boards/atmelmegaavr/AVR128DB48.rst
 create mode 100644 boards/atmelmegaavr/AVR128DB64.rst
 create mode 100644 boards/atmelmegaavr/AVR32DA28.rst
 create mode 100644 boards/atmelmegaavr/AVR32DA32.rst
 create mode 100644 boards/atmelmegaavr/AVR32DA48.rst
 create mode 100644 boards/atmelmegaavr/AVR32DB28.rst
 create mode 100644 boards/atmelmegaavr/AVR32DB32.rst
 create mode 100644 boards/atmelmegaavr/AVR32DB48.rst
 create mode 100644 boards/atmelmegaavr/AVR64DA28.rst
 create mode 100644 boards/atmelmegaavr/AVR64DA32.rst
 create mode 100644 boards/atmelmegaavr/AVR64DA48.rst
 create mode 100644 boards/atmelmegaavr/AVR64DA64.rst
 create mode 100644 boards/atmelmegaavr/AVR64DB28.rst
 create mode 100644 boards/atmelmegaavr/AVR64DB32.rst
 create mode 100644 boards/atmelmegaavr/AVR64DB48.rst
 create mode 100644 boards/atmelmegaavr/AVR64DB64.rst
 create mode 100644 boards/atmelmegaavr/AVR64DD14.rst
 create mode 100644 boards/atmelmegaavr/AVR64DD20.rst
 create mode 100644 boards/atmelmegaavr/AVR64DD28.rst
 create mode 100644 boards/atmelmegaavr/AVR64DD32.rst
 create mode 100644 boards/atmelmegaavr/curiosity_nano_da.rst
 create mode 100644 boards/atmelmegaavr/curiosity_nano_db.rst
 create mode 100644 boards/espressif32/esp32-s2-franzininho.rst
 create mode 100644 boards/espressif32/lionbit.rst

diff --git a/boards/asrmicro650x/cubecell_capsule_solar_sensor.rst b/boards/asrmicro650x/cubecell_capsule_solar_sensor.rst
index c0d144334f..5367c4b8db 100644
--- a/boards/asrmicro650x/cubecell_capsule_solar_sensor.rst
+++ b/boards/asrmicro650x/cubecell_capsule_solar_sensor.rst
@@ -24,7 +24,7 @@ Platform :ref:`platform_asrmicro650x`: ASR Microelectronics ASR650x series is hi
 .. list-table::
 
   * - **Microcontroller**
-    - ASR6502
+    - ASR6051
   * - **Frequency**
     - 48MHz
   * - **Flash**
@@ -58,7 +58,7 @@ board manifest `cubecell_capsule_solar_sensor.json <https://github.com/HelTecAut
   board = cubecell_capsule_solar_sensor
 
   ; change microcontroller
-  board_build.mcu = asr6502
+  board_build.mcu = asr6051
 
   ; change MCU frequency
   board_build.f_cpu = 48000000L
diff --git a/boards/atmelmegaavr/ATtiny1624.rst b/boards/atmelmegaavr/ATtiny1624.rst
new file mode 100644
index 0000000000..04b23db9bf
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny1624.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny1624:
+
+ATtiny1624
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY1624
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 16KB
+  * - **RAM**
+    - 2KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY1624?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny1624`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny1624]
+  platform = atmelmegaavr
+  board = ATtiny1624
+
+You can override default ATtiny1624 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny1624.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny1624.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny1624]
+  platform = atmelmegaavr
+  board = ATtiny1624
+
+  ; change microcontroller
+  board_build.mcu = attiny1624
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny1624 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny1626.rst b/boards/atmelmegaavr/ATtiny1626.rst
new file mode 100644
index 0000000000..70e95dae98
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny1626.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny1626:
+
+ATtiny1626
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY1626
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 16KB
+  * - **RAM**
+    - 2KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY1626?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny1626`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny1626]
+  platform = atmelmegaavr
+  board = ATtiny1626
+
+You can override default ATtiny1626 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny1626.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny1626.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny1626]
+  platform = atmelmegaavr
+  board = ATtiny1626
+
+  ; change microcontroller
+  board_build.mcu = attiny1626
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny1626 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny1627.rst b/boards/atmelmegaavr/ATtiny1627.rst
new file mode 100644
index 0000000000..a808dc7c03
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny1627.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny1627:
+
+ATtiny1627
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY1627
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 16KB
+  * - **RAM**
+    - 2KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY1627?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny1627`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny1627]
+  platform = atmelmegaavr
+  board = ATtiny1627
+
+You can override default ATtiny1627 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny1627.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny1627.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny1627]
+  platform = atmelmegaavr
+  board = ATtiny1627
+
+  ; change microcontroller
+  board_build.mcu = attiny1627
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny1627 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny3224.rst b/boards/atmelmegaavr/ATtiny3224.rst
new file mode 100644
index 0000000000..8692be2b29
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny3224.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny3224:
+
+ATtiny3224
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY3224
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 3KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY3224?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny3224`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny3224]
+  platform = atmelmegaavr
+  board = ATtiny3224
+
+You can override default ATtiny3224 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny3224.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny3224.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny3224]
+  platform = atmelmegaavr
+  board = ATtiny3224
+
+  ; change microcontroller
+  board_build.mcu = attiny3224
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny3224 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny3226.rst b/boards/atmelmegaavr/ATtiny3226.rst
new file mode 100644
index 0000000000..28c7037424
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny3226.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny3226:
+
+ATtiny3226
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY3226
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 3KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY3226?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny3226`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny3226]
+  platform = atmelmegaavr
+  board = ATtiny3226
+
+You can override default ATtiny3226 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny3226.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny3226.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny3226]
+  platform = atmelmegaavr
+  board = ATtiny3226
+
+  ; change microcontroller
+  board_build.mcu = attiny3226
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny3226 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny3227.rst b/boards/atmelmegaavr/ATtiny3227.rst
new file mode 100644
index 0000000000..05163e841e
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny3227.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny3227:
+
+ATtiny3227
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY3227
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 3KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY3227?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny3227`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny3227]
+  platform = atmelmegaavr
+  board = ATtiny3227
+
+You can override default ATtiny3227 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny3227.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny3227.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny3227]
+  platform = atmelmegaavr
+  board = ATtiny3227
+
+  ; change microcontroller
+  board_build.mcu = attiny3227
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny3227 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny424.rst b/boards/atmelmegaavr/ATtiny424.rst
new file mode 100644
index 0000000000..34d036384e
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny424.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny424:
+
+ATtiny424
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY424
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 4KB
+  * - **RAM**
+    - 512B
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY424?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny424`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny424]
+  platform = atmelmegaavr
+  board = ATtiny424
+
+You can override default ATtiny424 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny424.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny424.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny424]
+  platform = atmelmegaavr
+  board = ATtiny424
+
+  ; change microcontroller
+  board_build.mcu = attiny424
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny424 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny426.rst b/boards/atmelmegaavr/ATtiny426.rst
new file mode 100644
index 0000000000..ae519ce532
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny426.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny426:
+
+ATtiny426
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY426
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 4KB
+  * - **RAM**
+    - 512B
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY426?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny426`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny426]
+  platform = atmelmegaavr
+  board = ATtiny426
+
+You can override default ATtiny426 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny426.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny426.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny426]
+  platform = atmelmegaavr
+  board = ATtiny426
+
+  ; change microcontroller
+  board_build.mcu = attiny426
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny426 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny427.rst b/boards/atmelmegaavr/ATtiny427.rst
new file mode 100644
index 0000000000..9f2c63a33f
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny427.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny427:
+
+ATtiny427
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY427
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 4KB
+  * - **RAM**
+    - 512B
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY427?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny427`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny427]
+  platform = atmelmegaavr
+  board = ATtiny427
+
+You can override default ATtiny427 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny427.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny427.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny427]
+  platform = atmelmegaavr
+  board = ATtiny427
+
+  ; change microcontroller
+  board_build.mcu = attiny427
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny427 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny824.rst b/boards/atmelmegaavr/ATtiny824.rst
new file mode 100644
index 0000000000..c668fd505f
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny824.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny824:
+
+ATtiny824
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY824
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 8KB
+  * - **RAM**
+    - 1KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY824?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny824`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny824]
+  platform = atmelmegaavr
+  board = ATtiny824
+
+You can override default ATtiny824 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny824.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny824.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny824]
+  platform = atmelmegaavr
+  board = ATtiny824
+
+  ; change microcontroller
+  board_build.mcu = attiny824
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny824 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny826.rst b/boards/atmelmegaavr/ATtiny826.rst
new file mode 100644
index 0000000000..02fed1c5fe
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny826.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny826:
+
+ATtiny826
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY826
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 8KB
+  * - **RAM**
+    - 1KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY826?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny826`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny826]
+  platform = atmelmegaavr
+  board = ATtiny826
+
+You can override default ATtiny826 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny826.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny826.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny826]
+  platform = atmelmegaavr
+  board = ATtiny826
+
+  ; change microcontroller
+  board_build.mcu = attiny826
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny826 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny827.rst b/boards/atmelmegaavr/ATtiny827.rst
new file mode 100644
index 0000000000..7fc22dc56e
--- /dev/null
+++ b/boards/atmelmegaavr/ATtiny827.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_ATtiny827:
+
+ATtiny827
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ATTINY827
+  * - **Frequency**
+    - 16MHz
+  * - **Flash**
+    - 8KB
+  * - **RAM**
+    - 1KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY827?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``ATtiny827`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:ATtiny827]
+  platform = atmelmegaavr
+  board = ATtiny827
+
+You can override default ATtiny827 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `ATtiny827.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny827.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:ATtiny827]
+  platform = atmelmegaavr
+  board = ATtiny827
+
+  ; change microcontroller
+  board_build.mcu = attiny827
+
+  ; change MCU frequency
+  board_build.f_cpu = 16000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support ATtiny827 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DA28.rst b/boards/atmelmegaavr/AVR128DA28.rst
new file mode 100644
index 0000000000..29966d2c12
--- /dev/null
+++ b/boards/atmelmegaavr/AVR128DA28.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR128DA28:
+
+AVR128DA28
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DA28
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DA28?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR128DA28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR128DA28]
+  platform = atmelmegaavr
+  board = AVR128DA28
+
+You can override default AVR128DA28 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR128DA28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DA28.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR128DA28]
+  platform = atmelmegaavr
+  board = AVR128DA28
+
+  ; change microcontroller
+  board_build.mcu = avr128da28
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR128DA28 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DA32.rst b/boards/atmelmegaavr/AVR128DA32.rst
new file mode 100644
index 0000000000..266338a5b7
--- /dev/null
+++ b/boards/atmelmegaavr/AVR128DA32.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR128DA32:
+
+AVR128DA32
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DA32
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DA32?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR128DA32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR128DA32]
+  platform = atmelmegaavr
+  board = AVR128DA32
+
+You can override default AVR128DA32 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR128DA32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DA32.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR128DA32]
+  platform = atmelmegaavr
+  board = AVR128DA32
+
+  ; change microcontroller
+  board_build.mcu = avr128da32
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR128DA32 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DA48.rst b/boards/atmelmegaavr/AVR128DA48.rst
new file mode 100644
index 0000000000..034d018f92
--- /dev/null
+++ b/boards/atmelmegaavr/AVR128DA48.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR128DA48:
+
+AVR128DA48
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DA48
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DA48?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR128DA48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR128DA48]
+  platform = atmelmegaavr
+  board = AVR128DA48
+
+You can override default AVR128DA48 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR128DA48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DA48.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR128DA48]
+  platform = atmelmegaavr
+  board = AVR128DA48
+
+  ; change microcontroller
+  board_build.mcu = avr128da48
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR128DA48 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DA64.rst b/boards/atmelmegaavr/AVR128DA64.rst
new file mode 100644
index 0000000000..f40098d1df
--- /dev/null
+++ b/boards/atmelmegaavr/AVR128DA64.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR128DA64:
+
+AVR128DA64
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DA64
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DA64?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR128DA64`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR128DA64]
+  platform = atmelmegaavr
+  board = AVR128DA64
+
+You can override default AVR128DA64 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR128DA64.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DA64.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR128DA64]
+  platform = atmelmegaavr
+  board = AVR128DA64
+
+  ; change microcontroller
+  board_build.mcu = avr128da64
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR128DA64 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DB28.rst b/boards/atmelmegaavr/AVR128DB28.rst
new file mode 100644
index 0000000000..5b0505064f
--- /dev/null
+++ b/boards/atmelmegaavr/AVR128DB28.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR128DB28:
+
+AVR128DB28
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DB28
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DB28?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR128DB28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR128DB28]
+  platform = atmelmegaavr
+  board = AVR128DB28
+
+You can override default AVR128DB28 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR128DB28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DB28.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR128DB28]
+  platform = atmelmegaavr
+  board = AVR128DB28
+
+  ; change microcontroller
+  board_build.mcu = avr128db28
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR128DB28 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DB32.rst b/boards/atmelmegaavr/AVR128DB32.rst
new file mode 100644
index 0000000000..5360aadf5c
--- /dev/null
+++ b/boards/atmelmegaavr/AVR128DB32.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR128DB32:
+
+AVR128DB32
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DB32
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DB32?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR128DB32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR128DB32]
+  platform = atmelmegaavr
+  board = AVR128DB32
+
+You can override default AVR128DB32 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR128DB32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DB32.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR128DB32]
+  platform = atmelmegaavr
+  board = AVR128DB32
+
+  ; change microcontroller
+  board_build.mcu = avr128db32
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR128DB32 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DB48.rst b/boards/atmelmegaavr/AVR128DB48.rst
new file mode 100644
index 0000000000..777f7d1e02
--- /dev/null
+++ b/boards/atmelmegaavr/AVR128DB48.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR128DB48:
+
+AVR128DB48
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DB48
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DB48?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR128DB48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR128DB48]
+  platform = atmelmegaavr
+  board = AVR128DB48
+
+You can override default AVR128DB48 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR128DB48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DB48.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR128DB48]
+  platform = atmelmegaavr
+  board = AVR128DB48
+
+  ; change microcontroller
+  board_build.mcu = avr128db48
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR128DB48 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DB64.rst b/boards/atmelmegaavr/AVR128DB64.rst
new file mode 100644
index 0000000000..f9361adf6a
--- /dev/null
+++ b/boards/atmelmegaavr/AVR128DB64.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR128DB64:
+
+AVR128DB64
+==========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DB64
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DB64?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR128DB64`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR128DB64]
+  platform = atmelmegaavr
+  board = AVR128DB64
+
+You can override default AVR128DB64 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR128DB64.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DB64.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR128DB64]
+  platform = atmelmegaavr
+  board = AVR128DB64
+
+  ; change microcontroller
+  board_build.mcu = avr128db64
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR128DB64 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DA28.rst b/boards/atmelmegaavr/AVR32DA28.rst
new file mode 100644
index 0000000000..7c9db1d5d3
--- /dev/null
+++ b/boards/atmelmegaavr/AVR32DA28.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR32DA28:
+
+AVR32DA28
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR32DA28
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 4KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DA28?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR32DA28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR32DA28]
+  platform = atmelmegaavr
+  board = AVR32DA28
+
+You can override default AVR32DA28 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR32DA28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DA28.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR32DA28]
+  platform = atmelmegaavr
+  board = AVR32DA28
+
+  ; change microcontroller
+  board_build.mcu = avr32da28
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR32DA28 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DA32.rst b/boards/atmelmegaavr/AVR32DA32.rst
new file mode 100644
index 0000000000..bf04e95861
--- /dev/null
+++ b/boards/atmelmegaavr/AVR32DA32.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR32DA32:
+
+AVR32DA32
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR32DA32
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 4KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DA32?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR32DA32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR32DA32]
+  platform = atmelmegaavr
+  board = AVR32DA32
+
+You can override default AVR32DA32 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR32DA32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DA32.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR32DA32]
+  platform = atmelmegaavr
+  board = AVR32DA32
+
+  ; change microcontroller
+  board_build.mcu = avr32da32
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR32DA32 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DA48.rst b/boards/atmelmegaavr/AVR32DA48.rst
new file mode 100644
index 0000000000..14619e592f
--- /dev/null
+++ b/boards/atmelmegaavr/AVR32DA48.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR32DA48:
+
+AVR32DA48
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR32DA48
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 4KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DA48?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR32DA48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR32DA48]
+  platform = atmelmegaavr
+  board = AVR32DA48
+
+You can override default AVR32DA48 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR32DA48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DA48.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR32DA48]
+  platform = atmelmegaavr
+  board = AVR32DA48
+
+  ; change microcontroller
+  board_build.mcu = avr32da48
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR32DA48 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DB28.rst b/boards/atmelmegaavr/AVR32DB28.rst
new file mode 100644
index 0000000000..b24b432b96
--- /dev/null
+++ b/boards/atmelmegaavr/AVR32DB28.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR32DB28:
+
+AVR32DB28
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR32DB28
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 4KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DB28?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR32DB28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR32DB28]
+  platform = atmelmegaavr
+  board = AVR32DB28
+
+You can override default AVR32DB28 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR32DB28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DB28.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR32DB28]
+  platform = atmelmegaavr
+  board = AVR32DB28
+
+  ; change microcontroller
+  board_build.mcu = avr32db28
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR32DB28 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DB32.rst b/boards/atmelmegaavr/AVR32DB32.rst
new file mode 100644
index 0000000000..2d68f14ad1
--- /dev/null
+++ b/boards/atmelmegaavr/AVR32DB32.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR32DB32:
+
+AVR32DB32
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR32DB32
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 4KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DB32?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR32DB32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR32DB32]
+  platform = atmelmegaavr
+  board = AVR32DB32
+
+You can override default AVR32DB32 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR32DB32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DB32.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR32DB32]
+  platform = atmelmegaavr
+  board = AVR32DB32
+
+  ; change microcontroller
+  board_build.mcu = avr32db32
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR32DB32 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DB48.rst b/boards/atmelmegaavr/AVR32DB48.rst
new file mode 100644
index 0000000000..ef6721c53f
--- /dev/null
+++ b/boards/atmelmegaavr/AVR32DB48.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR32DB48:
+
+AVR32DB48
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR32DB48
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 32KB
+  * - **RAM**
+    - 4KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DB48?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR32DB48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR32DB48]
+  platform = atmelmegaavr
+  board = AVR32DB48
+
+You can override default AVR32DB48 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR32DB48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DB48.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR32DB48]
+  platform = atmelmegaavr
+  board = AVR32DB48
+
+  ; change microcontroller
+  board_build.mcu = avr32db48
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR32DB48 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DA28.rst b/boards/atmelmegaavr/AVR64DA28.rst
new file mode 100644
index 0000000000..79e8bfde1b
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DA28.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DA28:
+
+AVR64DA28
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DA28
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DA28?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DA28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DA28]
+  platform = atmelmegaavr
+  board = AVR64DA28
+
+You can override default AVR64DA28 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DA28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DA28.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DA28]
+  platform = atmelmegaavr
+  board = AVR64DA28
+
+  ; change microcontroller
+  board_build.mcu = avr64da28
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DA28 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DA32.rst b/boards/atmelmegaavr/AVR64DA32.rst
new file mode 100644
index 0000000000..85664ca3d6
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DA32.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DA32:
+
+AVR64DA32
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DA32
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DA32?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DA32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DA32]
+  platform = atmelmegaavr
+  board = AVR64DA32
+
+You can override default AVR64DA32 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DA32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DA32.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DA32]
+  platform = atmelmegaavr
+  board = AVR64DA32
+
+  ; change microcontroller
+  board_build.mcu = avr64da32
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DA32 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DA48.rst b/boards/atmelmegaavr/AVR64DA48.rst
new file mode 100644
index 0000000000..2e1c81be98
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DA48.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DA48:
+
+AVR64DA48
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DA48
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DA48?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DA48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DA48]
+  platform = atmelmegaavr
+  board = AVR64DA48
+
+You can override default AVR64DA48 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DA48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DA48.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DA48]
+  platform = atmelmegaavr
+  board = AVR64DA48
+
+  ; change microcontroller
+  board_build.mcu = avr64da48
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DA48 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DA64.rst b/boards/atmelmegaavr/AVR64DA64.rst
new file mode 100644
index 0000000000..60e12e63ee
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DA64.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DA64:
+
+AVR64DA64
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DA64
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DA64?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DA64`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DA64]
+  platform = atmelmegaavr
+  board = AVR64DA64
+
+You can override default AVR64DA64 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DA64.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DA64.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DA64]
+  platform = atmelmegaavr
+  board = AVR64DA64
+
+  ; change microcontroller
+  board_build.mcu = avr64da64
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DA64 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DB28.rst b/boards/atmelmegaavr/AVR64DB28.rst
new file mode 100644
index 0000000000..98db2a4cf6
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DB28.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DB28:
+
+AVR64DB28
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DB28
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DB28?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DB28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DB28]
+  platform = atmelmegaavr
+  board = AVR64DB28
+
+You can override default AVR64DB28 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DB28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DB28.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DB28]
+  platform = atmelmegaavr
+  board = AVR64DB28
+
+  ; change microcontroller
+  board_build.mcu = avr64db28
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DB28 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DB32.rst b/boards/atmelmegaavr/AVR64DB32.rst
new file mode 100644
index 0000000000..d0152fe9fe
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DB32.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DB32:
+
+AVR64DB32
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DB32
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DB32?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DB32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DB32]
+  platform = atmelmegaavr
+  board = AVR64DB32
+
+You can override default AVR64DB32 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DB32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DB32.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DB32]
+  platform = atmelmegaavr
+  board = AVR64DB32
+
+  ; change microcontroller
+  board_build.mcu = avr64db32
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DB32 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DB48.rst b/boards/atmelmegaavr/AVR64DB48.rst
new file mode 100644
index 0000000000..590ba0fe74
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DB48.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DB48:
+
+AVR64DB48
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DB48
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DB48?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DB48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DB48]
+  platform = atmelmegaavr
+  board = AVR64DB48
+
+You can override default AVR64DB48 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DB48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DB48.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DB48]
+  platform = atmelmegaavr
+  board = AVR64DB48
+
+  ; change microcontroller
+  board_build.mcu = avr64db48
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DB48 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DB64.rst b/boards/atmelmegaavr/AVR64DB64.rst
new file mode 100644
index 0000000000..73f6f4b0f4
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DB64.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DB64:
+
+AVR64DB64
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DB64
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DB64?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DB64`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DB64]
+  platform = atmelmegaavr
+  board = AVR64DB64
+
+You can override default AVR64DB64 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DB64.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DB64.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DB64]
+  platform = atmelmegaavr
+  board = AVR64DB64
+
+  ; change microcontroller
+  board_build.mcu = avr64db64
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DB64 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DD14.rst b/boards/atmelmegaavr/AVR64DD14.rst
new file mode 100644
index 0000000000..7b90a459df
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DD14.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DD14:
+
+AVR64DD14
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DD14
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DD14?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DD14`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DD14]
+  platform = atmelmegaavr
+  board = AVR64DD14
+
+You can override default AVR64DD14 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DD14.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DD14.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DD14]
+  platform = atmelmegaavr
+  board = AVR64DD14
+
+  ; change microcontroller
+  board_build.mcu = avr64dd14
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DD14 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DD20.rst b/boards/atmelmegaavr/AVR64DD20.rst
new file mode 100644
index 0000000000..dcb4b7aa59
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DD20.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DD20:
+
+AVR64DD20
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DD20
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DD20?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DD20`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DD20]
+  platform = atmelmegaavr
+  board = AVR64DD20
+
+You can override default AVR64DD20 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DD20.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DD20.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DD20]
+  platform = atmelmegaavr
+  board = AVR64DD20
+
+  ; change microcontroller
+  board_build.mcu = avr64dd20
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DD20 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DD28.rst b/boards/atmelmegaavr/AVR64DD28.rst
new file mode 100644
index 0000000000..ba4d66ea10
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DD28.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DD28:
+
+AVR64DD28
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DD28
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DD28?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DD28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DD28]
+  platform = atmelmegaavr
+  board = AVR64DD28
+
+You can override default AVR64DD28 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DD28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DD28.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DD28]
+  platform = atmelmegaavr
+  board = AVR64DD28
+
+  ; change microcontroller
+  board_build.mcu = avr64dd28
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DD28 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DD32.rst b/boards/atmelmegaavr/AVR64DD32.rst
new file mode 100644
index 0000000000..8edccd153a
--- /dev/null
+++ b/boards/atmelmegaavr/AVR64DD32.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_AVR64DD32:
+
+AVR64DD32
+=========
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR64DD32
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 64KB
+  * - **RAM**
+    - 8KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DD32?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``AVR64DD32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:AVR64DD32]
+  platform = atmelmegaavr
+  board = AVR64DD32
+
+You can override default AVR64DD32 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `AVR64DD32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DD32.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:AVR64DD32]
+  platform = atmelmegaavr
+  board = AVR64DD32
+
+  ; change microcontroller
+  board_build.mcu = avr64dd32
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support AVR64DD32 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/curiosity_nano_da.rst b/boards/atmelmegaavr/curiosity_nano_da.rst
new file mode 100644
index 0000000000..0f112a7bfd
--- /dev/null
+++ b/boards/atmelmegaavr/curiosity_nano_da.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_curiosity_nano_da:
+
+Curiosity Nano AVR128DA48
+=========================
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DA48
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/developmenttools/ProductDetails/DM164151?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``curiosity_nano_da`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:curiosity_nano_da]
+  platform = atmelmegaavr
+  board = curiosity_nano_da
+
+You can override default Curiosity Nano AVR128DA48 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `curiosity_nano_da.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/curiosity_nano_da.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:curiosity_nano_da]
+  platform = atmelmegaavr
+  board = curiosity_nano_da
+
+  ; change microcontroller
+  board_build.mcu = avr128da48
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support Curiosity Nano AVR128DA48 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/curiosity_nano_db.rst b/boards/atmelmegaavr/curiosity_nano_db.rst
new file mode 100644
index 0000000000..8707cfac78
--- /dev/null
+++ b/boards/atmelmegaavr/curiosity_nano_db.rst
@@ -0,0 +1,79 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_atmelmegaavr_curiosity_nano_db:
+
+Curiosity Nano AVR128DB48
+=========================
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - AVR128DB48
+  * - **Frequency**
+    - 24MHz
+  * - **Flash**
+    - 128KB
+  * - **RAM**
+    - 16KB
+  * - **Vendor**
+    - `Microchip <https://www.microchip.com/developmenttools/ProductDetails/EV35L43A?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``curiosity_nano_db`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:curiosity_nano_db]
+  platform = atmelmegaavr
+  board = curiosity_nano_db
+
+You can override default Curiosity Nano AVR128DB48 settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `curiosity_nano_db.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/curiosity_nano_db.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:curiosity_nano_db]
+  platform = atmelmegaavr
+  board = curiosity_nano_db
+
+  ; change microcontroller
+  board_build.mcu = avr128db48
+
+  ; change MCU frequency
+  board_build.f_cpu = 24000000L
+
+Debugging
+---------
+:ref:`piodebug` currently does not support Curiosity Nano AVR128DB48 board.
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/espressif32/esp32-s2-franzininho.rst b/boards/espressif32/esp32-s2-franzininho.rst
new file mode 100644
index 0000000000..bb8dfa1f76
--- /dev/null
+++ b/boards/espressif32/esp32-s2-franzininho.rst
@@ -0,0 +1,153 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_espressif32_esp32-s2-franzininho:
+
+Franzininho WiFi Board
+======================
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_espressif32`: Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ESP32S2
+  * - **Frequency**
+    - 240MHz
+  * - **Flash**
+    - 4MB
+  * - **RAM**
+    - 320KB
+  * - **Vendor**
+    - `Franzininho <https://github.com/Franzininho/Franzininho-WIFI?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``esp32-s2-franzininho`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:esp32-s2-franzininho]
+  platform = espressif32
+  board = esp32-s2-franzininho
+
+You can override default Franzininho WiFi Board settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `esp32-s2-franzininho.json <https://github.com/platformio/platform-espressif32/blob/master/boards/esp32-s2-franzininho.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:esp32-s2-franzininho]
+  platform = espressif32
+  board = esp32-s2-franzininho
+
+  ; change microcontroller
+  board_build.mcu = esp32s2
+
+  ; change MCU frequency
+  board_build.f_cpu = 240000000L
+
+
+Uploading
+---------
+Franzininho WiFi Board supports the following uploading protocols:
+
+* ``esp-prog``
+* ``espota``
+* ``esptool``
+* ``iot-bus-jtag``
+* ``jlink``
+* ``minimodule``
+* ``olimex-arm-usb-ocd``
+* ``olimex-arm-usb-ocd-h``
+* ``olimex-arm-usb-tiny-h``
+* ``olimex-jtag-tiny``
+* ``tumpa``
+
+Default protocol is ``esptool``
+
+You can change upload protocol using :ref:`projectconf_upload_protocol` option:
+
+.. code-block:: ini
+
+  [env:esp32-s2-franzininho]
+  platform = espressif32
+  board = esp32-s2-franzininho
+
+  upload_protocol = esptool
+
+Debugging
+---------
+
+:ref:`piodebug` - "1-click" solution for debugging with a zero configuration.
+
+.. warning::
+    You will need to install debug tool drivers depending on your system.
+    Please click on compatible debug tool below for the further
+    instructions and configuration information.
+
+You can switch between debugging :ref:`debugging_tools` using
+:ref:`projectconf_debug_tool` option in :ref:`projectconf`.
+
+Franzininho WiFi Board does not have on-board debug probe and **IS NOT READY** for debugging. You will need to use/buy one of external probe listed below.
+
+.. list-table::
+  :header-rows:  1
+
+  * - Compatible Tools
+    - On-board
+    - Default
+  * - :ref:`debugging_tool_esp-prog`
+    - 
+    - Yes
+  * - :ref:`debugging_tool_iot-bus-jtag`
+    - 
+    - 
+  * - :ref:`debugging_tool_jlink`
+    - 
+    - 
+  * - :ref:`debugging_tool_minimodule`
+    - 
+    - 
+  * - :ref:`debugging_tool_olimex-arm-usb-ocd`
+    - 
+    - 
+  * - :ref:`debugging_tool_olimex-arm-usb-ocd-h`
+    - 
+    - 
+  * - :ref:`debugging_tool_olimex-arm-usb-tiny-h`
+    - 
+    - 
+  * - :ref:`debugging_tool_olimex-jtag-tiny`
+    - 
+    - 
+  * - :ref:`debugging_tool_tumpa`
+    - 
+    - 
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_espidf`
+      - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
\ No newline at end of file
diff --git a/boards/espressif32/lionbit.rst b/boards/espressif32/lionbit.rst
new file mode 100644
index 0000000000..34d7ef822a
--- /dev/null
+++ b/boards/espressif32/lionbit.rst
@@ -0,0 +1,156 @@
+..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+.. _board_espressif32_lionbit:
+
+LionBit
+=======
+
+.. contents::
+
+Hardware
+--------
+
+Platform :ref:`platform_espressif32`: Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
+
+.. list-table::
+
+  * - **Microcontroller**
+    - ESP32
+  * - **Frequency**
+    - 240MHz
+  * - **Flash**
+    - 4MB
+  * - **RAM**
+    - 320KB
+  * - **Vendor**
+    - `Lion::Bit <http://lionbit.lk/?utm_source=platformio.org&utm_medium=docs>`__
+
+
+Configuration
+-------------
+
+Please use ``lionbit`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
+
+.. code-block:: ini
+
+  [env:lionbit]
+  platform = espressif32
+  board = lionbit
+
+You can override default LionBit settings per build environment using
+``board_***`` option, where ``***`` is a JSON object path from
+board manifest `lionbit.json <https://github.com/platformio/platform-espressif32/blob/master/boards/lionbit.json>`_. For example,
+``board_build.mcu``, ``board_build.f_cpu``, etc.
+
+.. code-block:: ini
+
+  [env:lionbit]
+  platform = espressif32
+  board = lionbit
+
+  ; change microcontroller
+  board_build.mcu = esp32
+
+  ; change MCU frequency
+  board_build.f_cpu = 240000000L
+
+
+Uploading
+---------
+LionBit supports the following uploading protocols:
+
+* ``esp-prog``
+* ``espota``
+* ``esptool``
+* ``iot-bus-jtag``
+* ``jlink``
+* ``minimodule``
+* ``olimex-arm-usb-ocd``
+* ``olimex-arm-usb-ocd-h``
+* ``olimex-arm-usb-tiny-h``
+* ``olimex-jtag-tiny``
+* ``tumpa``
+
+Default protocol is ``esptool``
+
+You can change upload protocol using :ref:`projectconf_upload_protocol` option:
+
+.. code-block:: ini
+
+  [env:lionbit]
+  platform = espressif32
+  board = lionbit
+
+  upload_protocol = esptool
+
+Debugging
+---------
+
+:ref:`piodebug` - "1-click" solution for debugging with a zero configuration.
+
+.. warning::
+    You will need to install debug tool drivers depending on your system.
+    Please click on compatible debug tool below for the further
+    instructions and configuration information.
+
+You can switch between debugging :ref:`debugging_tools` using
+:ref:`projectconf_debug_tool` option in :ref:`projectconf`.
+
+LionBit does not have on-board debug probe and **IS NOT READY** for debugging. You will need to use/buy one of external probe listed below.
+
+.. list-table::
+  :header-rows:  1
+
+  * - Compatible Tools
+    - On-board
+    - Default
+  * - :ref:`debugging_tool_esp-prog`
+    - 
+    - Yes
+  * - :ref:`debugging_tool_iot-bus-jtag`
+    - 
+    - 
+  * - :ref:`debugging_tool_jlink`
+    - 
+    - 
+  * - :ref:`debugging_tool_minimodule`
+    - 
+    - 
+  * - :ref:`debugging_tool_olimex-arm-usb-ocd`
+    - 
+    - 
+  * - :ref:`debugging_tool_olimex-arm-usb-ocd-h`
+    - 
+    - 
+  * - :ref:`debugging_tool_olimex-arm-usb-tiny-h`
+    - 
+    - 
+  * - :ref:`debugging_tool_olimex-jtag-tiny`
+    - 
+    - 
+  * - :ref:`debugging_tool_tumpa`
+    - 
+    - 
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_arduino`
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
+
+    * - :ref:`framework_espidf`
+      - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
\ No newline at end of file
diff --git a/boards/index.rst b/boards/index.rst
index 2e566b8c06..412ad16faf 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -283,12 +283,18 @@ Atmel megaAVR
     atmelmegaavr/ATtiny1614
     atmelmegaavr/ATtiny1616
     atmelmegaavr/ATtiny1617
+    atmelmegaavr/ATtiny1624
+    atmelmegaavr/ATtiny1626
+    atmelmegaavr/ATtiny1627
     atmelmegaavr/ATtiny202
     atmelmegaavr/ATtiny204
     atmelmegaavr/ATtiny212
     atmelmegaavr/ATtiny214
     atmelmegaavr/ATtiny3216
     atmelmegaavr/ATtiny3217
+    atmelmegaavr/ATtiny3224
+    atmelmegaavr/ATtiny3226
+    atmelmegaavr/ATtiny3227
     atmelmegaavr/ATtiny402
     atmelmegaavr/ATtiny404
     atmelmegaavr/ATtiny406
@@ -296,16 +302,50 @@ Atmel megaAVR
     atmelmegaavr/ATtiny414
     atmelmegaavr/ATtiny416
     atmelmegaavr/ATtiny417
+    atmelmegaavr/ATtiny424
+    atmelmegaavr/ATtiny426
+    atmelmegaavr/ATtiny427
     atmelmegaavr/ATtiny804
     atmelmegaavr/ATtiny806
     atmelmegaavr/ATtiny807
     atmelmegaavr/ATtiny814
     atmelmegaavr/ATtiny816
     atmelmegaavr/ATtiny817
+    atmelmegaavr/ATtiny824
+    atmelmegaavr/ATtiny826
+    atmelmegaavr/ATtiny827
     atmelmegaavr/avr_iot_wg
+    atmelmegaavr/AVR128DA28
+    atmelmegaavr/AVR128DA32
+    atmelmegaavr/AVR128DA48
+    atmelmegaavr/AVR128DA64
+    atmelmegaavr/AVR128DB28
+    atmelmegaavr/AVR128DB32
+    atmelmegaavr/AVR128DB48
+    atmelmegaavr/AVR128DB64
+    atmelmegaavr/AVR32DA28
+    atmelmegaavr/AVR32DA32
+    atmelmegaavr/AVR32DA48
+    atmelmegaavr/AVR32DB28
+    atmelmegaavr/AVR32DB32
+    atmelmegaavr/AVR32DB48
+    atmelmegaavr/AVR64DA28
+    atmelmegaavr/AVR64DA32
+    atmelmegaavr/AVR64DA48
+    atmelmegaavr/AVR64DA64
+    atmelmegaavr/AVR64DB28
+    atmelmegaavr/AVR64DB32
+    atmelmegaavr/AVR64DB48
+    atmelmegaavr/AVR64DB64
+    atmelmegaavr/AVR64DD14
+    atmelmegaavr/AVR64DD20
+    atmelmegaavr/AVR64DD28
+    atmelmegaavr/AVR64DD32
     atmelmegaavr/nano_every
     atmelmegaavr/uno_wifi_rev2
     atmelmegaavr/curiosity_nano_4809
+    atmelmegaavr/curiosity_nano_da
+    atmelmegaavr/curiosity_nano_db
     atmelmegaavr/xplained_pro_4809
 
 Atmel SAM
@@ -441,6 +481,7 @@ Espressif 32
     espressif32/esp32-s2-saola-1
     espressif32/firebeetle32
     espressif32/piranha_esp32
+    espressif32/esp32-s2-franzininho
     espressif32/frogboard
     espressif32/honeylemon
     espressif32/heltec_wifi_kit_32
@@ -458,6 +499,7 @@ Espressif 32
     espressif32/kits-edu
     espressif32/sensesiot_weizen
     espressif32/labplus_mpython
+    espressif32/lionbit
     espressif32/m5stack-core-esp32
     espressif32/m5stack-core2
     espressif32/m5stack-fire
diff --git a/boards/nordicnrf52/96b_nitrogen.rst b/boards/nordicnrf52/96b_nitrogen.rst
index 50f9617c01..f67274d1e5 100644
--- a/boards/nordicnrf52/96b_nitrogen.rst
+++ b/boards/nordicnrf52/96b_nitrogen.rst
@@ -19,7 +19,7 @@
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/adafruit_clue_nrf52840.rst b/boards/nordicnrf52/adafruit_clue_nrf52840.rst
index de0a8272f3..c6af0c8f17 100644
--- a/boards/nordicnrf52/adafruit_clue_nrf52840.rst
+++ b/boards/nordicnrf52/adafruit_clue_nrf52840.rst
@@ -19,7 +19,7 @@ Adafruit CLUE nRF52840
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/adafruit_cplaynrf52840.rst b/boards/nordicnrf52/adafruit_cplaynrf52840.rst
index 772d50e90a..34ec76e095 100644
--- a/boards/nordicnrf52/adafruit_cplaynrf52840.rst
+++ b/boards/nordicnrf52/adafruit_cplaynrf52840.rst
@@ -19,7 +19,7 @@ Circuit Playground Bluefruit
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/adafruit_feather_nrf52832.rst b/boards/nordicnrf52/adafruit_feather_nrf52832.rst
index 05a42b34ca..3d819e1098 100644
--- a/boards/nordicnrf52/adafruit_feather_nrf52832.rst
+++ b/boards/nordicnrf52/adafruit_feather_nrf52832.rst
@@ -19,7 +19,7 @@ Adafruit Bluefruit nRF52832 Feather
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/adafruit_feather_nrf52840.rst b/boards/nordicnrf52/adafruit_feather_nrf52840.rst
index ae5492cb00..5a07f4c3b9 100644
--- a/boards/nordicnrf52/adafruit_feather_nrf52840.rst
+++ b/boards/nordicnrf52/adafruit_feather_nrf52840.rst
@@ -19,7 +19,7 @@ Adafruit Feather nRF52840 Express
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/adafruit_feather_nrf52840_sense.rst b/boards/nordicnrf52/adafruit_feather_nrf52840_sense.rst
index dbe797b694..f08cd2fef4 100644
--- a/boards/nordicnrf52/adafruit_feather_nrf52840_sense.rst
+++ b/boards/nordicnrf52/adafruit_feather_nrf52840_sense.rst
@@ -19,7 +19,7 @@ Adafruit Feather Bluefruit Sense
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/adafruit_itsybitsy_nrf52840.rst b/boards/nordicnrf52/adafruit_itsybitsy_nrf52840.rst
index aaf5d09e05..91774df64e 100644
--- a/boards/nordicnrf52/adafruit_itsybitsy_nrf52840.rst
+++ b/boards/nordicnrf52/adafruit_itsybitsy_nrf52840.rst
@@ -19,7 +19,7 @@ ItsyBitsy nRF52840 Express
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/adafruit_ledglasses_nrf52840.rst b/boards/nordicnrf52/adafruit_ledglasses_nrf52840.rst
index 0c5a4a17e0..bd30cd11f7 100644
--- a/boards/nordicnrf52/adafruit_ledglasses_nrf52840.rst
+++ b/boards/nordicnrf52/adafruit_ledglasses_nrf52840.rst
@@ -19,7 +19,7 @@ Adafruit LED Glasses Driver nRF52840
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/adafruit_metro_nrf52840.rst b/boards/nordicnrf52/adafruit_metro_nrf52840.rst
index f52e2e2a33..1ab046e81e 100644
--- a/boards/nordicnrf52/adafruit_metro_nrf52840.rst
+++ b/boards/nordicnrf52/adafruit_metro_nrf52840.rst
@@ -19,7 +19,7 @@ Metro nRF52840 Express
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/bbcmicrobit_v2.rst b/boards/nordicnrf52/bbcmicrobit_v2.rst
index 1951653be6..4f00590db2 100644
--- a/boards/nordicnrf52/bbcmicrobit_v2.rst
+++ b/boards/nordicnrf52/bbcmicrobit_v2.rst
@@ -19,7 +19,7 @@ BBC micro:bit V2
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/bluey.rst b/boards/nordicnrf52/bluey.rst
index d9fb617783..bd64c5b848 100644
--- a/boards/nordicnrf52/bluey.rst
+++ b/boards/nordicnrf52/bluey.rst
@@ -19,7 +19,7 @@ Bluey nRF52832 IoT
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/delta_dfbm_nq620.rst b/boards/nordicnrf52/delta_dfbm_nq620.rst
index b00c53b671..fcde058dcb 100644
--- a/boards/nordicnrf52/delta_dfbm_nq620.rst
+++ b/boards/nordicnrf52/delta_dfbm_nq620.rst
@@ -19,7 +19,7 @@ Delta DFBM-NQ620
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/dwm1001_dev.rst b/boards/nordicnrf52/dwm1001_dev.rst
index 6a58b39478..441ea6acce 100644
--- a/boards/nordicnrf52/dwm1001_dev.rst
+++ b/boards/nordicnrf52/dwm1001_dev.rst
@@ -19,7 +19,7 @@ decaWave DWM1001 Module Development Board
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/electronut_blip.rst b/boards/nordicnrf52/electronut_blip.rst
index 98ea8e54ab..b1488a772f 100644
--- a/boards/nordicnrf52/electronut_blip.rst
+++ b/boards/nordicnrf52/electronut_blip.rst
@@ -19,7 +19,7 @@ ElectronutLabs Blip
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/electronut_papyr.rst b/boards/nordicnrf52/electronut_papyr.rst
index 38a4e8a432..70a28f633f 100644
--- a/boards/nordicnrf52/electronut_papyr.rst
+++ b/boards/nordicnrf52/electronut_papyr.rst
@@ -19,7 +19,7 @@ ElectronutLabs Papyr
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/hackaBLE.rst b/boards/nordicnrf52/hackaBLE.rst
index dfdf16343a..88c9da515d 100644
--- a/boards/nordicnrf52/hackaBLE.rst
+++ b/boards/nordicnrf52/hackaBLE.rst
@@ -19,7 +19,7 @@ hackaBLE
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/holyiot_yj16019.rst b/boards/nordicnrf52/holyiot_yj16019.rst
index 5b8fa15029..48c525b25f 100644
--- a/boards/nordicnrf52/holyiot_yj16019.rst
+++ b/boards/nordicnrf52/holyiot_yj16019.rst
@@ -19,7 +19,7 @@ Holyiot YJ-16019
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/laird_bl652_dvk.rst b/boards/nordicnrf52/laird_bl652_dvk.rst
index 9773a65adf..1f101c9f1e 100644
--- a/boards/nordicnrf52/laird_bl652_dvk.rst
+++ b/boards/nordicnrf52/laird_bl652_dvk.rst
@@ -19,7 +19,7 @@ BL652 Development Kit
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/laird_bl653_dvk.rst b/boards/nordicnrf52/laird_bl653_dvk.rst
index 0e721241d9..364c5b597f 100644
--- a/boards/nordicnrf52/laird_bl653_dvk.rst
+++ b/boards/nordicnrf52/laird_bl653_dvk.rst
@@ -19,7 +19,7 @@ BL653 Development Kit
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/laird_bl654_dvk.rst b/boards/nordicnrf52/laird_bl654_dvk.rst
index c3b4797e96..fac9bd7cbb 100644
--- a/boards/nordicnrf52/laird_bl654_dvk.rst
+++ b/boards/nordicnrf52/laird_bl654_dvk.rst
@@ -19,7 +19,7 @@ BL654 Development Kit
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/laird_pinnacle_100_dvk.rst b/boards/nordicnrf52/laird_pinnacle_100_dvk.rst
index d5d3dc3b7b..98a8e2981e 100644
--- a/boards/nordicnrf52/laird_pinnacle_100_dvk.rst
+++ b/boards/nordicnrf52/laird_pinnacle_100_dvk.rst
@@ -19,7 +19,7 @@ Laird Connectivity Pinnacle 100 DVK
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/nano33ble.rst b/boards/nordicnrf52/nano33ble.rst
index de661e0de6..a26155a377 100644
--- a/boards/nordicnrf52/nano33ble.rst
+++ b/boards/nordicnrf52/nano33ble.rst
@@ -19,7 +19,7 @@ Arduino Nano 33 BLE
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/nicla_sense_me.rst b/boards/nordicnrf52/nicla_sense_me.rst
index cd7133fcbc..5200144049 100644
--- a/boards/nordicnrf52/nicla_sense_me.rst
+++ b/boards/nordicnrf52/nicla_sense_me.rst
@@ -19,7 +19,7 @@ Arduino Nicla Sense ME
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/nrf52832_mdk.rst b/boards/nordicnrf52/nrf52832_mdk.rst
index 1e1b5534fb..5a49cc3dd2 100644
--- a/boards/nordicnrf52/nrf52832_mdk.rst
+++ b/boards/nordicnrf52/nrf52832_mdk.rst
@@ -19,7 +19,7 @@ Makerdiary nRF52832-MDK
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/nrf52833_dk.rst b/boards/nordicnrf52/nrf52833_dk.rst
index a1f0046158..6c2abddac3 100644
--- a/boards/nordicnrf52/nrf52833_dk.rst
+++ b/boards/nordicnrf52/nrf52833_dk.rst
@@ -19,7 +19,7 @@ Nordic nRF52833-DK
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/nrf52840_dk.rst b/boards/nordicnrf52/nrf52840_dk.rst
index b5491b1f60..6744233a80 100644
--- a/boards/nordicnrf52/nrf52840_dk.rst
+++ b/boards/nordicnrf52/nrf52840_dk.rst
@@ -19,7 +19,7 @@ Nordic nRF52840-DK
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/nrf52840_dk_adafruit.rst b/boards/nordicnrf52/nrf52840_dk_adafruit.rst
index 774fe34496..cd7f89cf7e 100644
--- a/boards/nordicnrf52/nrf52840_dk_adafruit.rst
+++ b/boards/nordicnrf52/nrf52840_dk_adafruit.rst
@@ -19,7 +19,7 @@ Nordic nRF52840-DK (Adafruit BSP)
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/nrf52840_mdk.rst b/boards/nordicnrf52/nrf52840_mdk.rst
index 6fdfa69edb..ff58650918 100644
--- a/boards/nordicnrf52/nrf52840_mdk.rst
+++ b/boards/nordicnrf52/nrf52840_mdk.rst
@@ -19,7 +19,7 @@ Makerdiary nRF52840-MDK
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/nrf52_dk.rst b/boards/nordicnrf52/nrf52_dk.rst
index 9b814cd22d..19f51e838d 100644
--- a/boards/nordicnrf52/nrf52_dk.rst
+++ b/boards/nordicnrf52/nrf52_dk.rst
@@ -19,7 +19,7 @@ Nordic nRF52-DK
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/particle_argon.rst b/boards/nordicnrf52/particle_argon.rst
index 15a83daca4..fed315a250 100644
--- a/boards/nordicnrf52/particle_argon.rst
+++ b/boards/nordicnrf52/particle_argon.rst
@@ -19,7 +19,7 @@ Particle Argon
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/particle_boron.rst b/boards/nordicnrf52/particle_boron.rst
index b0ba60c8d6..81bad9bcb4 100644
--- a/boards/nordicnrf52/particle_boron.rst
+++ b/boards/nordicnrf52/particle_boron.rst
@@ -19,7 +19,7 @@ Particle Boron
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/particle_xenon.rst b/boards/nordicnrf52/particle_xenon.rst
index 4d8f4367dd..af84c52c47 100644
--- a/boards/nordicnrf52/particle_xenon.rst
+++ b/boards/nordicnrf52/particle_xenon.rst
@@ -19,7 +19,7 @@ Particle Xenon
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/raytac_mdbt50q_rx.rst b/boards/nordicnrf52/raytac_mdbt50q_rx.rst
index e2e7a07fe5..6b458c5655 100644
--- a/boards/nordicnrf52/raytac_mdbt50q_rx.rst
+++ b/boards/nordicnrf52/raytac_mdbt50q_rx.rst
@@ -19,7 +19,7 @@ Raytac MDBT50Q-RX Dongle
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/redbear_blenano2.rst b/boards/nordicnrf52/redbear_blenano2.rst
index 1a6d7fcb6c..ef7c33e7fa 100644
--- a/boards/nordicnrf52/redbear_blenano2.rst
+++ b/boards/nordicnrf52/redbear_blenano2.rst
@@ -19,7 +19,7 @@ RedBearLab BLE Nano 2
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/redbear_blend2.rst b/boards/nordicnrf52/redbear_blend2.rst
index 1674487a92..644c5b9211 100644
--- a/boards/nordicnrf52/redbear_blend2.rst
+++ b/boards/nordicnrf52/redbear_blend2.rst
@@ -19,7 +19,7 @@ RedBearLab Blend 2
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/reel_board.rst b/boards/nordicnrf52/reel_board.rst
index 6986e6cb3b..c2c0745a9b 100644
--- a/boards/nordicnrf52/reel_board.rst
+++ b/boards/nordicnrf52/reel_board.rst
@@ -19,7 +19,7 @@ PHYTEC reel board
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/reel_board_v2.rst b/boards/nordicnrf52/reel_board_v2.rst
index e5d850a061..5939edaf11 100644
--- a/boards/nordicnrf52/reel_board_v2.rst
+++ b/boards/nordicnrf52/reel_board_v2.rst
@@ -19,7 +19,7 @@ PHYTEC reel board v2
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/ruuvitag.rst b/boards/nordicnrf52/ruuvitag.rst
index b4b7d91c44..bc68d6bb0d 100644
--- a/boards/nordicnrf52/ruuvitag.rst
+++ b/boards/nordicnrf52/ruuvitag.rst
@@ -19,7 +19,7 @@ Ruuvi Tag
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/sdt52832b.rst b/boards/nordicnrf52/sdt52832b.rst
index add6f9d365..9b802ee945 100644
--- a/boards/nordicnrf52/sdt52832b.rst
+++ b/boards/nordicnrf52/sdt52832b.rst
@@ -19,7 +19,7 @@ SDT52832B
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/stct_nrf52_minidev.rst b/boards/nordicnrf52/stct_nrf52_minidev.rst
index 3a9b9f94c6..29c8b7f08d 100644
--- a/boards/nordicnrf52/stct_nrf52_minidev.rst
+++ b/boards/nordicnrf52/stct_nrf52_minidev.rst
@@ -19,7 +19,7 @@ Taida Century nRF52 mini board
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/thingy_52.rst b/boards/nordicnrf52/thingy_52.rst
index 065213cfbf..bdc9c32862 100644
--- a/boards/nordicnrf52/thingy_52.rst
+++ b/boards/nordicnrf52/thingy_52.rst
@@ -19,7 +19,7 @@ Nordic Thingy:52 (nRF52-PCA20020)
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/ublox_bmd345eval_nrf52840.rst b/boards/nordicnrf52/ublox_bmd345eval_nrf52840.rst
index 10edee7477..30516b0f8a 100644
--- a/boards/nordicnrf52/ublox_bmd345eval_nrf52840.rst
+++ b/boards/nordicnrf52/ublox_bmd345eval_nrf52840.rst
@@ -19,7 +19,7 @@ u-blox BMD-345-EVAL
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/ublox_evk_nina_b1.rst b/boards/nordicnrf52/ublox_evk_nina_b1.rst
index 95aef93969..57aaad21dc 100644
--- a/boards/nordicnrf52/ublox_evk_nina_b1.rst
+++ b/boards/nordicnrf52/ublox_evk_nina_b1.rst
@@ -19,7 +19,7 @@ u-blox EVK-NINA-B1
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/nordicnrf52/vbluno52.rst b/boards/nordicnrf52/vbluno52.rst
index 8849a8a8cd..bad70dd241 100644
--- a/boards/nordicnrf52/vbluno52.rst
+++ b/boards/nordicnrf52/vbluno52.rst
@@ -19,7 +19,7 @@ VNG VBLUno52
 Hardware
 --------
 
-Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+Platform :ref:`platform_nordicnrf52`: The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 .. list-table::
 
diff --git a/boards/raspberrypi/nanorp2040connect.rst b/boards/raspberrypi/nanorp2040connect.rst
index 6bb5df3692..f603d3d284 100644
--- a/boards/raspberrypi/nanorp2040connect.rst
+++ b/boards/raspberrypi/nanorp2040connect.rst
@@ -19,7 +19,7 @@ Arduino Nano RP2040 Connect
 Hardware
 --------
 
-Platform :ref:`platform_raspberrypi`: RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+Platform :ref:`platform_raspberrypi`: RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
 .. list-table::
 
diff --git a/boards/raspberrypi/pico.rst b/boards/raspberrypi/pico.rst
index b45f8b17e5..afe10644ae 100644
--- a/boards/raspberrypi/pico.rst
+++ b/boards/raspberrypi/pico.rst
@@ -19,7 +19,7 @@ Raspberry Pi Pico
 Hardware
 --------
 
-Platform :ref:`platform_raspberrypi`: RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+Platform :ref:`platform_raspberrypi`: RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
 .. list-table::
 
diff --git a/boards/teensy/teensy40.rst b/boards/teensy/teensy40.rst
index 977d891d2d..75aa43e265 100644
--- a/boards/teensy/teensy40.rst
+++ b/boards/teensy/teensy40.rst
@@ -118,4 +118,7 @@ Frameworks
       - Description
 
     * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
+
+    * - :ref:`framework_zephyr`
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/teensy/teensy41.rst b/boards/teensy/teensy41.rst
index 01e42e95e1..bf975af1be 100644
--- a/boards/teensy/teensy41.rst
+++ b/boards/teensy/teensy41.rst
@@ -118,4 +118,7 @@ Frameworks
       - Description
 
     * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
+      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
+
+    * - :ref:`framework_zephyr`
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/frameworks/arduino.rst b/frameworks/arduino.rst
index 1b775ca905..c0b3fbab19 100644
--- a/frameworks/arduino.rst
+++ b/frameworks/arduino.rst
@@ -2400,6 +2400,12 @@ Please click on board name for the further details.
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_ststm32_malyanm200_f070cb`
       - :ref:`platform_ststm32`
       - STM32F070CBT6
@@ -3604,10 +3610,10 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
     * - :ref:`platform_ststm32`
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
@@ -6714,7 +6720,7 @@ Heltec
     * - :ref:`board_asrmicro650x_cubecell_capsule_solar_sensor`
       - :ref:`platform_asrmicro650x`
       - No
-      - ASR6502
+      - ASR6051
       - 48MHz
       - 128KB
       - 16KB
@@ -7272,6 +7278,27 @@ Linino
       - 28KB
       - 2.50KB
 
+Lion::Bit
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Platform
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
+
 LowPowerLab
 ~~~~~~~~~~~
 
@@ -7985,6 +8012,27 @@ Microchip
       - 16MHz
       - 16KB
       - 2KB
+    * - :ref:`board_atmelmegaavr_ATtiny1624`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY1624
+      - 16MHz
+      - 16KB
+      - 2KB
+    * - :ref:`board_atmelmegaavr_ATtiny1626`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY1626
+      - 16MHz
+      - 16KB
+      - 2KB
+    * - :ref:`board_atmelmegaavr_ATtiny1627`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY1627
+      - 16MHz
+      - 16KB
+      - 2KB
     * - :ref:`board_atmelmegaavr_ATtiny202`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8027,6 +8075,27 @@ Microchip
       - 16MHz
       - 32KB
       - 2KB
+    * - :ref:`board_atmelmegaavr_ATtiny3224`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY3224
+      - 16MHz
+      - 32KB
+      - 3KB
+    * - :ref:`board_atmelmegaavr_ATtiny3226`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY3226
+      - 16MHz
+      - 32KB
+      - 3KB
+    * - :ref:`board_atmelmegaavr_ATtiny3227`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY3227
+      - 16MHz
+      - 32KB
+      - 3KB
     * - :ref:`board_atmelmegaavr_ATtiny402`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8076,6 +8145,27 @@ Microchip
       - 16MHz
       - 4KB
       - 256B
+    * - :ref:`board_atmelmegaavr_ATtiny424`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY424
+      - 16MHz
+      - 4KB
+      - 512B
+    * - :ref:`board_atmelmegaavr_ATtiny426`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY426
+      - 16MHz
+      - 4KB
+      - 512B
+    * - :ref:`board_atmelmegaavr_ATtiny427`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY427
+      - 16MHz
+      - 4KB
+      - 512B
     * - :ref:`board_atmelmegaavr_ATtiny804`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8118,6 +8208,27 @@ Microchip
       - 16MHz
       - 8KB
       - 512B
+    * - :ref:`board_atmelmegaavr_ATtiny824`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY824
+      - 16MHz
+      - 8KB
+      - 1KB
+    * - :ref:`board_atmelmegaavr_ATtiny826`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY826
+      - 16MHz
+      - 8KB
+      - 1KB
+    * - :ref:`board_atmelmegaavr_ATtiny827`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - ATTINY827
+      - 16MHz
+      - 8KB
+      - 1KB
     * - :ref:`board_atmelmegaavr_avr_iot_wg`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8125,6 +8236,188 @@ Microchip
       - 16MHz
       - 48KB
       - 6KB
+    * - :ref:`board_atmelmegaavr_AVR128DA28`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DA28
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DA32`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DA32
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DA48`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DA48
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DA64`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DA64
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DB28`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DB28
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DB32`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DB32
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DB48`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DB48
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DB64`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DB64
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR32DA28`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR32DA28
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DA32`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR32DA32
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DA48`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR32DA48
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DB28`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR32DB28
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DB32`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR32DB32
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DB48`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR32DB48
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR64DA28`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DA28
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DA32`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DA32
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DA48`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DA48
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DA64`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DA64
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DB28`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DB28
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DB32`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DB32
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DB48`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DB48
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DB64`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DB64
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DD14`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DD14
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DD20`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DD20
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DD28`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DD28
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DD32`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR64DD32
+      - 24MHz
+      - 64KB
+      - 8KB
     * - :ref:`board_atmelmegaavr_curiosity_nano_4809`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8132,6 +8425,20 @@ Microchip
       - 16MHz
       - 48KB
       - 6KB
+    * - :ref:`board_atmelmegaavr_curiosity_nano_da`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DA48
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_curiosity_nano_db`
+      - :ref:`platform_atmelmegaavr`
+      - No
+      - AVR128DB48
+      - 24MHz
+      - 128KB
+      - 16KB
     * - :ref:`board_atmelmegaavr_xplained_pro_4809`
       - :ref:`platform_atmelmegaavr`
       - No
diff --git a/frameworks/espidf.rst b/frameworks/espidf.rst
index 28fe63114c..6fec164104 100644
--- a/frameworks/espidf.rst
+++ b/frameworks/espidf.rst
@@ -198,6 +198,12 @@ Please click on board name for the further details.
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - ESP32
@@ -246,6 +252,12 @@ Please click on board name for the further details.
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - ESP32
@@ -852,6 +864,27 @@ Fishino
       - 4MB
       - 320KB
 
+Franzininho
+~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Platform
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
+
 Fred
 ~~~~
 
@@ -1125,6 +1158,27 @@ Labplus
       - 4MB
       - 320KB
 
+Lion::Bit
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Platform
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
+
 M5Stack
 ~~~~~~~
 
diff --git a/frameworks/logicromsdk.rst b/frameworks/logicromsdk.rst
index 4725b1efee..9e1415f2c2 100644
--- a/frameworks/logicromsdk.rst
+++ b/frameworks/logicromsdk.rst
@@ -11,13 +11,13 @@
 
 .. _framework_logicromsdk:
 
-LOGICROM SDK
+Logicrom SDK
 ============
 
 :Configuration:
   :ref:`projectconf_env_framework` = ``logicromsdk``
 
-LOGICROM Software Development Kit is a unified framework for IoT development on 4G LTE (RDA8910), GSM (MT2503/MT6261) and NBIoT (MT2625) chipsets/modules.
+Logicrom Software Development Kit is a framework for Wireless IoT development on 4G LTE (RDA8910), GSM (MT2503/MT6261) and NBIoT (MT2625) chipsets/modules.
 
 For more detailed information please visit `vendor site <https://github.com/waybyte/logicromsdk?utm_source=platformio.org&utm_medium=docs>`_.
 
diff --git a/frameworks/mbed.rst b/frameworks/mbed.rst
index 0d607264ca..260865acb7 100644
--- a/frameworks/mbed.rst
+++ b/frameworks/mbed.rst
@@ -1137,7 +1137,7 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_nxpimxrt`
       - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
diff --git a/frameworks/zephyr.rst b/frameworks/zephyr.rst
index c34856d179..dd69b8c098 100644
--- a/frameworks/zephyr.rst
+++ b/frameworks/zephyr.rst
@@ -930,6 +930,18 @@ Please click on board name for the further details.
       - 48MHz
       - 256KB
       - 32KB
+    * - :ref:`board_teensy_teensy40`
+      - :ref:`platform_teensy`
+      - IMXRT1062
+      - 600MHz
+      - 1.94MB
+      - 512KB
+    * - :ref:`board_teensy_teensy41`
+      - :ref:`platform_teensy`
+      - IMXRT1062
+      - 600MHz
+      - 7.75MB
+      - 512KB
     * - :ref:`board_nordicnrf51_waveshare_ble400`
       - :ref:`platform_nordicnrf51`
       - NRF51822
@@ -962,6 +974,7 @@ Examples
 * `Zephyr RTOS for SiFive <https://github.com/platformio/platform-sifive/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
 * `Zephyr RTOS for Silicon Labs EFM32 <https://github.com/platformio/platform-siliconlabsefm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
 * `Zephyr RTOS for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for Teensy <https://github.com/platformio/platform-teensy/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
 
 Platforms
 ---------
@@ -981,7 +994,7 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_nxpimxrt`
       - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
@@ -998,6 +1011,9 @@ Platforms
     * - :ref:`platform_ststm32`
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
 
+    * - :ref:`platform_teensy`
+      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
+
 Boards
 ------
 
@@ -2322,6 +2338,34 @@ SparkFun
       - 16MB
       - 16KB
 
+Teensy
+~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Platform
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_teensy_teensy40`
+      - :ref:`platform_teensy`
+      - External
+      - IMXRT1062
+      - 600MHz
+      - 1.94MB
+      - 512KB
+    * - :ref:`board_teensy_teensy41`
+      - :ref:`platform_teensy`
+      - External
+      - IMXRT1062
+      - 600MHz
+      - 7.75MB
+      - 512KB
+
 VNG
 ~~~
 
diff --git a/platforms/asrmicro650x.rst b/platforms/asrmicro650x.rst
index 2277341e51..036ec5418e 100644
--- a/platforms/asrmicro650x.rst
+++ b/platforms/asrmicro650x.rst
@@ -142,7 +142,7 @@ Heltec
       - RAM
     * - :ref:`board_asrmicro650x_cubecell_capsule_solar_sensor`
       - No
-      - ASR6502
+      - ASR6051
       - 48MHz
       - 128KB
       - 16KB
diff --git a/platforms/atmelmegaavr.rst b/platforms/atmelmegaavr.rst
index 2597607a42..bb65c7d9ef 100644
--- a/platforms/atmelmegaavr.rst
+++ b/platforms/atmelmegaavr.rst
@@ -81,6 +81,9 @@ Packages
     * - `framework-arduino-megaavr <https://github.com/arduino/ArduinoCore-megaavr.git?utm_source=platformio.org&utm_medium=docs>`__
       - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers
 
+    * - `framework-arduino-megaavr-dxcore <https://github.com/SpenceKonde/DxCore.git?utm_source=platformio.org&utm_medium=docs>`__
+      - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers (DxCore)
+
     * - `framework-arduino-megaavr-megacorex <https://github.com/MCUdude/MegaCoreX.git?utm_source=platformio.org&utm_medium=docs>`__
       - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers (MegaCoreX)
 
@@ -248,6 +251,24 @@ Microchip
       - 16MHz
       - 16KB
       - 2KB
+    * - :ref:`board_atmelmegaavr_ATtiny1624`
+      - No
+      - ATTINY1624
+      - 16MHz
+      - 16KB
+      - 2KB
+    * - :ref:`board_atmelmegaavr_ATtiny1626`
+      - No
+      - ATTINY1626
+      - 16MHz
+      - 16KB
+      - 2KB
+    * - :ref:`board_atmelmegaavr_ATtiny1627`
+      - No
+      - ATTINY1627
+      - 16MHz
+      - 16KB
+      - 2KB
     * - :ref:`board_atmelmegaavr_ATtiny202`
       - No
       - ATTINY202
@@ -284,6 +305,24 @@ Microchip
       - 16MHz
       - 32KB
       - 2KB
+    * - :ref:`board_atmelmegaavr_ATtiny3224`
+      - No
+      - ATTINY3224
+      - 16MHz
+      - 32KB
+      - 3KB
+    * - :ref:`board_atmelmegaavr_ATtiny3226`
+      - No
+      - ATTINY3226
+      - 16MHz
+      - 32KB
+      - 3KB
+    * - :ref:`board_atmelmegaavr_ATtiny3227`
+      - No
+      - ATTINY3227
+      - 16MHz
+      - 32KB
+      - 3KB
     * - :ref:`board_atmelmegaavr_ATtiny402`
       - No
       - ATTINY402
@@ -326,6 +365,24 @@ Microchip
       - 16MHz
       - 4KB
       - 256B
+    * - :ref:`board_atmelmegaavr_ATtiny424`
+      - No
+      - ATTINY424
+      - 16MHz
+      - 4KB
+      - 512B
+    * - :ref:`board_atmelmegaavr_ATtiny426`
+      - No
+      - ATTINY426
+      - 16MHz
+      - 4KB
+      - 512B
+    * - :ref:`board_atmelmegaavr_ATtiny427`
+      - No
+      - ATTINY427
+      - 16MHz
+      - 4KB
+      - 512B
     * - :ref:`board_atmelmegaavr_ATtiny804`
       - No
       - ATTINY804
@@ -362,18 +419,204 @@ Microchip
       - 16MHz
       - 8KB
       - 512B
+    * - :ref:`board_atmelmegaavr_ATtiny824`
+      - No
+      - ATTINY824
+      - 16MHz
+      - 8KB
+      - 1KB
+    * - :ref:`board_atmelmegaavr_ATtiny826`
+      - No
+      - ATTINY826
+      - 16MHz
+      - 8KB
+      - 1KB
+    * - :ref:`board_atmelmegaavr_ATtiny827`
+      - No
+      - ATTINY827
+      - 16MHz
+      - 8KB
+      - 1KB
     * - :ref:`board_atmelmegaavr_avr_iot_wg`
       - No
       - ATMEGA4808
       - 16MHz
       - 48KB
       - 6KB
+    * - :ref:`board_atmelmegaavr_AVR128DA28`
+      - No
+      - AVR128DA28
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DA32`
+      - No
+      - AVR128DA32
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DA48`
+      - No
+      - AVR128DA48
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DA64`
+      - No
+      - AVR128DA64
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DB28`
+      - No
+      - AVR128DB28
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DB32`
+      - No
+      - AVR128DB32
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DB48`
+      - No
+      - AVR128DB48
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR128DB64`
+      - No
+      - AVR128DB64
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_AVR32DA28`
+      - No
+      - AVR32DA28
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DA32`
+      - No
+      - AVR32DA32
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DA48`
+      - No
+      - AVR32DA48
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DB28`
+      - No
+      - AVR32DB28
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DB32`
+      - No
+      - AVR32DB32
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR32DB48`
+      - No
+      - AVR32DB48
+      - 24MHz
+      - 32KB
+      - 4KB
+    * - :ref:`board_atmelmegaavr_AVR64DA28`
+      - No
+      - AVR64DA28
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DA32`
+      - No
+      - AVR64DA32
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DA48`
+      - No
+      - AVR64DA48
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DA64`
+      - No
+      - AVR64DA64
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DB28`
+      - No
+      - AVR64DB28
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DB32`
+      - No
+      - AVR64DB32
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DB48`
+      - No
+      - AVR64DB48
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DB64`
+      - No
+      - AVR64DB64
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DD14`
+      - No
+      - AVR64DD14
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DD20`
+      - No
+      - AVR64DD20
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DD28`
+      - No
+      - AVR64DD28
+      - 24MHz
+      - 64KB
+      - 8KB
+    * - :ref:`board_atmelmegaavr_AVR64DD32`
+      - No
+      - AVR64DD32
+      - 24MHz
+      - 64KB
+      - 8KB
     * - :ref:`board_atmelmegaavr_curiosity_nano_4809`
       - No
       - ATMEGA4809
       - 16MHz
       - 48KB
       - 6KB
+    * - :ref:`board_atmelmegaavr_curiosity_nano_da`
+      - No
+      - AVR128DA48
+      - 24MHz
+      - 128KB
+      - 16KB
+    * - :ref:`board_atmelmegaavr_curiosity_nano_db`
+      - No
+      - AVR128DB48
+      - 24MHz
+      - 128KB
+      - 16KB
     * - :ref:`board_atmelmegaavr_xplained_pro_4809`
       - No
       - ATMEGA4809
diff --git a/platforms/espressif32.rst b/platforms/espressif32.rst
index 98179a2f7e..0ce492fb3e 100644
--- a/platforms/espressif32.rst
+++ b/platforms/espressif32.rst
@@ -219,6 +219,11 @@ Please click on board name for the further details.
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - ESP32
       - 240MHz
@@ -264,6 +269,11 @@ Please click on board name for the further details.
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - ESP32
       - 240MHz
@@ -923,6 +933,25 @@ Fishino
       - 4MB
       - 320KB
 
+Franzininho
+~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
+
 Fred
 ~~~~
 
@@ -1187,6 +1216,25 @@ Labplus
       - 4MB
       - 320KB
 
+Lion::Bit
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_espressif32_lionbit`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
+
 M5Stack
 ~~~~~~~
 
diff --git a/platforms/nordicnrf52.rst b/platforms/nordicnrf52.rst
index c06aaef0da..7b79899071 100644
--- a/platforms/nordicnrf52.rst
+++ b/platforms/nordicnrf52.rst
@@ -17,7 +17,7 @@ Nordic nRF52
 :Configuration:
   :ref:`projectconf_env_platform` = ``nordicnrf52``
 
-The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
 For more detailed information please visit `vendor site <https://www.nordicsemi.com/Products/nRF52-Series-SoC?utm_source=platformio.org&utm_medium=docs>`_.
 
diff --git a/platforms/raspberrypi.rst b/platforms/raspberrypi.rst
index 60ea95ac2c..695e1b0885 100644
--- a/platforms/raspberrypi.rst
+++ b/platforms/raspberrypi.rst
@@ -17,7 +17,7 @@ Raspberry Pi RP2040
 :Configuration:
   :ref:`projectconf_env_platform` = ``raspberrypi``
 
-RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
 For more detailed information please visit `vendor site <https://www.raspberrypi.org/documentation/rp2040/getting-started/?utm_source=platformio.org&utm_medium=docs>`_.
 
diff --git a/platforms/teensy.rst b/platforms/teensy.rst
index 5a32889dd6..951a047f4f 100644
--- a/platforms/teensy.rst
+++ b/platforms/teensy.rst
@@ -34,11 +34,13 @@ Examples are listed from `Teensy development platform repository <https://github
 
 * `mbed-blink <https://github.com/platformio/platform-teensy/tree/master/examples/mbed-blink?utm_source=platformio.org&utm_medium=docs>`_
 * `mbed-serial <https://github.com/platformio/platform-teensy/tree/master/examples/mbed-serial?utm_source=platformio.org&utm_medium=docs>`_
+* `zephyr-blink <https://github.com/platformio/platform-teensy/tree/master/examples/zephyr-blink?utm_source=platformio.org&utm_medium=docs>`_
 * `mbed-events <https://github.com/platformio/platform-teensy/tree/master/examples/mbed-events?utm_source=platformio.org&utm_medium=docs>`_
 * `arduino-blink <https://github.com/platformio/platform-teensy/tree/master/examples/arduino-blink?utm_source=platformio.org&utm_medium=docs>`_
 * `arduino-hid-usb-mouse <https://github.com/platformio/platform-teensy/tree/master/examples/arduino-hid-usb-mouse?utm_source=platformio.org&utm_medium=docs>`_
 * `arduino-internal-libs <https://github.com/platformio/platform-teensy/tree/master/examples/arduino-internal-libs?utm_source=platformio.org&utm_medium=docs>`_
 * `mbed-dsp <https://github.com/platformio/platform-teensy/tree/master/examples/mbed-dsp?utm_source=platformio.org&utm_medium=docs>`_
+* `zephyr-synchronization <https://github.com/platformio/platform-teensy/tree/master/examples/zephyr-synchronization?utm_source=platformio.org&utm_medium=docs>`_
 
 Debugging
 ---------
@@ -162,9 +164,24 @@ Packages
     * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
+    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+      - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
+
+    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+      - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
+
+    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+      - Device tree compiler
+
+    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+      - GNU gperf is a perfect hash function generator
+
     * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
+    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+      - Ninja is a small build system with a focus on speed
+
     * - `tool-teensy <https://www.pjrc.com/teensy/loader.html?utm_source=platformio.org&utm_medium=docs>`__
       - Upload tools for Teensy boards
 
@@ -206,6 +223,9 @@ Frameworks
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
+    * - :ref:`framework_zephyr`
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
+
 Boards
 ------
 
diff --git a/plus/debug-tools/blackmagic.rst b/plus/debug-tools/blackmagic.rst
index 9b865a436f..4d03451e92 100644
--- a/plus/debug-tools/blackmagic.rst
+++ b/plus/debug-tools/blackmagic.rst
@@ -179,7 +179,7 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_nxpimxrt`
       - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
diff --git a/plus/debug-tools/cmsis-dap.rst b/plus/debug-tools/cmsis-dap.rst
index 960e19fc72..b45f6349f2 100644
--- a/plus/debug-tools/cmsis-dap.rst
+++ b/plus/debug-tools/cmsis-dap.rst
@@ -92,13 +92,13 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_nxplpc`
       - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
     * - :ref:`platform_ststm32`
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
diff --git a/plus/debug-tools/esp-prog.rst b/plus/debug-tools/esp-prog.rst
index f39301f669..c9bff02b30 100644
--- a/plus/debug-tools/esp-prog.rst
+++ b/plus/debug-tools/esp-prog.rst
@@ -295,6 +295,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - External
@@ -358,6 +365,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - External
diff --git a/plus/debug-tools/iot-bus-jtag.rst b/plus/debug-tools/iot-bus-jtag.rst
index cbf4f0411e..5fef79b1d6 100644
--- a/plus/debug-tools/iot-bus-jtag.rst
+++ b/plus/debug-tools/iot-bus-jtag.rst
@@ -299,6 +299,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - External
@@ -362,6 +369,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - External
diff --git a/plus/debug-tools/jlink.rst b/plus/debug-tools/jlink.rst
index f5e34743d3..8d75c4905f 100644
--- a/plus/debug-tools/jlink.rst
+++ b/plus/debug-tools/jlink.rst
@@ -223,7 +223,7 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_nuclei`
       - Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
@@ -235,7 +235,7 @@ Platforms
       - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
     * - :ref:`platform_shakti`
       - Shakti is an open-source initiative by the RISE group at IIT-Madras, which is not only building open source, production grade processors, but also associated components like interconnect fabrics, verification tools, storage controllers, peripheral IPs and SOC tools.
@@ -1483,6 +1483,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_freescalekinetis_frdm_k20d50m`
       - :ref:`platform_freescalekinetis`
       - On-board
@@ -1728,6 +1735,13 @@ Boards
       - 64MHz
       - 1MB
       - 256KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_ststm32_malyanm200_f070cb`
       - :ref:`platform_ststm32`
       - External
diff --git a/plus/debug-tools/minimodule.rst b/plus/debug-tools/minimodule.rst
index dbf6355b9b..81a07aad9a 100644
--- a/plus/debug-tools/minimodule.rst
+++ b/plus/debug-tools/minimodule.rst
@@ -319,6 +319,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - External
@@ -382,6 +389,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - External
diff --git a/plus/debug-tools/olimex-arm-usb-ocd-h.rst b/plus/debug-tools/olimex-arm-usb-ocd-h.rst
index 8306327ced..f7dd1189d7 100644
--- a/plus/debug-tools/olimex-arm-usb-ocd-h.rst
+++ b/plus/debug-tools/olimex-arm-usb-ocd-h.rst
@@ -339,6 +339,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - External
@@ -402,6 +409,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - External
diff --git a/plus/debug-tools/olimex-arm-usb-ocd.rst b/plus/debug-tools/olimex-arm-usb-ocd.rst
index 0795d2ae07..24da9de690 100644
--- a/plus/debug-tools/olimex-arm-usb-ocd.rst
+++ b/plus/debug-tools/olimex-arm-usb-ocd.rst
@@ -339,6 +339,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - External
@@ -402,6 +409,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - External
diff --git a/plus/debug-tools/olimex-arm-usb-tiny-h.rst b/plus/debug-tools/olimex-arm-usb-tiny-h.rst
index 0de64b3efd..c244d88692 100644
--- a/plus/debug-tools/olimex-arm-usb-tiny-h.rst
+++ b/plus/debug-tools/olimex-arm-usb-tiny-h.rst
@@ -338,6 +338,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - External
@@ -401,6 +408,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - External
diff --git a/plus/debug-tools/olimex-jtag-tiny.rst b/plus/debug-tools/olimex-jtag-tiny.rst
index ed104ac766..8c26ee110b 100644
--- a/plus/debug-tools/olimex-jtag-tiny.rst
+++ b/plus/debug-tools/olimex-jtag-tiny.rst
@@ -338,6 +338,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - External
@@ -401,6 +408,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - External
diff --git a/plus/debug-tools/raspberrypi-swd.rst b/plus/debug-tools/raspberrypi-swd.rst
index 7dd414dd6d..c21dfa9dcb 100644
--- a/plus/debug-tools/raspberrypi-swd.rst
+++ b/plus/debug-tools/raspberrypi-swd.rst
@@ -62,7 +62,7 @@ Platforms
       - Description
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
 Frameworks
 ----------
diff --git a/plus/debug-tools/stlink.rst b/plus/debug-tools/stlink.rst
index c721a41389..1b83a0809d 100644
--- a/plus/debug-tools/stlink.rst
+++ b/plus/debug-tools/stlink.rst
@@ -98,7 +98,7 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_ststm32`
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
diff --git a/plus/debug-tools/tumpa.rst b/plus/debug-tools/tumpa.rst
index 4715d22594..f4848b000c 100644
--- a/plus/debug-tools/tumpa.rst
+++ b/plus/debug-tools/tumpa.rst
@@ -349,6 +349,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_frogboard`
       - :ref:`platform_espressif32`
       - External
@@ -412,6 +419,13 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
     * - :ref:`board_espressif32_mhetesp32devkit`
       - :ref:`platform_espressif32`
       - External
diff --git a/plus/debugging.rst b/plus/debugging.rst
index 962863944b..836bde3009 100644
--- a/plus/debugging.rst
+++ b/plus/debugging.rst
@@ -197,7 +197,7 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor and are the most capable Bluetooth Smart SoCs on the market.
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_nuclei`
       - Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
@@ -212,7 +212,7 @@ Platforms
       - OpenHW Group is a not-for-profit, global organization that provides an infrastructure for hosting high quality open-source HW developments in line with industry best practices. The OpenHW CV32E40P RISC-V core is the first open-source core for high-volume chips verified with the state-of-the-art process required for high-integrity, commercial SoCs.
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
     * - :ref:`platform_riscv_gap`
       - GreenWaves GAP8 IoT application processor enables the cost-effective development, deployment and autonomous operation of intelligent sensing devices that capture, analyze, classify and act on the fusion of rich data sources such as images, sounds or vibrations.
@@ -2453,6 +2453,27 @@ FYSETC
       - 512KB
       - 128KB
 
+Franzininho
+~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Platform
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_espressif32_esp32-s2-franzininho`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32S2
+      - 240MHz
+      - 4MB
+      - 320KB
+
 Fred
 ~~~~
 
@@ -3573,6 +3594,27 @@ Linino
       - 28KB
       - 2.50KB
 
+Lion::Bit
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Platform
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_espressif32_lionbit`
+      - :ref:`platform_espressif32`
+      - External
+      - ESP32
+      - 240MHz
+      - 4MB
+      - 320KB
+
 LowPowerLab
 ~~~~~~~~~~~
 

From f4169a1cebcf94694e96b2b9085118ada7fd21ec Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 1 Feb 2022 14:50:55 +0200
Subject: [PATCH 13/17] Remove link to boards page on web site

---
 boards/index.rst                       | 5 ++---
 frameworks/arduino.rst                 | 3 +--
 frameworks/cmsis.rst                   | 3 +--
 frameworks/esp8266-nonos-sdk.rst       | 3 +--
 frameworks/esp8266-rtos-sdk.rst        | 3 +--
 frameworks/espidf.rst                  | 3 +--
 frameworks/freedom-e-sdk.rst           | 3 +--
 frameworks/freertos.rst                | 3 +--
 frameworks/gd32vf103-sdk.rst           | 3 +--
 frameworks/kendryte-freertos-sdk.rst   | 3 +--
 frameworks/kendryte-standalone-sdk.rst | 3 +--
 frameworks/libopencm3.rst              | 3 +--
 frameworks/mbed.rst                    | 3 +--
 frameworks/nuclei-sdk.rst              | 3 +--
 frameworks/pulp-os.rst                 | 3 +--
 frameworks/pulp-runtime.rst            | 3 +--
 frameworks/pulp-sdk.rst                | 3 +--
 frameworks/pumbaa.rst                  | 3 +--
 frameworks/shakti-sdk.rst              | 3 +--
 frameworks/simba.rst                   | 3 +--
 frameworks/spl.rst                     | 3 +--
 frameworks/stm32cube.rst               | 3 +--
 frameworks/wd-riscv-sdk.rst            | 3 +--
 frameworks/wiringpi.rst                | 3 +--
 frameworks/zephyr.rst                  | 3 +--
 platforms/aceinna_imu.rst              | 3 +--
 platforms/asrmicro650x.rst             | 3 +--
 platforms/atmelavr.rst                 | 3 +--
 platforms/atmelmegaavr.rst             | 3 +--
 platforms/atmelsam.rst                 | 3 +--
 platforms/chipsalliance.rst            | 3 +--
 platforms/espressif32.rst              | 3 +--
 platforms/espressif8266.rst            | 3 +--
 platforms/freescalekinetis.rst         | 3 +--
 platforms/gd32v.rst                    | 3 +--
 platforms/infineonxmc.rst              | 3 +--
 platforms/intel_arc32.rst              | 3 +--
 platforms/intel_mcs51.rst              | 3 +--
 platforms/kendryte210.rst              | 3 +--
 platforms/lattice_ice40.rst            | 3 +--
 platforms/linux_arm.rst                | 3 +--
 platforms/maxim32.rst                  | 3 +--
 platforms/microchippic32.rst           | 3 +--
 platforms/nordicnrf51.rst              | 3 +--
 platforms/nordicnrf52.rst              | 3 +--
 platforms/nuclei.rst                   | 3 +--
 platforms/nxpimxrt.rst                 | 3 +--
 platforms/nxplpc.rst                   | 3 +--
 platforms/openhw.rst                   | 3 +--
 platforms/raspberrypi.rst              | 3 +--
 platforms/riscv_gap.rst                | 3 +--
 platforms/shakti.rst                   | 3 +--
 platforms/sifive.rst                   | 3 +--
 platforms/siliconlabsefm32.rst         | 3 +--
 platforms/ststm32.rst                  | 3 +--
 platforms/ststm8.rst                   | 3 +--
 platforms/teensy.rst                   | 3 +--
 platforms/timsp430.rst                 | 3 +--
 platforms/titiva.rst                   | 3 +--
 platforms/wiznet7500.rst               | 3 +--
 60 files changed, 61 insertions(+), 121 deletions(-)

diff --git a/boards/index.rst b/boards/index.rst
index 412ad16faf..c0ce4a24f8 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -16,11 +16,10 @@ Boards
 
 Rapid Embedded Development, Continuous and IDE integration in a few
 steps with PlatformIO thanks to built-in project generator for the most
-popular embedded boards and IDE.
+popular embedded boards and IDEs.
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Aceinna IMU
diff --git a/frameworks/arduino.rst b/frameworks/arduino.rst
index c0b3fbab19..ec63e4d058 100644
--- a/frameworks/arduino.rst
+++ b/frameworks/arduino.rst
@@ -3634,8 +3634,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 4D Systems
diff --git a/frameworks/cmsis.rst b/frameworks/cmsis.rst
index 3427ed60f6..21704c5637 100644
--- a/frameworks/cmsis.rst
+++ b/frameworks/cmsis.rst
@@ -1509,8 +1509,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 1BitSquared
diff --git a/frameworks/esp8266-nonos-sdk.rst b/frameworks/esp8266-nonos-sdk.rst
index 4981c41128..b4342dc639 100644
--- a/frameworks/esp8266-nonos-sdk.rst
+++ b/frameworks/esp8266-nonos-sdk.rst
@@ -46,8 +46,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 4D Systems
diff --git a/frameworks/esp8266-rtos-sdk.rst b/frameworks/esp8266-rtos-sdk.rst
index f53c4895bf..f1ae39f0b8 100644
--- a/frameworks/esp8266-rtos-sdk.rst
+++ b/frameworks/esp8266-rtos-sdk.rst
@@ -46,8 +46,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 4D Systems
diff --git a/frameworks/espidf.rst b/frameworks/espidf.rst
index 6fec164104..edeb6f4d20 100644
--- a/frameworks/espidf.rst
+++ b/frameworks/espidf.rst
@@ -454,8 +454,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 AI Thinker
diff --git a/frameworks/freedom-e-sdk.rst b/frameworks/freedom-e-sdk.rst
index d88643fd2e..7c9b1e93ee 100644
--- a/frameworks/freedom-e-sdk.rst
+++ b/frameworks/freedom-e-sdk.rst
@@ -123,8 +123,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 SiFive
diff --git a/frameworks/freertos.rst b/frameworks/freertos.rst
index 8925e8876a..5989b5d5b5 100644
--- a/frameworks/freertos.rst
+++ b/frameworks/freertos.rst
@@ -132,8 +132,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Digilent
diff --git a/frameworks/gd32vf103-sdk.rst b/frameworks/gd32vf103-sdk.rst
index ab08983645..211c20a39b 100644
--- a/frameworks/gd32vf103-sdk.rst
+++ b/frameworks/gd32vf103-sdk.rst
@@ -111,8 +111,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 SeeedStudio
diff --git a/frameworks/kendryte-freertos-sdk.rst b/frameworks/kendryte-freertos-sdk.rst
index e76b4f073d..afc7c11be0 100644
--- a/frameworks/kendryte-freertos-sdk.rst
+++ b/frameworks/kendryte-freertos-sdk.rst
@@ -123,8 +123,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Sipeed
diff --git a/frameworks/kendryte-standalone-sdk.rst b/frameworks/kendryte-standalone-sdk.rst
index 17ce6611a4..07e7ab75cd 100644
--- a/frameworks/kendryte-standalone-sdk.rst
+++ b/frameworks/kendryte-standalone-sdk.rst
@@ -123,8 +123,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Sipeed
diff --git a/frameworks/libopencm3.rst b/frameworks/libopencm3.rst
index 602d83afd8..54b8da2285 100644
--- a/frameworks/libopencm3.rst
+++ b/frameworks/libopencm3.rst
@@ -1471,8 +1471,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 1BitSquared
diff --git a/frameworks/mbed.rst b/frameworks/mbed.rst
index 260865acb7..08cbf12205 100644
--- a/frameworks/mbed.rst
+++ b/frameworks/mbed.rst
@@ -1164,8 +1164,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 96Boards
diff --git a/frameworks/nuclei-sdk.rst b/frameworks/nuclei-sdk.rst
index 3d7b0f071b..34227a5917 100644
--- a/frameworks/nuclei-sdk.rst
+++ b/frameworks/nuclei-sdk.rst
@@ -129,8 +129,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 GigaDevice
diff --git a/frameworks/pulp-os.rst b/frameworks/pulp-os.rst
index 2eec6244d6..ec1c364c1e 100644
--- a/frameworks/pulp-os.rst
+++ b/frameworks/pulp-os.rst
@@ -92,8 +92,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 GreenWaves Technologies
diff --git a/frameworks/pulp-runtime.rst b/frameworks/pulp-runtime.rst
index 1f820a7264..184c9db411 100644
--- a/frameworks/pulp-runtime.rst
+++ b/frameworks/pulp-runtime.rst
@@ -92,8 +92,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Digilent
diff --git a/frameworks/pulp-sdk.rst b/frameworks/pulp-sdk.rst
index 5baa2b14dd..27b817a953 100644
--- a/frameworks/pulp-sdk.rst
+++ b/frameworks/pulp-sdk.rst
@@ -92,8 +92,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Digilent
diff --git a/frameworks/pumbaa.rst b/frameworks/pumbaa.rst
index 4c74d2ebc1..19f767e155 100644
--- a/frameworks/pumbaa.rst
+++ b/frameworks/pumbaa.rst
@@ -46,8 +46,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 MakerAsia
diff --git a/frameworks/shakti-sdk.rst b/frameworks/shakti-sdk.rst
index f9a7df1b6d..51a8334842 100644
--- a/frameworks/shakti-sdk.rst
+++ b/frameworks/shakti-sdk.rst
@@ -116,8 +116,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Xilinx
diff --git a/frameworks/simba.rst b/frameworks/simba.rst
index 04b8938303..c0ac06787c 100644
--- a/frameworks/simba.rst
+++ b/frameworks/simba.rst
@@ -153,8 +153,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Adafruit
diff --git a/frameworks/spl.rst b/frameworks/spl.rst
index 15aa58c0fe..2f2026c6bd 100644
--- a/frameworks/spl.rst
+++ b/frameworks/spl.rst
@@ -230,8 +230,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 1BitSquared
diff --git a/frameworks/stm32cube.rst b/frameworks/stm32cube.rst
index db85153d91..ccc6e3027b 100644
--- a/frameworks/stm32cube.rst
+++ b/frameworks/stm32cube.rst
@@ -1618,8 +1618,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 1BitSquared
diff --git a/frameworks/wd-riscv-sdk.rst b/frameworks/wd-riscv-sdk.rst
index 8c2529d578..4539ecf034 100644
--- a/frameworks/wd-riscv-sdk.rst
+++ b/frameworks/wd-riscv-sdk.rst
@@ -92,8 +92,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Digilent
diff --git a/frameworks/wiringpi.rst b/frameworks/wiringpi.rst
index fa08fa1688..1c0309ddd8 100644
--- a/frameworks/wiringpi.rst
+++ b/frameworks/wiringpi.rst
@@ -46,8 +46,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 Raspberry Pi
diff --git a/frameworks/zephyr.rst b/frameworks/zephyr.rst
index dd69b8c098..83612c4466 100644
--- a/frameworks/zephyr.rst
+++ b/frameworks/zephyr.rst
@@ -1018,8 +1018,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by horizontally.
 
 96Boards
diff --git a/platforms/aceinna_imu.rst b/platforms/aceinna_imu.rst
index c3b7871f46..3389225c63 100644
--- a/platforms/aceinna_imu.rst
+++ b/platforms/aceinna_imu.rst
@@ -197,8 +197,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/asrmicro650x.rst b/platforms/asrmicro650x.rst
index 036ec5418e..5ff3533cfd 100644
--- a/platforms/asrmicro650x.rst
+++ b/platforms/asrmicro650x.rst
@@ -123,8 +123,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/atmelavr.rst b/platforms/atmelavr.rst
index d3ea04c067..387c4c21d1 100644
--- a/platforms/atmelavr.rst
+++ b/platforms/atmelavr.rst
@@ -1035,8 +1035,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/atmelmegaavr.rst b/platforms/atmelmegaavr.rst
index bb65c7d9ef..bc7bf7ed86 100644
--- a/platforms/atmelmegaavr.rst
+++ b/platforms/atmelmegaavr.rst
@@ -125,8 +125,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/atmelsam.rst b/platforms/atmelsam.rst
index 5e72693906..eafee0e14a 100644
--- a/platforms/atmelsam.rst
+++ b/platforms/atmelsam.rst
@@ -671,8 +671,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/chipsalliance.rst b/platforms/chipsalliance.rst
index 42b33d4e72..0f91db5d36 100644
--- a/platforms/chipsalliance.rst
+++ b/platforms/chipsalliance.rst
@@ -169,8 +169,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/espressif32.rst b/platforms/espressif32.rst
index 0ce492fb3e..f4cb8fef17 100644
--- a/platforms/espressif32.rst
+++ b/platforms/espressif32.rst
@@ -563,8 +563,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/espressif8266.rst b/platforms/espressif8266.rst
index dda9808ba1..8016d4a339 100644
--- a/platforms/espressif8266.rst
+++ b/platforms/espressif8266.rst
@@ -146,8 +146,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/freescalekinetis.rst b/platforms/freescalekinetis.rst
index 3c4b8a2382..be5461115a 100644
--- a/platforms/freescalekinetis.rst
+++ b/platforms/freescalekinetis.rst
@@ -277,8 +277,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/gd32v.rst b/platforms/gd32v.rst
index c20caa48f0..7f4fd4fdcb 100644
--- a/platforms/gd32v.rst
+++ b/platforms/gd32v.rst
@@ -186,8 +186,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/infineonxmc.rst b/platforms/infineonxmc.rst
index 37f9b47fee..71875986f0 100644
--- a/platforms/infineonxmc.rst
+++ b/platforms/infineonxmc.rst
@@ -198,8 +198,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/intel_arc32.rst b/platforms/intel_arc32.rst
index acf9725d0c..510bdd4b9b 100644
--- a/platforms/intel_arc32.rst
+++ b/platforms/intel_arc32.rst
@@ -114,8 +114,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/intel_mcs51.rst b/platforms/intel_mcs51.rst
index e4ee140fd5..8321415274 100644
--- a/platforms/intel_mcs51.rst
+++ b/platforms/intel_mcs51.rst
@@ -100,8 +100,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/kendryte210.rst b/platforms/kendryte210.rst
index b4cc1fe5ff..b2c27278fc 100644
--- a/platforms/kendryte210.rst
+++ b/platforms/kendryte210.rst
@@ -199,8 +199,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/lattice_ice40.rst b/platforms/lattice_ice40.rst
index b4674ff7e4..f9e4c8b6c3 100644
--- a/platforms/lattice_ice40.rst
+++ b/platforms/lattice_ice40.rst
@@ -99,8 +99,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/linux_arm.rst b/platforms/linux_arm.rst
index c59a933b4d..dd6b96c557 100644
--- a/platforms/linux_arm.rst
+++ b/platforms/linux_arm.rst
@@ -96,8 +96,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/maxim32.rst b/platforms/maxim32.rst
index fa2eadb9d8..cd1ed74343 100644
--- a/platforms/maxim32.rst
+++ b/platforms/maxim32.rst
@@ -195,8 +195,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/microchippic32.rst b/platforms/microchippic32.rst
index 0b5bba7d5d..849395bf8a 100644
--- a/platforms/microchippic32.rst
+++ b/platforms/microchippic32.rst
@@ -113,8 +113,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/nordicnrf51.rst b/platforms/nordicnrf51.rst
index f5644774ee..ef78e08ff2 100644
--- a/platforms/nordicnrf51.rst
+++ b/platforms/nordicnrf51.rst
@@ -326,8 +326,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/nordicnrf52.rst b/platforms/nordicnrf52.rst
index 7b79899071..776fe28d3b 100644
--- a/platforms/nordicnrf52.rst
+++ b/platforms/nordicnrf52.rst
@@ -450,8 +450,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/nuclei.rst b/platforms/nuclei.rst
index a9ce68d4a6..8787887f7c 100644
--- a/platforms/nuclei.rst
+++ b/platforms/nuclei.rst
@@ -203,8 +203,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/nxpimxrt.rst b/platforms/nxpimxrt.rst
index 4360d9a3cf..69d9fe94ec 100644
--- a/platforms/nxpimxrt.rst
+++ b/platforms/nxpimxrt.rst
@@ -209,8 +209,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/nxplpc.rst b/platforms/nxplpc.rst
index 3e9658adc9..e2b8574c1c 100644
--- a/platforms/nxplpc.rst
+++ b/platforms/nxplpc.rst
@@ -339,8 +339,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/openhw.rst b/platforms/openhw.rst
index bb5bc03155..d094707fe0 100644
--- a/platforms/openhw.rst
+++ b/platforms/openhw.rst
@@ -172,8 +172,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/raspberrypi.rst b/platforms/raspberrypi.rst
index 695e1b0885..8ace941711 100644
--- a/platforms/raspberrypi.rst
+++ b/platforms/raspberrypi.rst
@@ -169,8 +169,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/riscv_gap.rst b/platforms/riscv_gap.rst
index 60f67a2368..b91bd8b34c 100644
--- a/platforms/riscv_gap.rst
+++ b/platforms/riscv_gap.rst
@@ -176,8 +176,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/shakti.rst b/platforms/shakti.rst
index 05f1908ebe..33bc5c0f0d 100644
--- a/platforms/shakti.rst
+++ b/platforms/shakti.rst
@@ -185,8 +185,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/sifive.rst b/platforms/sifive.rst
index 21187f887c..87ab23db1c 100644
--- a/platforms/sifive.rst
+++ b/platforms/sifive.rst
@@ -225,8 +225,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/siliconlabsefm32.rst b/platforms/siliconlabsefm32.rst
index 5206c12155..50c23cf96f 100644
--- a/platforms/siliconlabsefm32.rst
+++ b/platforms/siliconlabsefm32.rst
@@ -215,8 +215,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/ststm32.rst b/platforms/ststm32.rst
index ec2d1219b5..4f44fbcd41 100644
--- a/platforms/ststm32.rst
+++ b/platforms/ststm32.rst
@@ -1649,8 +1649,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/ststm8.rst b/platforms/ststm8.rst
index b8f3226b70..abf1698de4 100644
--- a/platforms/ststm8.rst
+++ b/platforms/ststm8.rst
@@ -231,8 +231,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/teensy.rst b/platforms/teensy.rst
index 951a047f4f..d4561605f4 100644
--- a/platforms/teensy.rst
+++ b/platforms/teensy.rst
@@ -230,8 +230,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/timsp430.rst b/platforms/timsp430.rst
index abf3619797..ab8dde2457 100644
--- a/platforms/timsp430.rst
+++ b/platforms/timsp430.rst
@@ -216,8 +216,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/titiva.rst b/platforms/titiva.rst
index e2e2724229..46ab1bffc7 100644
--- a/platforms/titiva.rst
+++ b/platforms/titiva.rst
@@ -176,8 +176,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
diff --git a/platforms/wiznet7500.rst b/platforms/wiznet7500.rst
index df24a82e4e..a2938e490f 100644
--- a/platforms/wiznet7500.rst
+++ b/platforms/wiznet7500.rst
@@ -173,8 +173,7 @@ Boards
 ------
 
 .. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <https://platformio.org/boards>`_
+    * You can list pre-configured boards by :ref:`cmd_boards` command
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 

From 06c82f4d4e422e1d472961d4b4d477cb6fffb5ea Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 1 Feb 2022 15:37:29 +0200
Subject: [PATCH 14/17] Update package links

---
 platforms/aceinna_imu.rst      |  6 +--
 platforms/asrmicro650x.rst     | 10 ++--
 platforms/atmelavr.rst         | 38 +++++++-------
 platforms/atmelmegaavr.rst     | 12 ++---
 platforms/atmelsam.rst         | 50 +++++++++---------
 platforms/chipsalliance.rst    | 10 ++--
 platforms/espressif32.rst      | 42 ++++++++--------
 platforms/espressif8266.rst    | 18 +++----
 platforms/freescalekinetis.rst | 18 +++----
 platforms/gd32v.rst            | 12 ++---
 platforms/infineonxmc.rst      |  6 +--
 platforms/intel_arc32.rst      |  6 +--
 platforms/intel_mcs51.rst      |  4 +-
 platforms/kendryte210.rst      | 12 ++---
 platforms/lattice_ice40.rst    |  4 +-
 platforms/linux_arm.rst        |  4 +-
 platforms/linux_i686.rst       |  2 +-
 platforms/linux_x86_64.rst     |  2 +-
 platforms/maxim32.rst          |  8 +--
 platforms/microchippic32.rst   |  6 +--
 platforms/nordicnrf51.rst      | 24 ++++-----
 platforms/nordicnrf52.rst      | 34 ++++++-------
 platforms/nuclei.rst           |  8 +--
 platforms/nxpimxrt.rst         | 20 ++++----
 platforms/nxplpc.rst           | 20 ++++----
 platforms/openhw.rst           | 12 ++---
 platforms/raspberrypi.rst      | 10 ++--
 platforms/riscv_gap.rst        |  6 +--
 platforms/shakti.rst           | 10 ++--
 platforms/sifive.rst           | 22 ++++----
 platforms/siliconlabsefm32.rst | 16 +++---
 platforms/ststm32.rst          | 92 +++++++++++++++++-----------------
 platforms/ststm8.rst           | 14 +++---
 platforms/teensy.rst           | 22 ++++----
 platforms/timsp430.rst         |  8 +--
 platforms/titiva.rst           |  8 +--
 platforms/windows_x86.rst      |  2 +-
 platforms/wiznet7500.rst       |  8 +--
 38 files changed, 303 insertions(+), 303 deletions(-)

diff --git a/platforms/aceinna_imu.rst b/platforms/aceinna_imu.rst
index 3389225c63..dbfeadabd7 100644
--- a/platforms/aceinna_imu.rst
+++ b/platforms/aceinna_imu.rst
@@ -170,13 +170,13 @@ Packages
     * - Name
       - Description
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/asrmicro650x.rst b/platforms/asrmicro650x.rst
index 5ff3533cfd..aad68bae9d 100644
--- a/platforms/asrmicro650x.rst
+++ b/platforms/asrmicro650x.rst
@@ -79,19 +79,19 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinoasrmicro <https://github.com/HelTecAutomation/CubeCell-Arduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoasrmicro <https://registry.platformio.org/tools/heltecautomation/framework-arduinoasrmicro>`__
       - Arduino Wiring-based Framework for ASR Microelectronics (Heltec core)
 
-    * - `tool-cubecellelftool <https://github.com/HelTecAutomation/ASR650x-Arduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cubecellelftool <https://registry.platformio.org/tools/heltecautomation/tool-cubecellelftool>`__
       - CubeCell ELF tool
 
-    * - `tool-cubecellflash <https://github.com/HelTecAutomation/ASR650x-Arduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cubecellflash <https://registry.platformio.org/tools/heltecautomation/tool-cubecellflash>`__
       - CubeCell Flash tool
 
-    * - `tool-cubecellflash6601 <https://github.com/HelTecAutomation/ASR650x-Arduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cubecellflash6601 <https://registry.platformio.org/tools/heltecautomation/tool-cubecellflash6601>`__
       - CubeCell Flash tool for ASR6601
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/atmelavr.rst b/platforms/atmelavr.rst
index 387c4c21d1..93a2077ee6 100644
--- a/platforms/atmelavr.rst
+++ b/platforms/atmelavr.rst
@@ -946,61 +946,61 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduino-avr <https://www.arduino.cc/reference/en?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr <https://registry.platformio.org/tools/platformio/framework-arduino-avr>`__
       - The official Arduino Wiring-based Framework for Microchip AVR microcontrollers
 
-    * - `framework-arduino-avr-attiny <https://github.com/SpenceKonde/ATTinyCore?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-attiny <https://registry.platformio.org/tools/platformio/framework-arduino-avr-attiny>`__
       - Arduino Wiring-based Framework (ATtinyCore)
 
-    * - `framework-arduino-avr-bean <https://github.com/PunchThrough/bean-arduino-core.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-bean <https://registry.platformio.org/tools/platformio/framework-arduino-avr-bean>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (Bean Core)
 
-    * - `framework-arduino-avr-core13 <https://sourceforge.net/projects/ard-core13/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-core13 <https://registry.platformio.org/tools/platformio/framework-arduino-avr-core13>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (Core13)
 
-    * - `framework-arduino-avr-digistump <https://github.com/ArminJo/DigistumpArduino/tree/master/digistump-avr.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-digistump <https://registry.platformio.org/tools/platformio/framework-arduino-avr-digistump>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (Digistump Core)
 
-    * - `framework-arduino-avr-dwenguino <https://github.com/dwengovzw/Dwengo-library/tree/master/dwenguino/Dwenguino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-dwenguino <https://registry.platformio.org/tools/platformio/framework-arduino-avr-dwenguino>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (Dwenguino Core)
 
-    * - `framework-arduino-avr-majorcore <https://github.com/MCUdude/MajorCore.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-majorcore <https://registry.platformio.org/tools/platformio/framework-arduino-avr-majorcore>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (MajorCore)
 
-    * - `framework-arduino-avr-megacore <https://github.com/MCUdude/MegaCore.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-megacore <https://registry.platformio.org/tools/platformio/framework-arduino-avr-megacore>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (MegaCore)
 
-    * - `framework-arduino-avr-microcore <https://github.com/MCUdude/MicroCore.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-microcore <https://registry.platformio.org/tools/platformio/framework-arduino-avr-microcore>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (MicroCore)
 
-    * - `framework-arduino-avr-mightycore <https://github.com/MCUdude/MightyCore.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-mightycore <https://registry.platformio.org/tools/platformio/framework-arduino-avr-mightycore>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (MightyCore)
 
-    * - `framework-arduino-avr-minicore <https://github.com/MCUdude/MiniCore.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-minicore <https://registry.platformio.org/tools/platformio/framework-arduino-avr-minicore>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (MiniCore)
 
-    * - `framework-arduino-avr-nicai <http://www.nicai-systems.com/en/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-nicai <https://registry.platformio.org/tools/platformio/framework-arduino-avr-nicai>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (Nicai Core)
 
-    * - `framework-arduino-avr-panstamp <https://github.com/panStamp/panstamp.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-panstamp <https://registry.platformio.org/tools/platformio/framework-arduino-avr-panstamp>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (Panstamp Core)
 
-    * - `framework-arduino-avr-prusa_rambo <https://github.com/prusa3d/Prusa-Firmware.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-avr-prusa_rambo <https://registry.platformio.org/tools/platformio/framework-arduino-avr-prusa_rambo>`__
       - Arduino Wiring-based Framework for Microchip AVR microcontrollers (Prusa Rambo Core)
 
-    * - `framework-simba <https://github.com/eerimoq/simba.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-simba <https://registry.platformio.org/tools/platformio/framework-simba>`__
       - Simba is an Embedded Programming Platform. It aims to make embedded programming easy and portable
 
-    * - `tool-avrdude <http://savannah.nongnu.org/projects/avrdude?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-avrdude <https://registry.platformio.org/tools/platformio/tool-avrdude>`__
       - AVRDUDE is a utility to download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers
 
-    * - `tool-micronucleus <https://github.com/micronucleus/micronucleus.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-micronucleus <https://registry.platformio.org/tools/platformio/tool-micronucleus>`__
       - ATTiny usb bootloader with a strong emphasis on bootloader compactness
 
-    * - `tool-simavr <https://github.com/buserror/simavr.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-simavr <https://registry.platformio.org/tools/platformio/tool-simavr>`__
       - simavr is a lean, mean and hackable AVR simulator
 
-    * - `toolchain-atmelavr <https://gcc.gnu.org/wiki/avr-gcc?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-atmelavr <https://registry.platformio.org/tools/platformio/toolchain-atmelavr>`__
       - GCC Toolchain for Microchip AVR microcontrollers
 
 .. warning::
diff --git a/platforms/atmelmegaavr.rst b/platforms/atmelmegaavr.rst
index bc7bf7ed86..0b47ee3924 100644
--- a/platforms/atmelmegaavr.rst
+++ b/platforms/atmelmegaavr.rst
@@ -78,22 +78,22 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduino-megaavr <https://github.com/arduino/ArduinoCore-megaavr.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-megaavr <https://registry.platformio.org/tools/platformio/framework-arduino-megaavr>`__
       - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers
 
-    * - `framework-arduino-megaavr-dxcore <https://github.com/SpenceKonde/DxCore.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-megaavr-dxcore <https://registry.platformio.org/tools/platformio/framework-arduino-megaavr-dxcore>`__
       - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers (DxCore)
 
-    * - `framework-arduino-megaavr-megacorex <https://github.com/MCUdude/MegaCoreX.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-megaavr-megacorex <https://registry.platformio.org/tools/platformio/framework-arduino-megaavr-megacorex>`__
       - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers (MegaCoreX)
 
-    * - `framework-arduino-megaavr-megatinycore <https://github.com/SpenceKonde/megaTinyCore.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-megaavr-megatinycore <https://registry.platformio.org/tools/platformio/framework-arduino-megaavr-megatinycore>`__
       - Arduino Wiring-based Framework for Microchip tinyAVR 0-series and 1-series chips (megaTinyCore)
 
-    * - `tool-avrdude-megaavr <http://savannah.nongnu.org/projects/avrdude?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-avrdude-megaavr <https://registry.platformio.org/tools/platformio/tool-avrdude-megaavr>`__
       - AVRDUDE is a utility to download/upload/manipulate the ROM and EEPROM contents of megaAVR microcontrollers
 
-    * - `toolchain-atmelavr <https://gcc.gnu.org/wiki/avr-gcc?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-atmelavr <https://registry.platformio.org/tools/platformio/toolchain-atmelavr>`__
       - GCC Toolchain for Microchip AVR microcontrollers
 
 .. warning::
diff --git a/platforms/atmelsam.rst b/platforms/atmelsam.rst
index eafee0e14a..5c3969b32d 100644
--- a/platforms/atmelsam.rst
+++ b/platforms/atmelsam.rst
@@ -558,79 +558,79 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduino-mbcwb <https://briki.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-mbcwb <https://registry.platformio.org/tools/meteca/framework-arduino-mbcwb>`__
       - Fork of Arduino Framework for briki MBC-WB boards
 
-    * - `framework-arduino-sam <https://www.arduino.cc/reference/en?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-sam <https://registry.platformio.org/tools/platformio/framework-arduino-sam>`__
       - The official Arduino Wiring-based Framework for ATSAM3 microcontrollers
 
-    * - `framework-arduino-samd <https://www.arduino.cc/reference/en?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-samd <https://registry.platformio.org/tools/platformio/framework-arduino-samd>`__
       - The official Arduino Wiring-based Framework for Microchip SAM D microcontrollers
 
-    * - `framework-arduino-samd-adafruit <https://github.com/adafruit/ArduinoCore-samd.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-samd-adafruit <https://registry.platformio.org/tools/platformio/framework-arduino-samd-adafruit>`__
       - Arduino Wiring-based Framework for Microchip SAM D microcontrollers (Adafruit SAMD Core)
 
-    * - `framework-arduino-samd-moteino <https://github.com/LowPowerLab/Arduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-samd-moteino <https://registry.platformio.org/tools/platformio/framework-arduino-samd-moteino>`__
       - Arduino Wiring-based Framework for Microchip SAM D microcontrollers (Moteino SAMD Core)
 
-    * - `framework-arduino-samd-reprap <https://github.com/brupje/ArduinoCore-samd.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-samd-reprap <https://registry.platformio.org/tools/platformio/framework-arduino-samd-reprap>`__
       - Arduino Wiring-based Framework for Microchip SAM D microcontrollers (RepRap SAMD Core)
 
-    * - `framework-arduino-samd-seeed <https://github.com/Seeed-Studio/ArduinoCore-samd.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-samd-seeed <https://registry.platformio.org/tools/platformio/framework-arduino-samd-seeed>`__
       - Arduino Wiring-based Framework for Microchip SAM D microcontrollers (Seeed SAMD Core)
 
-    * - `framework-arduino-samd-sodaq <https://github.com/SodaqMoja/SodaqCore-samd.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-samd-sodaq <https://registry.platformio.org/tools/platformio/framework-arduino-samd-sodaq>`__
       - Arduino Wiring-based Framework for Microchip SAM D microcontrollers (SODAQ SAMD Core)
 
-    * - `framework-arduino-samd-sparkfun <https://github.com/sparkfun/Arduino_Boards/tree/master/sparkfun/samd.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-samd-sparkfun <https://registry.platformio.org/tools/platformio/framework-arduino-samd-sparkfun>`__
       - Arduino Wiring-based Framework for Microchip SAM D microcontrollers (SparkFun SAMD Core)
 
-    * - `framework-arduino-samd-tuino0 <https://github.com/gimasi/TUINO_ZERO_96/tree/master/arduino_ide.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-samd-tuino0 <https://registry.platformio.org/tools/platformio/framework-arduino-samd-tuino0>`__
       - Arduino Wiring-based Framework for Microchip SAM D microcontrollers (Tuino0 SAMD Core)
 
-    * - `framework-cmsis <http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis <https://registry.platformio.org/tools/platformio/framework-cmsis>`__
       - Vendor-independent hardware abstraction layer for the Cortex-M processor series
 
-    * - `framework-cmsis-atmel <https://github.com/arduino/ArduinoModule-CMSIS-Atmel.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-atmel <https://registry.platformio.org/tools/platformio/framework-cmsis-atmel>`__
       - Atmel Smart ARM devices CMSIS module
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-simba <https://github.com/eerimoq/simba.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-simba <https://registry.platformio.org/tools/platformio/framework-simba>`__
       - Simba is an Embedded Programming Platform. It aims to make embedded programming easy and portable
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-avrdude <http://savannah.nongnu.org/projects/avrdude?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-avrdude <https://registry.platformio.org/tools/platformio/tool-avrdude>`__
       - AVRDUDE is a utility to download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers
 
-    * - `tool-bossac <https://github.com/shumatech/BOSSA.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-bossac <https://registry.platformio.org/tools/platformio/tool-bossac>`__
       - Basic Open Source SAM-BA Application (BOSSA)
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-mbctool <https://briki.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-mbctool <https://registry.platformio.org/tools/meteca/tool-mbctool>`__
       - MBC-WB Uploader Application
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/chipsalliance.rst b/platforms/chipsalliance.rst
index 0f91db5d36..de2b977d5f 100644
--- a/platforms/chipsalliance.rst
+++ b/platforms/chipsalliance.rst
@@ -122,19 +122,19 @@ Packages
     * - Name
       - Description
 
-    * - `framework-wd-riscv-sdk <https://github.com/westerndigitalcorporation/riscv-fw-infrastructure.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-wd-riscv-sdk <https://registry.platformio.org/tools/platformio/framework-wd-riscv-sdk>`__
       - The WD Firmware package contains Firmware applications and Processor Support Package (PSP) for various cores, alongside demos which support all features.
 
-    * - `tool-openocd-riscv-chipsalliance <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-riscv-chipsalliance <https://registry.platformio.org/tools/platformio/tool-openocd-riscv-chipsalliance>`__
       - Fork of Open On-Chip Debugger that has RISC-V support and enabled VPI JTAG
 
-    * - `tool-verilator-swervolf <https://www.veripool.org/wiki/verilator?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-verilator-swervolf <https://registry.platformio.org/tools/platformio/tool-verilator-swervolf>`__
       - Verilator is an open-source SystemVerilog simulator and lint system
 
-    * - `tool-whisper <https://github.com/chipsalliance/SweRV-ISS.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-whisper <https://registry.platformio.org/tools/platformio/tool-whisper>`__
       - Whisper is a RISCV instruction set simulator (ISS) developed for the verification of the Swerv micro-controller. It allows the user to run RISC-V code without RISC-V hardware
 
-    * - `toolchain-riscv <https://github.com/riscv/riscv-gnu-toolchain.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-riscv <https://registry.platformio.org/tools/platformio/toolchain-riscv>`__
       - GNU toolchain for RISC-V, including GCC
 
 .. warning::
diff --git a/platforms/espressif32.rst b/platforms/espressif32.rst
index f4cb8fef17..f393ff2742 100644
--- a/platforms/espressif32.rst
+++ b/platforms/espressif32.rst
@@ -462,67 +462,67 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduino-mbcwb <https://briki.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-mbcwb <https://registry.platformio.org/tools/meteca/framework-arduino-mbcwb>`__
       - Fork of Arduino Framework for briki MBC-WB boards
 
-    * - `framework-arduinoespressif32 <https://github.com/espressif/arduino-esp32.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoespressif32 <https://registry.platformio.org/tools/platformio/framework-arduinoespressif32>`__
       - Arduino Wiring-based Framework for Espressif ESP32 microcontrollers
 
-    * - `framework-espidf <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-espidf <https://registry.platformio.org/tools/platformio/framework-espidf>`__
       - Espressif IoT Development Framework. Official development framework for ESP32 chip
 
-    * - `framework-pumbaa <https://github.com/eerimoq/pumbaa.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-pumbaa <https://registry.platformio.org/tools/platformio/framework-pumbaa>`__
       - Pumbaa Framework - a port of MicroPython, designed for embedded devices with limited amount of RAM and code memory
 
-    * - `framework-simba <https://github.com/eerimoq/simba.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-simba <https://registry.platformio.org/tools/platformio/framework-simba>`__
       - Simba is an Embedded Programming Platform. It aims to make embedded programming easy and portable
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-esptoolpy <https://github.com/espressif/esptool.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-esptoolpy <https://registry.platformio.org/tools/platformio/tool-esptoolpy>`__
       - Espressif ESP8266 and ESP32 serial bootloader utility
 
-    * - `tool-idf <https://github.com/espressif/esp-idf/tree/master/tools.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-idf <https://registry.platformio.org/tools/platformio/tool-idf>`__
       - idf is a top-level config/build command line tool for ESP-IDF
 
-    * - `tool-mbctool <https://briki.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-mbctool <https://registry.platformio.org/tools/meteca/tool-mbctool>`__
       - MBC-WB Uploader Application
 
-    * - `tool-mconf <https://github.com/espressif/kconfig-frontends.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-mconf <https://registry.platformio.org/tools/platformio/tool-mconf>`__
       - Fork of kconfig-frontends project with some modifications for use with ESP-IDF
 
-    * - `tool-mkspiffs <https://github.com/igrr/mkspiffs.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-mkspiffs <https://registry.platformio.org/tools/platformio/tool-mkspiffs>`__
       - Tool to build and unpack SPIFFS images
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-openocd-esp32 <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-esp32 <https://registry.platformio.org/tools/platformio/tool-openocd-esp32>`__
       - Open On-Chip Debugger for Espressif ESP32
 
-    * - `toolchain-esp32s2ulp <https://github.com/espressif/esp-idf.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-esp32s2ulp <https://registry.platformio.org/tools/platformio/toolchain-esp32s2ulp>`__
       - Binutils fork with support for the ESP32-S2 ULP co-processor
 
-    * - `toolchain-esp32ulp <https://github.com/espressif/binutils-esp32ulp.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-esp32ulp <https://registry.platformio.org/tools/platformio/toolchain-esp32ulp>`__
       - Binutils fork with support for the Espressif ESP32 ULP co-processor
 
-    * - `toolchain-riscv-esp <https://github.com/espressif/crosstool-NG.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-riscv-esp <https://registry.platformio.org/tools/platformio/toolchain-riscv-esp>`__
       - GCC Toolchain for Espressif 32-bit RISC-V based on GCC
 
-    * - `toolchain-riscv32-esp <https://github.com/espressif/crosstool-NG.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-riscv32-esp <https://registry.platformio.org/tools/espressif/toolchain-riscv32-esp>`__
       - GCC Toolchain for Espressif 32-bit RISC-V based MCUs
 
-    * - `toolchain-xtensa-esp32 <https://github.com/espressif/crosstool-NG.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-xtensa-esp32 <https://registry.platformio.org/tools/espressif/toolchain-xtensa-esp32>`__
       - GCC Toolchain for Espressif ESP32 Xtensa MCUs
 
-    * - `toolchain-xtensa-esp32s2 <https://github.com/espressif/crosstool-NG.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-xtensa-esp32s2 <https://registry.platformio.org/tools/espressif/toolchain-xtensa-esp32s2>`__
       - GCC Toolchain for Espressif ESP32-S2 Xtensa MCUs
 
-    * - `toolchain-xtensa32 <https://github.com/espressif/esp-idf.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-xtensa32 <https://registry.platformio.org/tools/platformio/toolchain-xtensa32>`__
       - GCC Toolchain for Xtensa32 processor
 
-    * - `toolchain-xtensa32s2 <https://github.com/espressif/crosstool-NG.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-xtensa32s2 <https://registry.platformio.org/tools/platformio/toolchain-xtensa32s2>`__
       - GCC Toolchain for Xtensa32-S2 processor
 
 .. warning::
diff --git a/platforms/espressif8266.rst b/platforms/espressif8266.rst
index 8016d4a339..842c3deb68 100644
--- a/platforms/espressif8266.rst
+++ b/platforms/espressif8266.rst
@@ -81,31 +81,31 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinoespressif8266 <https://github.com/esp8266/Arduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoespressif8266 <https://registry.platformio.org/tools/platformio/framework-arduinoespressif8266>`__
       - Arduino Wiring-based Framework for Espressif ESP8266 microcontrollers
 
-    * - `framework-esp8266-nonos-sdk <https://github.com/espressif/ESP8266_NONOS_SDK.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-esp8266-nonos-sdk <https://registry.platformio.org/tools/platformio/framework-esp8266-nonos-sdk>`__
       - Espressif ESP8266 Non-OS SDK
 
-    * - `framework-esp8266-rtos-sdk <https://github.com/espressif/ESP8266_RTOS_SDK.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-esp8266-rtos-sdk <https://registry.platformio.org/tools/platformio/framework-esp8266-rtos-sdk>`__
       - Espressif ESP8266 SDK based on FreeRTOS
 
-    * - `framework-simba <https://github.com/eerimoq/simba.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-simba <https://registry.platformio.org/tools/platformio/framework-simba>`__
       - Simba is an Embedded Programming Platform. It aims to make embedded programming easy and portable
 
-    * - `tool-esptool <https://github.com/igrr/esptool-ck.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-esptool <https://registry.platformio.org/tools/platformio/tool-esptool>`__
       - Espressif ESP8266 build/flash helper tool
 
-    * - `tool-esptoolpy <https://github.com/espressif/esptool.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-esptoolpy <https://registry.platformio.org/tools/platformio/tool-esptoolpy>`__
       - Espressif ESP8266 and ESP32 serial bootloader utility
 
-    * - `tool-mklittlefs <https://github.com/earlephilhower/mklittlefs.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-mklittlefs <https://registry.platformio.org/tools/platformio/tool-mklittlefs>`__
       - Utility for creating littlefs images for upload on the ESP8266
 
-    * - `tool-mkspiffs <https://github.com/igrr/mkspiffs.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-mkspiffs <https://registry.platformio.org/tools/platformio/tool-mkspiffs>`__
       - Tool to build and unpack SPIFFS images
 
-    * - `toolchain-xtensa <https://github.com/jcmvbkbc/gcc-xtensa.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-xtensa <https://registry.platformio.org/tools/platformio/toolchain-xtensa>`__
       - GCC Toolchain for Xtensa processor
 
 .. warning::
diff --git a/platforms/freescalekinetis.rst b/platforms/freescalekinetis.rst
index be5461115a..883b149d81 100644
--- a/platforms/freescalekinetis.rst
+++ b/platforms/freescalekinetis.rst
@@ -218,31 +218,31 @@ Packages
     * - Name
       - Description
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-pyocd <https://github.com/pyocd/pyOCD.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-pyocd <https://registry.platformio.org/tools/platformio/tool-pyocd>`__
       - Open source python library for programming and debugging ARM Cortex-M microcontrollers using CMSIS-DAP
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/gd32v.rst b/platforms/gd32v.rst
index 7f4fd4fdcb..989971aa4a 100644
--- a/platforms/gd32v.rst
+++ b/platforms/gd32v.rst
@@ -136,22 +136,22 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduino-gd32v <https://github.com/sipeed/Maixduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-gd32v <https://registry.platformio.org/tools/platformio/framework-arduino-gd32v>`__
       - Arduino Wiring-based Framework for GigaDevice GD32V microcontrollers
 
-    * - `framework-gd32vf103-sdk <https://www.riscv-mcu.com/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-gd32vf103-sdk <https://registry.platformio.org/tools/platformio/framework-gd32vf103-sdk>`__
       - GigaDevice GD32VF103 Firmware Library
 
-    * - `tool-dfuutil <http://dfu-util.sourceforge.net/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dfuutil <https://registry.platformio.org/tools/platformio/tool-dfuutil>`__
       - Device Firmware Upgrade Utilities
 
-    * - `tool-gd32vflash <https://github.com/riscv-mcu/gd32-dfu-utils.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gd32vflash <https://registry.platformio.org/tools/platformio/tool-gd32vflash>`__
       - GigaDevice GD32V Flash tools
 
-    * - `tool-openocd-gd32v <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-gd32v <https://registry.platformio.org/tools/platformio/tool-openocd-gd32v>`__
       - Open On-Chip Debugger branch with RISC-V GigaDevice GD32V support
 
-    * - `toolchain-gd32v <https://github.com/riscv-mcu/riscv-gnu-toolchain?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gd32v <https://registry.platformio.org/tools/platformio/toolchain-gd32v>`__
       - GCC Toolchain for GigaDevice GD32V microcontrollers
 
 .. warning::
diff --git a/platforms/infineonxmc.rst b/platforms/infineonxmc.rst
index 71875986f0..e2780479a3 100644
--- a/platforms/infineonxmc.rst
+++ b/platforms/infineonxmc.rst
@@ -160,13 +160,13 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinoxmc <https://github.com/Infineon/XMC-for-Arduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoxmc <https://registry.platformio.org/tools/platformio/framework-arduinoxmc>`__
       - Arduino Wiring-based Framework for Infineon's XMC microcontrollers
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/intel_arc32.rst b/platforms/intel_arc32.rst
index 510bdd4b9b..39e757cc47 100644
--- a/platforms/intel_arc32.rst
+++ b/platforms/intel_arc32.rst
@@ -76,13 +76,13 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinointel <https://github.com/01org/corelibs-arduino101.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinointel <https://registry.platformio.org/tools/platformio/framework-arduinointel>`__
       - Arduino Wiring-based Framework Intel ARC32 processor
 
-    * - `tool-arduino101load <https://github.com/01org/intel-arduino-tools.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-arduino101load <https://registry.platformio.org/tools/platformio/tool-arduino101load>`__
       - Genuino101 uploader tool
 
-    * - `toolchain-intelarc32 <https://embarc.org/toolchain/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-intelarc32 <https://registry.platformio.org/tools/platformio/toolchain-intelarc32>`__
       - GCC for Intel ARC processor
 
 .. warning::
diff --git a/platforms/intel_mcs51.rst b/platforms/intel_mcs51.rst
index 8321415274..cb8d85b6e2 100644
--- a/platforms/intel_mcs51.rst
+++ b/platforms/intel_mcs51.rst
@@ -76,10 +76,10 @@ Packages
     * - Name
       - Description
 
-    * - `tool-stcgal <https://github.com/grigorig/stcgal.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-stcgal <https://registry.platformio.org/tools/platformio/tool-stcgal>`__
       - Open Source STC MCU ISP flash tool
 
-    * - `toolchain-sdcc <http://sdcc.sourceforge.net?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-sdcc <https://registry.platformio.org/tools/platformio/toolchain-sdcc>`__
       - Small Device C compiler suite
 
 .. warning::
diff --git a/platforms/kendryte210.rst b/platforms/kendryte210.rst
index b2c27278fc..d4b1ed4940 100644
--- a/platforms/kendryte210.rst
+++ b/platforms/kendryte210.rst
@@ -146,22 +146,22 @@ Packages
     * - Name
       - Description
 
-    * - `framework-kendryte-freertos-sdk <https://github.com/kendryte/kendryte-freertos-sdk.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-kendryte-freertos-sdk <https://registry.platformio.org/tools/platformio/framework-kendryte-freertos-sdk>`__
       - Kendryte K210 SDK with FreeRTOS
 
-    * - `framework-kendryte-standalone-sdk <https://github.com/kendryte/kendryte-standalone-sdk.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-kendryte-standalone-sdk <https://registry.platformio.org/tools/platformio/framework-kendryte-standalone-sdk>`__
       - Kendryte K210 standalone SDK without OS support
 
-    * - `framework-maixduino <https://github.com/sipeed/Maixduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-maixduino <https://registry.platformio.org/tools/platformio/framework-maixduino>`__
       - Arduino Сore for Maix Board (K210)
 
-    * - `tool-kflash-kendryte210 <https://github.com/kendryte/kflash.py.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-kflash-kendryte210 <https://registry.platformio.org/tools/platformio/tool-kflash-kendryte210>`__
       - A Python-based Kendryte K210 UART ISP Utility
 
-    * - `tool-openocd-kendryte <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-kendryte <https://registry.platformio.org/tools/platformio/tool-openocd-kendryte>`__
       - Open On-Chip Debugger branch with RISC-V Kendryte support
 
-    * - `toolchain-kendryte210 <https://github.com/kendryte/kendryte-gnu-toolchain.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-kendryte210 <https://registry.platformio.org/tools/platformio/toolchain-kendryte210>`__
       - RISC-V GCC Toolchain for Kendryte 210
 
 .. warning::
diff --git a/platforms/lattice_ice40.rst b/platforms/lattice_ice40.rst
index f9e4c8b6c3..f833638eb9 100644
--- a/platforms/lattice_ice40.rst
+++ b/platforms/lattice_ice40.rst
@@ -75,10 +75,10 @@ Packages
     * - Name
       - Description
 
-    * - `toolchain-icestorm <http://www.clifford.at/icestorm/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-icestorm <https://registry.platformio.org/tools/platformio/toolchain-icestorm>`__
       - Tools for analyzing and creating bitstream files for FPGA IceStorm
 
-    * - `toolchain-iverilog <http://iverilog.icarus.com?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-iverilog <https://registry.platformio.org/tools/platformio/toolchain-iverilog>`__
       - Verilog simulation and synthesis tool
 
 .. warning::
diff --git a/platforms/linux_arm.rst b/platforms/linux_arm.rst
index dd6b96c557..56a21cb82d 100644
--- a/platforms/linux_arm.rst
+++ b/platforms/linux_arm.rst
@@ -75,10 +75,10 @@ Packages
     * - Name
       - Description
 
-    * - `framework-wiringpi <http://wiringpi.com?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-wiringpi <https://registry.platformio.org/tools/platformio/framework-wiringpi>`__
       - WiringPi is a PIN based GPIO access library written in C for the BCM2835, BCM2836 and BCM2837 SoC devices used in all Raspberry Pi
 
-    * - `toolchain-gccarmlinuxgnueabi <https://gcc.gnu.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmlinuxgnueabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmlinuxgnueabi>`__
       - GCC Toolchain for Linux ARM GNU EABI
 
 Frameworks
diff --git a/platforms/linux_i686.rst b/platforms/linux_i686.rst
index 2af48964bf..342e02d682 100644
--- a/platforms/linux_i686.rst
+++ b/platforms/linux_i686.rst
@@ -74,5 +74,5 @@ Packages
     * - Name
       - Description
 
-    * - `toolchain-gcclinux32 <https://gcc.gnu.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gcclinux32 <https://registry.platformio.org/tools/platformio/toolchain-gcclinux32>`__
       - GCC Toolchain for Linux i686 machines
\ No newline at end of file
diff --git a/platforms/linux_x86_64.rst b/platforms/linux_x86_64.rst
index 71fb9cdb83..439edec696 100644
--- a/platforms/linux_x86_64.rst
+++ b/platforms/linux_x86_64.rst
@@ -74,5 +74,5 @@ Packages
     * - Name
       - Description
 
-    * - `toolchain-gcclinux64 <https://gcc.gnu.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gcclinux64 <https://registry.platformio.org/tools/platformio/toolchain-gcclinux64>`__
       - GCC Toolchain for Linux x86_64 machines
\ No newline at end of file
diff --git a/platforms/maxim32.rst b/platforms/maxim32.rst
index cd1ed74343..a02df6c8f3 100644
--- a/platforms/maxim32.rst
+++ b/platforms/maxim32.rst
@@ -154,16 +154,16 @@ Packages
     * - Name
       - Description
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-pyocd <https://github.com/pyocd/pyOCD.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-pyocd <https://registry.platformio.org/tools/platformio/tool-pyocd>`__
       - Open source python library for programming and debugging ARM Cortex-M microcontrollers using CMSIS-DAP
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/microchippic32.rst b/platforms/microchippic32.rst
index 849395bf8a..c5be0d7f72 100644
--- a/platforms/microchippic32.rst
+++ b/platforms/microchippic32.rst
@@ -75,13 +75,13 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinomicrochippic32 <http://chipkit.net/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinomicrochippic32 <https://registry.platformio.org/tools/platformio/framework-arduinomicrochippic32>`__
       - Arduino Wiring-based Framework for Microchip PIC32 microcontrollers
 
-    * - `tool-pic32prog <https://github.com/sergev/pic32prog.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-pic32prog <https://registry.platformio.org/tools/platformio/tool-pic32prog>`__
       - Flash programming utility for Microchip PIC32 microcontrollers
 
-    * - `toolchain-microchippic32 <https://github.com/chipKIT32/chipKIT-cxx.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-microchippic32 <https://registry.platformio.org/tools/platformio/toolchain-microchippic32>`__
       - GCC Toolchain for Microchip PIC32
 
 .. warning::
diff --git a/platforms/nordicnrf51.rst b/platforms/nordicnrf51.rst
index ef78e08ff2..6b2840730d 100644
--- a/platforms/nordicnrf51.rst
+++ b/platforms/nordicnrf51.rst
@@ -255,40 +255,40 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinonordicnrf5 <https://github.com/sandeepmistry/arduino-nRF5.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinonordicnrf5 <https://registry.platformio.org/tools/platformio/framework-arduinonordicnrf5>`__
       - Arduino Wiring-based Framework for Nordic Semiconductor nRF5 based boards
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-nrfjprog <https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Command-Line-Tools?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-nrfjprog <https://registry.platformio.org/tools/platformio/tool-nrfjprog>`__
       - nRFx command line tools
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `tool-sreccat <http://srecord.sourceforge.net?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-sreccat <https://registry.platformio.org/tools/platformio/tool-sreccat>`__
       - Collection of powerful tools for manipulating EPROM load files
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/nordicnrf52.rst b/platforms/nordicnrf52.rst
index 776fe28d3b..532e994518 100644
--- a/platforms/nordicnrf52.rst
+++ b/platforms/nordicnrf52.rst
@@ -364,55 +364,55 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduino-mbed <https://www.arduino.cc/reference/en?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-mbed <https://registry.platformio.org/tools/platformio/framework-arduino-mbed>`__
       - Arduino framework supporting mbed-enabled boards
 
-    * - `framework-arduinoadafruitnrf52 <https://github.com/adafruit/Adafruit_nRF52_Arduino.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoadafruitnrf52 <https://registry.platformio.org/tools/platformio/framework-arduinoadafruitnrf52>`__
       - Arduino Wiring-based Framework for Nordic Semiconductor nRF52 BLE SoC
 
-    * - `framework-arduinonordicnrf5 <https://github.com/sandeepmistry/arduino-nRF5.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinonordicnrf5 <https://registry.platformio.org/tools/platformio/framework-arduinonordicnrf5>`__
       - Arduino Wiring-based Framework for Nordic Semiconductor nRF5 based boards
 
-    * - `framework-cmsis <http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis <https://registry.platformio.org/tools/platformio/framework-cmsis>`__
       - Vendor-independent hardware abstraction layer for the Cortex-M processor series
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-adafruit-nrfutil <https://github.com/adafruit/Adafruit_nRF52_nrfutil.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-adafruit-nrfutil <https://registry.platformio.org/tools/platformio/tool-adafruit-nrfutil>`__
       - adafruit-nrfutil is a Python package that includes the adafruit-nrfutil command line utility and the nordicsemi library.
 
-    * - `tool-bossac-nordicnrf52 <https://github.com/shumatech/BOSSA.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-bossac-nordicnrf52 <https://registry.platformio.org/tools/platformio/tool-bossac-nordicnrf52>`__
       - Basic Open Source SAM-BA Application (BOSSA) for Nordic nRF52 microcontrollers
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-nrfjprog <https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Command-Line-Tools?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-nrfjprog <https://registry.platformio.org/tools/platformio/tool-nrfjprog>`__
       - nRFx command line tools
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `tool-sreccat <http://srecord.sourceforge.net?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-sreccat <https://registry.platformio.org/tools/platformio/tool-sreccat>`__
       - Collection of powerful tools for manipulating EPROM load files
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/nuclei.rst b/platforms/nuclei.rst
index 8787887f7c..5352a27351 100644
--- a/platforms/nuclei.rst
+++ b/platforms/nuclei.rst
@@ -162,16 +162,16 @@ Packages
     * - Name
       - Description
 
-    * - `framework-nuclei-sdk <https://github.com/Nuclei-Software/nuclei-sdk.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-nuclei-sdk <https://registry.platformio.org/tools/nuclei/framework-nuclei-sdk>`__
       - Nuclei N/NX Embedded Software Development Kit
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-openocd-nuclei <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-nuclei <https://registry.platformio.org/tools/nuclei/tool-openocd-nuclei>`__
       - Open On-Chip Debugger branch with RISC-V Nuclei support
 
-    * - `toolchain-riscv-gcc-nuclei <https://github.com/riscv-mcu/riscv-gnu-toolchain.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-riscv-gcc-nuclei <https://registry.platformio.org/tools/nuclei/toolchain-riscv-gcc-nuclei>`__
       - Nuclei RISC-V GCC toolchain
 
 .. warning::
diff --git a/platforms/nxpimxrt.rst b/platforms/nxpimxrt.rst
index 69d9fe94ec..3a5a31cfef 100644
--- a/platforms/nxpimxrt.rst
+++ b/platforms/nxpimxrt.rst
@@ -147,34 +147,34 @@ Packages
     * - Name
       - Description
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `tool-pyocd <https://github.com/pyocd/pyOCD.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-pyocd <https://registry.platformio.org/tools/platformio/tool-pyocd>`__
       - Open source python library for programming and debugging ARM Cortex-M microcontrollers using CMSIS-DAP
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/nxplpc.rst b/platforms/nxplpc.rst
index e2b8574c1c..36a68373ef 100644
--- a/platforms/nxplpc.rst
+++ b/platforms/nxplpc.rst
@@ -277,34 +277,34 @@ Packages
     * - Name
       - Description
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `tool-pyocd <https://github.com/pyocd/pyOCD.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-pyocd <https://registry.platformio.org/tools/platformio/tool-pyocd>`__
       - Open source python library for programming and debugging ARM Cortex-M microcontrollers using CMSIS-DAP
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/openhw.rst b/platforms/openhw.rst
index d094707fe0..28397d2407 100644
--- a/platforms/openhw.rst
+++ b/platforms/openhw.rst
@@ -122,22 +122,22 @@ Packages
     * - Name
       - Description
 
-    * - `framework-pulp-runtime <https://github.com/pulp-platform/pulp-runtime.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-pulp-runtime <https://registry.platformio.org/tools/platformio/framework-pulp-runtime>`__
       - Runtime Environment for Parallel Ultra Low Power platform
 
-    * - `framework-pulp-sdk <https://github.com/pulp-platform/pulp-sdk.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-pulp-sdk <https://registry.platformio.org/tools/platformio/framework-pulp-sdk>`__
       - Software Development Kit for Parallel Ultra Low Power platform
 
-    * - `tool-openocd-riscv-pulp <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-riscv-pulp <https://registry.platformio.org/tools/platformio/tool-openocd-riscv-pulp>`__
       - Fork of Open On-Chip Debugger that has RISC-V support for PULP platform
 
-    * - `tool-ovpsim-corev <https://github.com/openhwgroup/riscv-ovpsim-corev.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ovpsim-corev <https://registry.platformio.org/tools/platformio/tool-ovpsim-corev>`__
       - Imperas RISC-V OVPsim CORE-V simulator provides a reference of the OpenHW Group CORE-V processor cores. The riscvOVPsim familiy of simulators implement the full and complete functionality of the RISC-V Foundation's public User and Privilege specifications.
 
-    * - `tool-renode <https://renode.io?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-renode <https://registry.platformio.org/tools/platformio/tool-renode>`__
       - Renode is a development framework which accelerates IoT and embedded systems development by letting you simulate physical hardware systems
 
-    * - `toolchain-riscv-pulp <https://www.embecosm.com/resources/tool-chain-downloads/?utm_source=platformio.org&utm_medium=docs#pulp>`__
+    * - `toolchain-riscv-pulp <https://registry.platformio.org/tools/platformio/toolchain-riscv-pulp>`__
       - GNU toolchain for RISC-V (PULP platform)
 
 .. warning::
diff --git a/platforms/raspberrypi.rst b/platforms/raspberrypi.rst
index 8ace941711..c03555321c 100644
--- a/platforms/raspberrypi.rst
+++ b/platforms/raspberrypi.rst
@@ -125,19 +125,19 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduino-mbed <https://www.arduino.cc/reference/en?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-mbed <https://registry.platformio.org/tools/platformio/framework-arduino-mbed>`__
       - Arduino framework supporting mbed-enabled boards
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-openocd-raspberrypi <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-raspberrypi <https://registry.platformio.org/tools/platformio/tool-openocd-raspberrypi>`__
       - Open On-Chip Debugger for Raspberry Pi MCUs
 
-    * - `tool-rp2040tools <https://github.com/arduino/ArduinoCore-mbed?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-rp2040tools <https://registry.platformio.org/tools/platformio/tool-rp2040tools>`__
       - Tools for interacting with a RP2040 device in BOOTSEL mode or with a RP2040 binary
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/riscv_gap.rst b/platforms/riscv_gap.rst
index b91bd8b34c..c38ef038b7 100644
--- a/platforms/riscv_gap.rst
+++ b/platforms/riscv_gap.rst
@@ -135,13 +135,13 @@ Packages
     * - Name
       - Description
 
-    * - `framework-gap_sdk <https://github.com/GreenWaves-Technologies/gap_sdk.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-gap_sdk <https://registry.platformio.org/tools/platformio/framework-gap_sdk>`__
       - SDK for Greenwaves Technologies' GAP8 IoT Application Processor
 
-    * - `tool-pulp_tools <https://github.com/GreenWaves-Technologies/pulp_tools.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-pulp_tools <https://registry.platformio.org/tools/platformio/tool-pulp_tools>`__
       - Top project for building PULP development tools
 
-    * - `toolchain-riscv-pulp <https://www.embecosm.com/resources/tool-chain-downloads/?utm_source=platformio.org&utm_medium=docs#pulp>`__
+    * - `toolchain-riscv-pulp <https://registry.platformio.org/tools/platformio/toolchain-riscv-pulp>`__
       - GNU toolchain for RISC-V (PULP platform)
 
 .. warning::
diff --git a/platforms/shakti.rst b/platforms/shakti.rst
index 33bc5c0f0d..ea62606a98 100644
--- a/platforms/shakti.rst
+++ b/platforms/shakti.rst
@@ -141,19 +141,19 @@ Packages
     * - Name
       - Description
 
-    * - `framework-shakti-sdk <https://gitlab.com/shaktiproject/software/shakti-sdk.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-shakti-sdk <https://registry.platformio.org/tools/platformio/framework-shakti-sdk>`__
       - A software development kit for developing applications on Shakti class of processors
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-openocd-riscv <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-riscv <https://registry.platformio.org/tools/platformio/tool-openocd-riscv>`__
       - Fork of Open On-Chip Debugger that has RISC-V support
 
-    * - `tool-qemu-riscv <https://www.qemu.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-qemu-riscv <https://registry.platformio.org/tools/platformio/tool-qemu-riscv>`__
       - QEMU is a generic and open source machine emulator and virtualizer
 
-    * - `toolchain-riscv <https://github.com/riscv/riscv-gnu-toolchain.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-riscv <https://registry.platformio.org/tools/platformio/toolchain-riscv>`__
       - GNU toolchain for RISC-V, including GCC
 
 .. warning::
diff --git a/platforms/sifive.rst b/platforms/sifive.rst
index 87ab23db1c..ed08cd7d4d 100644
--- a/platforms/sifive.rst
+++ b/platforms/sifive.rst
@@ -157,37 +157,37 @@ Packages
     * - Name
       - Description
 
-    * - `framework-freedom-e-sdk <https://github.com/sifive/freedom-e-sdk.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-freedom-e-sdk <https://registry.platformio.org/tools/platformio/framework-freedom-e-sdk>`__
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-openocd-riscv <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd-riscv <https://registry.platformio.org/tools/platformio/tool-openocd-riscv>`__
       - Fork of Open On-Chip Debugger that has RISC-V support
 
-    * - `tool-qemu-riscv <https://www.qemu.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-qemu-riscv <https://registry.platformio.org/tools/platformio/tool-qemu-riscv>`__
       - QEMU is a generic and open source machine emulator and virtualizer
 
-    * - `tool-renode <https://renode.io?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-renode <https://registry.platformio.org/tools/platformio/tool-renode>`__
       - Renode is a development framework which accelerates IoT and embedded systems development by letting you simulate physical hardware systems
 
-    * - `toolchain-riscv <https://github.com/riscv/riscv-gnu-toolchain.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-riscv <https://registry.platformio.org/tools/platformio/toolchain-riscv>`__
       - GNU toolchain for RISC-V, including GCC
 
 .. warning::
diff --git a/platforms/siliconlabsefm32.rst b/platforms/siliconlabsefm32.rst
index 50c23cf96f..fb35687624 100644
--- a/platforms/siliconlabsefm32.rst
+++ b/platforms/siliconlabsefm32.rst
@@ -159,28 +159,28 @@ Packages
     * - Name
       - Description
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/ststm32.rst b/platforms/ststm32.rst
index 4f44fbcd41..479a8431ea 100644
--- a/platforms/ststm32.rst
+++ b/platforms/ststm32.rst
@@ -1464,142 +1464,142 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduino-mbed <https://www.arduino.cc/reference/en?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduino-mbed <https://registry.platformio.org/tools/platformio/framework-arduino-mbed>`__
       - Arduino framework supporting mbed-enabled boards
 
-    * - `framework-arduinostm32mxchip <https://microsoft.github.io/azure-iot-developer-kit/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinostm32mxchip <https://registry.platformio.org/tools/platformio/framework-arduinostm32mxchip>`__
       - Arduino Wiring-based Framework for the Azure MXChip IoT DevKit
 
-    * - `framework-arduinoststm32 <https://github.com/stm32duino/Arduino_Core_STM32.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoststm32 <https://registry.platformio.org/tools/platformio/framework-arduinoststm32>`__
       - Arduino Wiring-based Framework for ST STM32 microcontrollers
 
-    * - `framework-arduinoststm32-maple <https://github.com/rogerclarkmelbourne/Arduino_STM32.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoststm32-maple <https://registry.platformio.org/tools/platformio/framework-arduinoststm32-maple>`__
       - Arduino Wiring-based Framework for ST STM32 microcontrollers (Maple Core)
 
-    * - `framework-arduinoststm32l0 <https://github.com/GrumpyOldPizza/ArduinoCore-stm32l0.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoststm32l0 <https://registry.platformio.org/tools/platformio/framework-arduinoststm32l0>`__
       - Arduino Wiring-based Framework for ST STM32 microcontrollers (ST STM32L0 Core)
 
-    * - `framework-cmsis <http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis <https://registry.platformio.org/tools/platformio/framework-cmsis>`__
       - Vendor-independent hardware abstraction layer for the Cortex-M processor series
 
-    * - `framework-cmsis-stm32f0 <https://github.com/STMicroelectronics/cmsis_device_f0.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32f0 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32f0>`__
       - CMSIS component for the STMicroelectronics STM32F0 series
 
-    * - `framework-cmsis-stm32f1 <https://github.com/STMicroelectronics/cmsis_device_f1.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32f1 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32f1>`__
       - CMSIS component for the STMicroelectronics STM32F1 series
 
-    * - `framework-cmsis-stm32f2 <https://github.com/STMicroelectronics/cmsis_device_f2.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32f2 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32f2>`__
       - CMSIS component for the STMicroelectronics STM32F2 series
 
-    * - `framework-cmsis-stm32f3 <https://github.com/STMicroelectronics/cmsis_device_f3.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32f3 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32f3>`__
       - CMSIS component for the STMicroelectronics STM32F3 series
 
-    * - `framework-cmsis-stm32f4 <https://github.com/STMicroelectronics/cmsis_device_f4.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32f4 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32f4>`__
       - CMSIS component for the STMicroelectronics STM32F4 series
 
-    * - `framework-cmsis-stm32f7 <https://github.com/STMicroelectronics/cmsis_device_f7.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32f7 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32f7>`__
       - CMSIS component for the STMicroelectronics STM32F7 series
 
-    * - `framework-cmsis-stm32g0 <https://github.com/STMicroelectronics/cmsis_device_g0.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32g0 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32g0>`__
       - CMSIS component for the STMicroelectronics STM32G0 series
 
-    * - `framework-cmsis-stm32g4 <https://github.com/STMicroelectronics/cmsis_device_g4.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32g4 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32g4>`__
       - CMSIS component for the STMicroelectronics STM32G4 series
 
-    * - `framework-cmsis-stm32h7 <https://github.com/STMicroelectronics/cmsis_device_h7.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32h7 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32h7>`__
       - CMSIS component for the STMicroelectronics STM32H7 series
 
-    * - `framework-cmsis-stm32l0 <https://github.com/STMicroelectronics/cmsis_device_l0.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32l0 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32l0>`__
       - CMSIS component for the STMicroelectronics STM32L0 series
 
-    * - `framework-cmsis-stm32l1 <https://github.com/STMicroelectronics/cmsis_device_l1.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32l1 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32l1>`__
       - CMSIS component for the STMicroelectronics STM32L1 series
 
-    * - `framework-cmsis-stm32l4 <https://github.com/STMicroelectronics/cmsis_device_l4.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32l4 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32l4>`__
       - CMSIS component for the STMicroelectronics STM32L4 series
 
-    * - `framework-cmsis-stm32l5 <https://github.com/STMicroelectronics/cmsis_device_l5.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-cmsis-stm32l5 <https://registry.platformio.org/tools/platformio/framework-cmsis-stm32l5>`__
       - CMSIS component for the STMicroelectronics STM32L5 series
 
-    * - `framework-libopencm3 <http://www.libopencm3.org/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-libopencm3 <https://registry.platformio.org/tools/platformio/framework-libopencm3>`__
       - Open source ARM Cortex-M microcontroller library
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-spl <http://www.st.com/web/catalog/tools/FM147/CL1794/SC961/SS1743/PF257890?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-spl <https://registry.platformio.org/tools/platformio/framework-spl>`__
       - Standard Peripheral Library for ST STM32 microcontrollers
 
-    * - `framework-stm32cubef0 <https://github.com/STMicroelectronics/STM32CubeF0?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubef0 <https://registry.platformio.org/tools/platformio/framework-stm32cubef0>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeF0 MCU Firmware Package)
 
-    * - `framework-stm32cubef1 <https://github.com/STMicroelectronics/STM32CubeF1?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubef1 <https://registry.platformio.org/tools/platformio/framework-stm32cubef1>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeF1 MCU Firmware Package)
 
-    * - `framework-stm32cubef2 <https://github.com/STMicroelectronics/STM32CubeF2?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubef2 <https://registry.platformio.org/tools/platformio/framework-stm32cubef2>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeF2 MCU Firmware Package)
 
-    * - `framework-stm32cubef3 <https://github.com/STMicroelectronics/STM32CubeF3?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubef3 <https://registry.platformio.org/tools/platformio/framework-stm32cubef3>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeF3 MCU Firmware Package)
 
-    * - `framework-stm32cubef4 <https://github.com/STMicroelectronics/STM32CubeF4?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubef4 <https://registry.platformio.org/tools/platformio/framework-stm32cubef4>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeF4 MCU Firmware Package)
 
-    * - `framework-stm32cubef7 <https://github.com/STMicroelectronics/STM32CubeF7?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubef7 <https://registry.platformio.org/tools/platformio/framework-stm32cubef7>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeF7 MCU Firmware Package)
 
-    * - `framework-stm32cubeg0 <https://github.com/STMicroelectronics/STM32CubeG0?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubeg0 <https://registry.platformio.org/tools/platformio/framework-stm32cubeg0>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeG0 MCU Firmware Package)
 
-    * - `framework-stm32cubeg4 <https://github.com/STMicroelectronics/STM32CubeG4?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubeg4 <https://registry.platformio.org/tools/platformio/framework-stm32cubeg4>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeG4 MCU Firmware Package)
 
-    * - `framework-stm32cubeh7 <https://github.com/STMicroelectronics/STM32CubeH7?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubeh7 <https://registry.platformio.org/tools/platformio/framework-stm32cubeh7>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeH7 MCU Firmware Package)
 
-    * - `framework-stm32cubel0 <https://github.com/STMicroelectronics/STM32CubeL0?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubel0 <https://registry.platformio.org/tools/platformio/framework-stm32cubel0>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeL0 MCU Firmware Package)
 
-    * - `framework-stm32cubel1 <https://github.com/STMicroelectronics/STM32CubeL1?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubel1 <https://registry.platformio.org/tools/platformio/framework-stm32cubel1>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeL1 MCU Firmware Package)
 
-    * - `framework-stm32cubel4 <https://github.com/STMicroelectronics/STM32CubeL4?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubel4 <https://registry.platformio.org/tools/platformio/framework-stm32cubel4>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeL4 MCU Firmware Package)
 
-    * - `framework-stm32cubel5 <https://github.com/STMicroelectronics/STM32CubeL5?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-stm32cubel5 <https://registry.platformio.org/tools/platformio/framework-stm32cubel5>`__
       - STM32Cube is a set of tools and embedded software bricks available free of charge to enable fast and easy development on the STM32 platform (STM32CubeL5 MCU Firmware Package)
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dfuutil <http://dfu-util.sourceforge.net/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dfuutil <https://registry.platformio.org/tools/platformio/tool-dfuutil>`__
       - Device Firmware Upgrade Utilities
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ldscripts-ststm32 <https://www.st.com/en/development-tools/stm32cubemx.html?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ldscripts-ststm32 <https://registry.platformio.org/tools/platformio/tool-ldscripts-ststm32>`__
       - Linker scripts pack for STMicroelectronics STM32 platform
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `tool-stm32duino <https://www.stm32duino.com?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-stm32duino <https://registry.platformio.org/tools/platformio/tool-stm32duino>`__
       - STM32Duino Tools
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/ststm8.rst b/platforms/ststm8.rst
index abf1698de4..804ffeb02c 100644
--- a/platforms/ststm8.rst
+++ b/platforms/ststm8.rst
@@ -178,25 +178,25 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinoststm8 <https://tenbaht.github.io/sduino/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoststm8 <https://registry.platformio.org/tools/platformio/framework-arduinoststm8>`__
       - An Arduino-like programming API for the STM8 microcontrollers
 
-    * - `framework-ststm8spl <https://www.st.com/en/embedded-software/stsw-stm8069.html?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-ststm8spl <https://registry.platformio.org/tools/platformio/framework-ststm8spl>`__
       - Standard peripheral library for ST STM8S/A microcontrollers
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `tool-stm8binutils <https://stm8-binutils-gdb.sourceforge.io/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-stm8binutils <https://registry.platformio.org/tools/platformio/tool-stm8binutils>`__
       - STM8 toolchain with GDB debugger
 
-    * - `tool-stm8flash <https://github.com/vdudouyt/stm8flash.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-stm8flash <https://registry.platformio.org/tools/platformio/tool-stm8flash>`__
       - stm8flash is an application for programing stm8 devices with SWIM/stlinkv(1,2).
 
-    * - `tool-stm8gal <https://github.com/gicking/stm8gal.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-stm8gal <https://registry.platformio.org/tools/platformio/tool-stm8gal>`__
       - stm8gal is an application for programming or reading out STM8 memory using the built-in ROM bootloader (BSL) via UART or SPI interface
 
-    * - `toolchain-sdcc <http://sdcc.sourceforge.net?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-sdcc <https://registry.platformio.org/tools/platformio/toolchain-sdcc>`__
       - Small Device C compiler suite
 
 .. warning::
diff --git a/platforms/teensy.rst b/platforms/teensy.rst
index d4561605f4..444c2b443c 100644
--- a/platforms/teensy.rst
+++ b/platforms/teensy.rst
@@ -158,37 +158,37 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinoteensy <https://www.arduino.cc/reference/en?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-arduinoteensy <https://registry.platformio.org/tools/platformio/framework-arduinoteensy>`__
       - Arduino Wiring-based Framework for Teensy boards
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `framework-zephyr <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-zephyr <https://registry.platformio.org/tools/platformio/framework-zephyr>`__
       - Zephyr is a new generation, scalable, optimized, secure RTOS for multiple hardware architectures
 
-    * - `tool-cmake <https://cmake.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-cmake <https://registry.platformio.org/tools/platformio/tool-cmake>`__
       - CMake is an open-source, cross-platform family of tools designed to build, test and package software.
 
-    * - `tool-dtc <https://git.kernel.org/pub/scm/utils/dtc/dtc.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dtc <https://registry.platformio.org/tools/platformio/tool-dtc>`__
       - Device tree compiler
 
-    * - `tool-gperf <https://www.gnu.org/software/gperf?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-gperf <https://registry.platformio.org/tools/platformio/tool-gperf>`__
       - GNU gperf is a perfect hash function generator
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-ninja <https://ninja-build.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-ninja <https://registry.platformio.org/tools/platformio/tool-ninja>`__
       - Ninja is a small build system with a focus on speed
 
-    * - `tool-teensy <https://www.pjrc.com/teensy/loader.html?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-teensy <https://registry.platformio.org/tools/platformio/tool-teensy>`__
       - Upload tools for Teensy boards
 
-    * - `toolchain-atmelavr <https://gcc.gnu.org/wiki/avr-gcc?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-atmelavr <https://registry.platformio.org/tools/platformio/toolchain-atmelavr>`__
       - GCC Toolchain for Microchip AVR microcontrollers
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/timsp430.rst b/platforms/timsp430.rst
index ab8dde2457..13b0437497 100644
--- a/platforms/timsp430.rst
+++ b/platforms/timsp430.rst
@@ -175,16 +175,16 @@ Packages
     * - Name
       - Description
 
-    * - `framework-energiamsp430 <http://energia.nu/reference/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-energiamsp430 <https://registry.platformio.org/tools/platformio/framework-energiamsp430>`__
       - Energia Wiring-based Framework for Texas Instruments MSP430 microcontrollers
 
-    * - `tool-dslite <http://www.ti.com/tool/UNIFLASH?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-dslite <https://registry.platformio.org/tools/platformio/tool-dslite>`__
       - Uniflash Standalone Flash Tool for TI Microcontrollers, Sitara Processors & SimpleLink devices
 
-    * - `tool-mspdebug <https://dlbeer.co.nz/mspdebug/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-mspdebug <https://registry.platformio.org/tools/platformio/tool-mspdebug>`__
       - MSPDebug is a free debugger for use with MSP430 MCUs
 
-    * - `toolchain-timsp430 <https://sourceforge.net/projects/mspgcc/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-timsp430 <https://registry.platformio.org/tools/platformio/toolchain-timsp430>`__
       - A port of the GNU C Compiler (GCC) and GNU Binutils (as, ld) for the embedded processor MSP430
 
 .. warning::
diff --git a/platforms/titiva.rst b/platforms/titiva.rst
index 46ab1bffc7..65f10794cc 100644
--- a/platforms/titiva.rst
+++ b/platforms/titiva.rst
@@ -132,16 +132,16 @@ Packages
     * - Name
       - Description
 
-    * - `framework-energiativa <http://energia.nu/reference/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-energiativa <https://registry.platformio.org/tools/platformio/framework-energiativa>`__
       - Energia Wiring-based Framework for Texas Instruments TIVA C Series
 
-    * - `framework-libopencm3 <http://www.libopencm3.org/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-libopencm3 <https://registry.platformio.org/tools/platformio/framework-libopencm3>`__
       - Open source ARM Cortex-M microcontroller library
 
-    * - `tool-openocd <http://openocd.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-openocd <https://registry.platformio.org/tools/platformio/tool-openocd>`__
       - Open On-Chip Debugger. Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::
diff --git a/platforms/windows_x86.rst b/platforms/windows_x86.rst
index 5ba7871e33..98c6fe4445 100644
--- a/platforms/windows_x86.rst
+++ b/platforms/windows_x86.rst
@@ -74,5 +74,5 @@ Packages
     * - Name
       - Description
 
-    * - `toolchain-gccmingw32 <http://www.mingw.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccmingw32 <https://registry.platformio.org/tools/platformio/toolchain-gccmingw32>`__
       - MinGW - Minimalist GNU for Windows
\ No newline at end of file
diff --git a/platforms/wiznet7500.rst b/platforms/wiznet7500.rst
index a2938e490f..29579c6d46 100644
--- a/platforms/wiznet7500.rst
+++ b/platforms/wiznet7500.rst
@@ -132,16 +132,16 @@ Packages
     * - Name
       - Description
 
-    * - `framework-mbed <http://mbed.org?utm_source=platformio.org&utm_medium=docs>`__
+    * - `framework-mbed <https://registry.platformio.org/tools/platformio/framework-mbed>`__
       - Arm Mbed OS is a platform operating system designed for the internet of things
 
-    * - `tool-jlink <https://www.segger.com/downloads/jlink/?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
       - Software and Documentation Pack for SEGGER J-Link debug probes
 
-    * - `tool-pyocd <https://github.com/pyocd/pyOCD.git?utm_source=platformio.org&utm_medium=docs>`__
+    * - `tool-pyocd <https://registry.platformio.org/tools/platformio/tool-pyocd>`__
       - Open source python library for programming and debugging ARM Cortex-M microcontrollers using CMSIS-DAP
 
-    * - `toolchain-gccarmnoneeabi <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm?utm_source=platformio.org&utm_medium=docs>`__
+    * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
 .. warning::

From 9f102bdcf74a1e5fe7e2f829d8ca6fe9aa31b6e9 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 1 Feb 2022 20:13:02 +0200
Subject: [PATCH 15/17] Sync docs with the registry

---
 boards/asrmicro650x/cubecell_board_pro.rst    |  79 -----
 .../cubecell_capsule_solar_sensor.rst         |   4 +-
 boards/atmelavr/controllino_maxi.rst          |   2 +-
 .../atmelavr/controllino_maxi_automation.rst  |   2 +-
 boards/atmelavr/controllino_mega.rst          |   2 +-
 boards/atmelavr/controllino_mini.rst          |   2 +-
 boards/atmelmegaavr/ATtiny1624.rst            |  79 -----
 boards/atmelmegaavr/ATtiny1626.rst            |  79 -----
 boards/atmelmegaavr/ATtiny1627.rst            |  79 -----
 boards/atmelmegaavr/ATtiny3224.rst            |  79 -----
 boards/atmelmegaavr/ATtiny3226.rst            |  79 -----
 boards/atmelmegaavr/ATtiny3227.rst            |  79 -----
 boards/atmelmegaavr/ATtiny424.rst             |  79 -----
 boards/atmelmegaavr/ATtiny426.rst             |  79 -----
 boards/atmelmegaavr/ATtiny427.rst             |  79 -----
 boards/atmelmegaavr/ATtiny824.rst             |  79 -----
 boards/atmelmegaavr/ATtiny826.rst             |  79 -----
 boards/atmelmegaavr/ATtiny827.rst             |  79 -----
 boards/atmelmegaavr/AVR128DA28.rst            |  79 -----
 boards/atmelmegaavr/AVR128DA32.rst            |  79 -----
 boards/atmelmegaavr/AVR128DA48.rst            |  79 -----
 boards/atmelmegaavr/AVR128DA64.rst            |  79 -----
 boards/atmelmegaavr/AVR128DB28.rst            |  79 -----
 boards/atmelmegaavr/AVR128DB32.rst            |  79 -----
 boards/atmelmegaavr/AVR128DB48.rst            |  79 -----
 boards/atmelmegaavr/AVR128DB64.rst            |  79 -----
 boards/atmelmegaavr/AVR32DA28.rst             |  79 -----
 boards/atmelmegaavr/AVR32DA32.rst             |  79 -----
 boards/atmelmegaavr/AVR32DA48.rst             |  79 -----
 boards/atmelmegaavr/AVR32DB28.rst             |  79 -----
 boards/atmelmegaavr/AVR32DB32.rst             |  79 -----
 boards/atmelmegaavr/AVR32DB48.rst             |  79 -----
 boards/atmelmegaavr/AVR64DA28.rst             |  79 -----
 boards/atmelmegaavr/AVR64DA32.rst             |  79 -----
 boards/atmelmegaavr/AVR64DA48.rst             |  79 -----
 boards/atmelmegaavr/AVR64DA64.rst             |  79 -----
 boards/atmelmegaavr/AVR64DB28.rst             |  79 -----
 boards/atmelmegaavr/AVR64DB32.rst             |  79 -----
 boards/atmelmegaavr/AVR64DB48.rst             |  79 -----
 boards/atmelmegaavr/AVR64DB64.rst             |  79 -----
 boards/atmelmegaavr/AVR64DD14.rst             |  79 -----
 boards/atmelmegaavr/AVR64DD20.rst             |  79 -----
 boards/atmelmegaavr/AVR64DD28.rst             |  79 -----
 boards/atmelmegaavr/AVR64DD32.rst             |  79 -----
 boards/atmelmegaavr/curiosity_nano_da.rst     |  79 -----
 boards/atmelmegaavr/curiosity_nano_db.rst     |  79 -----
 boards/espressif8266/wifi_slot.rst            |   2 +-
 boards/index.rst                              |  52 ---
 boards/microchippic32/picadillo_35t.rst       |  10 +-
 boards/nuclei/gd32vf103c_longan_nano.rst      | 131 -------
 boards/nuclei/gd32vf103v_eval.rst             | 131 -------
 boards/nuclei/gd32vf103v_rvstar.rst           | 131 -------
 boards/nuclei/hbird_eval.rst                  | 100 ------
 boards/raspberrypi/nanorp2040connect.rst      |   2 +-
 boards/raspberrypi/pico.rst                   |   2 +-
 boards/sifive/e310-arty.rst                   |   8 +-
 boards/sifive/hifive-unleashed.rst            |   8 +-
 boards/sifive/hifive1-revb.rst                |   6 +-
 boards/sifive/hifive1.rst                     |   6 +-
 boards/sifive/sparkfun_redboard_v.rst         |   6 +-
 boards/sifive/sparkfun_thing_plus_v.rst       |   6 +-
 boards/ststm32/1bitsy_stm32f415rgt.rst        |   8 +-
 boards/ststm32/adafruit_feather_f405.rst      |   8 +-
 boards/ststm32/afroflight_f103cb.rst          |   8 +-
 boards/ststm32/armed_v1.rst                   |   8 +-
 boards/ststm32/armstrap_eagle1024.rst         |   8 +-
 boards/ststm32/armstrap_eagle2048.rst         |   8 +-
 boards/ststm32/armstrap_eagle512.rst          |   8 +-
 boards/ststm32/b96b_aerocore2.rst             |   8 +-
 boards/ststm32/b96b_argonkey.rst              |   8 +-
 boards/ststm32/b96b_f446ve.rst                |   8 +-
 boards/ststm32/b96b_neonkey.rst               |   8 +-
 boards/ststm32/black_f407ve.rst               |   8 +-
 boards/ststm32/black_f407vg.rst               |   8 +-
 boards/ststm32/black_f407ze.rst               |   8 +-
 boards/ststm32/black_f407zg.rst               |   8 +-
 boards/ststm32/blackpill_f103c8.rst           |   8 +-
 boards/ststm32/blackpill_f103c8_128.rst       |   8 +-
 boards/ststm32/blackpill_f401cc.rst           |   8 +-
 boards/ststm32/blackpill_f401ce.rst           |   8 +-
 boards/ststm32/blackpill_f411ce.rst           |   8 +-
 boards/ststm32/blue_f407ve_mini.rst           |   8 +-
 boards/ststm32/bluepill_f103c6.rst            |   8 +-
 boards/ststm32/bluepill_f103c8.rst            |   8 +-
 boards/ststm32/bluepill_f103c8_128k.rst       |   8 +-
 boards/ststm32/cloud_jam.rst                  |  10 +-
 boards/ststm32/cloud_jam_l4.rst               |   8 +-
 boards/ststm32/coreboard_f401rc.rst           |   8 +-
 boards/ststm32/demo_f030f4.rst                |   8 +-
 boards/ststm32/disco_f030r8.rst               |   8 +-
 boards/ststm32/disco_f051r8.rst               |   8 +-
 boards/ststm32/disco_f072rb.rst               |   8 +-
 boards/ststm32/disco_f100rb.rst               |   8 +-
 boards/ststm32/disco_f303vc.rst               |  14 +-
 boards/ststm32/disco_f334c8.rst               |   8 +-
 boards/ststm32/disco_f401vc.rst               |   8 +-
 boards/ststm32/disco_f407vg.rst               |  14 +-
 boards/ststm32/disco_f411ve.rst               |   8 +-
 boards/ststm32/disco_f412zg.rst               |   8 +-
 boards/ststm32/disco_f413zh.rst               |   8 +-
 boards/ststm32/disco_f429zi.rst               |   8 +-
 boards/ststm32/disco_f469ni.rst               |   8 +-
 boards/ststm32/disco_f723ie.rst               |   8 +-
 boards/ststm32/disco_f746ng.rst               |   8 +-
 boards/ststm32/disco_f750n8.rst               |   8 +-
 boards/ststm32/disco_f769ni.rst               |   8 +-
 boards/ststm32/disco_g031j6.rst               |   8 +-
 boards/ststm32/disco_g071rb.rst               |   8 +-
 boards/ststm32/disco_h747xi.rst               |   8 +-
 boards/ststm32/disco_l053c8.rst               |   8 +-
 boards/ststm32/disco_l072cz_lrwan1.rst        |   8 +-
 boards/ststm32/disco_l100rc.rst               |   8 +-
 boards/ststm32/disco_l152rb.rst               |   8 +-
 boards/ststm32/disco_l475vg_iot01a.rst        |   8 +-
 boards/ststm32/disco_l476vg.rst               |   8 +-
 boards/ststm32/disco_l496ag.rst               |   8 +-
 boards/ststm32/diymore_f407vgt.rst            |   8 +-
 boards/ststm32/elektor_f072c8.rst             |   8 +-
 boards/ststm32/elektor_f072cb.rst             |   8 +-
 boards/ststm32/elmo_f411re.rst                |   8 +-
 boards/ststm32/eval_f072vb.rst                |   8 +-
 boards/ststm32/eval_f107vc.rst                |   8 +-
 boards/ststm32/eval_f373vc.rst                |   8 +-
 boards/ststm32/eval_l073z.rst                 |   8 +-
 boards/ststm32/fk407m1.rst                    |   8 +-
 boards/ststm32/fysetc_s6.rst                  |   8 +-
 boards/ststm32/genericSTM32F103C4.rst         |   8 +-
 boards/ststm32/genericSTM32F103C6.rst         |   8 +-
 boards/ststm32/genericSTM32F103C8.rst         |   8 +-
 boards/ststm32/genericSTM32F103CB.rst         |   8 +-
 boards/ststm32/genericSTM32F103R4.rst         |   8 +-
 boards/ststm32/genericSTM32F103R6.rst         |   8 +-
 boards/ststm32/genericSTM32F103R8.rst         |   8 +-
 boards/ststm32/genericSTM32F103RB.rst         |   8 +-
 boards/ststm32/genericSTM32F103RC.rst         |   8 +-
 boards/ststm32/genericSTM32F103RD.rst         |   8 +-
 boards/ststm32/genericSTM32F103RE.rst         |   8 +-
 boards/ststm32/genericSTM32F103RF.rst         |   8 +-
 boards/ststm32/genericSTM32F103RG.rst         |   8 +-
 boards/ststm32/genericSTM32F103T4.rst         |   8 +-
 boards/ststm32/genericSTM32F103T6.rst         |   8 +-
 boards/ststm32/genericSTM32F103T8.rst         |   8 +-
 boards/ststm32/genericSTM32F103TB.rst         |   8 +-
 boards/ststm32/genericSTM32F103V8.rst         |   8 +-
 boards/ststm32/genericSTM32F103VB.rst         |   8 +-
 boards/ststm32/genericSTM32F103VC.rst         |   8 +-
 boards/ststm32/genericSTM32F103VD.rst         |   8 +-
 boards/ststm32/genericSTM32F103VE.rst         |   8 +-
 boards/ststm32/genericSTM32F103VF.rst         |   8 +-
 boards/ststm32/genericSTM32F103VG.rst         |   8 +-
 boards/ststm32/genericSTM32F103ZC.rst         |   8 +-
 boards/ststm32/genericSTM32F103ZD.rst         |   8 +-
 boards/ststm32/genericSTM32F103ZE.rst         |   8 +-
 boards/ststm32/genericSTM32F103ZF.rst         |   8 +-
 boards/ststm32/genericSTM32F103ZG.rst         |   8 +-
 boards/ststm32/genericSTM32F303CB.rst         |   8 +-
 boards/ststm32/genericSTM32F401CB.rst         |   8 +-
 boards/ststm32/genericSTM32F401CC.rst         |   8 +-
 boards/ststm32/genericSTM32F401CD.rst         |   8 +-
 boards/ststm32/genericSTM32F401CE.rst         |   8 +-
 boards/ststm32/genericSTM32F401RB.rst         |   8 +-
 boards/ststm32/genericSTM32F401RC.rst         |   8 +-
 boards/ststm32/genericSTM32F401RD.rst         |   8 +-
 boards/ststm32/genericSTM32F401RE.rst         |   8 +-
 boards/ststm32/genericSTM32F405RG.rst         |   8 +-
 boards/ststm32/genericSTM32F407IGT6.rst       |   8 +-
 boards/ststm32/genericSTM32F407VET6.rst       |   8 +-
 boards/ststm32/genericSTM32F407VGT6.rst       |   8 +-
 boards/ststm32/genericSTM32F410C8.rst         |   8 +-
 boards/ststm32/genericSTM32F410CB.rst         |   8 +-
 boards/ststm32/genericSTM32F410R8.rst         |   8 +-
 boards/ststm32/genericSTM32F410RB.rst         |   8 +-
 boards/ststm32/genericSTM32F411CC.rst         |   8 +-
 boards/ststm32/genericSTM32F411CE.rst         |   8 +-
 boards/ststm32/genericSTM32F411RC.rst         |   8 +-
 boards/ststm32/genericSTM32F411RE.rst         |   8 +-
 boards/ststm32/genericSTM32F412CE.rst         |   8 +-
 boards/ststm32/genericSTM32F412CG.rst         |   8 +-
 boards/ststm32/genericSTM32F412RE.rst         |   8 +-
 boards/ststm32/genericSTM32F412RG.rst         |   8 +-
 boards/ststm32/genericSTM32F413CG.rst         |   8 +-
 boards/ststm32/genericSTM32F413CH.rst         |   8 +-
 boards/ststm32/genericSTM32F413RG.rst         |   8 +-
 boards/ststm32/genericSTM32F413RH.rst         |   8 +-
 boards/ststm32/genericSTM32F415RG.rst         |   8 +-
 boards/ststm32/genericSTM32F417VE.rst         |   8 +-
 boards/ststm32/genericSTM32F417VG.rst         |   8 +-
 boards/ststm32/genericSTM32F423CH.rst         |   8 +-
 boards/ststm32/genericSTM32F423RH.rst         |   8 +-
 boards/ststm32/genericSTM32F446RC.rst         |   8 +-
 boards/ststm32/genericSTM32F446RE.rst         |   8 +-
 boards/ststm32/hy_tinystm103tb.rst            |   8 +-
 boards/ststm32/malyanm200_f070cb.rst          |   8 +-
 boards/ststm32/malyanm200_f103cb.rst          |   8 +-
 boards/ststm32/malyanm300_f070cb.rst          |   8 +-
 boards/ststm32/maple.rst                      |   8 +-
 boards/ststm32/maple_mini_b20.rst             |   8 +-
 boards/ststm32/maple_mini_origin.rst          |   8 +-
 boards/ststm32/maple_ret6.rst                 |   8 +-
 boards/ststm32/mbed_connect_odin.rst          |   8 +-
 boards/ststm32/microduino32_flash.rst         |   8 +-
 boards/ststm32/mote_l152rc.rst                |   8 +-
 boards/ststm32/mts_dragonfly_f411re.rst       |   8 +-
 boards/ststm32/mts_mdot_f405rg.rst            |   8 +-
 boards/ststm32/mts_mdot_f411re.rst            |   8 +-
 boards/ststm32/mxchip_az3166.rst              |   8 +-
 boards/ststm32/netduino2plus.rst              |   8 +-
 boards/ststm32/nucleo_f030r8.rst              |   8 +-
 boards/ststm32/nucleo_f031k6.rst              |   8 +-
 boards/ststm32/nucleo_f042k6.rst              |   8 +-
 boards/ststm32/nucleo_f070rb.rst              |   8 +-
 boards/ststm32/nucleo_f072rb.rst              |   8 +-
 boards/ststm32/nucleo_f091rc.rst              |   8 +-
 boards/ststm32/nucleo_f103rb.rst              |   8 +-
 boards/ststm32/nucleo_f207zg.rst              |   8 +-
 boards/ststm32/nucleo_f302r8.rst              |   8 +-
 boards/ststm32/nucleo_f303k8.rst              |   8 +-
 boards/ststm32/nucleo_f303re.rst              |   8 +-
 boards/ststm32/nucleo_f303ze.rst              |   8 +-
 boards/ststm32/nucleo_f334r8.rst              |   8 +-
 boards/ststm32/nucleo_f401re.rst              |  14 +-
 boards/ststm32/nucleo_f410rb.rst              |   8 +-
 boards/ststm32/nucleo_f411re.rst              |   8 +-
 boards/ststm32/nucleo_f412zg.rst              |   8 +-
 boards/ststm32/nucleo_f413zh.rst              |   8 +-
 boards/ststm32/nucleo_f429zi.rst              |   8 +-
 boards/ststm32/nucleo_f439zi.rst              |   8 +-
 boards/ststm32/nucleo_f446re.rst              |   8 +-
 boards/ststm32/nucleo_f446ze.rst              |   8 +-
 boards/ststm32/nucleo_f722ze.rst              |   8 +-
 boards/ststm32/nucleo_f746zg.rst              |   8 +-
 boards/ststm32/nucleo_f756zg.rst              |   8 +-
 boards/ststm32/nucleo_f767zi.rst              |   8 +-
 boards/ststm32/nucleo_g071rb.rst              |   8 +-
 boards/ststm32/nucleo_g431kb.rst              |   8 +-
 boards/ststm32/nucleo_g431rb.rst              |   8 +-
 boards/ststm32/nucleo_g474re.rst              |   8 +-
 boards/ststm32/nucleo_l011k4.rst              |   8 +-
 boards/ststm32/nucleo_l031k6.rst              |   8 +-
 boards/ststm32/nucleo_l053r8.rst              |   8 +-
 boards/ststm32/nucleo_l073rz.rst              |   8 +-
 boards/ststm32/nucleo_l152re.rst              |   8 +-
 boards/ststm32/nucleo_l432kc.rst              |   8 +-
 boards/ststm32/nucleo_l433rc_p.rst            |   8 +-
 boards/ststm32/nucleo_l452re.rst              |   8 +-
 boards/ststm32/nucleo_l476rg.rst              |   8 +-
 boards/ststm32/nucleo_l486rg.rst              |   8 +-
 boards/ststm32/nucleo_l496zg.rst              |   8 +-
 boards/ststm32/nucleo_l496zg_p.rst            |   8 +-
 boards/ststm32/olimex_e407.rst                |   8 +-
 boards/ststm32/olimex_f103.rst                |   8 +-
 boards/ststm32/olimex_h407.rst                |   8 +-
 boards/ststm32/olimex_p405.rst                |   8 +-
 boards/ststm32/olimexino.rst                  |   8 +-
 boards/ststm32/olimexino_stm32f3.rst          |   8 +-
 boards/ststm32/piconomix_px_her0.rst          |   8 +-
 boards/ststm32/prntr_v2.rst                   |   8 +-
 boards/ststm32/pybstick26_duino.rst           |   8 +-
 boards/ststm32/pybstick26_lite.rst            |   8 +-
 boards/ststm32/pybstick26_pro.rst             |   8 +-
 boards/ststm32/pybstick26_std.rst             |   8 +-
 boards/ststm32/rak811_tracker.rst             |   8 +-
 boards/ststm32/rak811_tracker_32.rst          |   8 +-
 boards/ststm32/remram_v1.rst                  |   8 +-
 boards/ststm32/rhf76_052.rst                  |   8 +-
 boards/ststm32/rhombio_l476dmw1k.rst          |   8 +-
 boards/ststm32/robotdyn_blackpill_f303cc.rst  |   8 +-
 boards/ststm32/rumba32_f446ve.rst             |   8 +-
 boards/ststm32/sakuraio_evb_01.rst            |   8 +-
 boards/ststm32/seeedArchMax.rst               |   8 +-
 boards/ststm32/silica_sensor_node.rst         |   8 +-
 boards/ststm32/sparky_v1.rst                  |   8 +-
 boards/ststm32/steval_fcu001v1.rst            |   8 +-
 boards/ststm32/steval_mksboxv1.rst            |   8 +-
 boards/ststm32/stm32f4stamp.rst               |   8 +-
 boards/ststm32/storm32_v1_31_rc.rst           |   8 +-
 boards/ststm32/thunder_pack.rst               |   8 +-
 boards/ststm32/thunder_pack_f411.rst          |   8 +-
 boards/ststm32/vake_v1.rst                    |   8 +-
 boards/ststm32/vccgnd_f103zet6.rst            |   8 +-
 boards/ststm32/vccgnd_f407zg_mini.rst         |   8 +-
 boards/ststm32/waveshare_open103z.rst         |   8 +-
 boards/ststm32/wio_3g.rst                     |   8 +-
 boards/ststm32/wraith32_v1.rst                |   8 +-
 boards/ststm32/xdot_l151cc.rst                |   8 +-
 frameworks/arduino.rst                        | 322 ++----------------
 frameworks/cmsis.rst                          |   3 -
 frameworks/esp8266-nonos-sdk.rst              |   3 -
 frameworks/esp8266-rtos-sdk.rst               |   3 -
 frameworks/espidf.rst                         |   3 -
 frameworks/freedom-e-sdk.rst                  |   3 -
 frameworks/freertos.rst                       |   3 -
 frameworks/gd32vf103-sdk.rst                  |   3 -
 frameworks/index.rst                          |   2 -
 frameworks/kendryte-freertos-sdk.rst          |   3 -
 frameworks/kendryte-standalone-sdk.rst        |   3 -
 frameworks/libopencm3.rst                     |   3 -
 frameworks/logicromsdk.rst                    |  27 --
 frameworks/mbed.rst                           |   3 -
 frameworks/nuclei-sdk.rst                     | 189 ----------
 frameworks/pulp-os.rst                        |   3 -
 frameworks/pulp-runtime.rst                   |   3 -
 frameworks/pulp-sdk.rst                       |   3 -
 frameworks/pumbaa.rst                         |   3 -
 frameworks/shakti-sdk.rst                     |   3 -
 frameworks/simba.rst                          |   3 -
 frameworks/spl.rst                            |   3 -
 frameworks/stm32cube.rst                      |   3 -
 frameworks/wd-riscv-sdk.rst                   |   3 -
 frameworks/wiringpi.rst                       |   3 -
 frameworks/zephyr.rst                         |   3 -
 platforms/asrmicro650x.rst                    |  15 +-
 platforms/atmelmegaavr.rst                    | 243 -------------
 platforms/chipsalliance.rst                   |   1 -
 platforms/index.rst                           |   1 -
 platforms/microchippic32.rst                  |   4 +-
 platforms/nuclei.rst                          | 258 --------------
 platforms/raspberrypi.rst                     |   2 +-
 platforms/sifive.rst                          |   6 +-
 platforms/ststm32.rst                         |  12 +-
 plus/debug-tools/altera-usb-blaster.rst       |  27 --
 plus/debug-tools/blackmagic.rst               |  12 +-
 plus/debug-tools/cmsis-dap.rst                |  14 +-
 plus/debug-tools/ftdi.rst                     |   6 +-
 plus/debug-tools/gd-link.rst                  |  27 --
 plus/debug-tools/jlink.rst                    |  47 +--
 plus/debug-tools/minimodule.rst               |   6 +-
 plus/debug-tools/olimex-arm-usb-ocd-h.rst     |   6 +-
 plus/debug-tools/olimex-arm-usb-ocd.rst       |   6 +-
 plus/debug-tools/olimex-arm-usb-tiny-h.rst    |   6 +-
 plus/debug-tools/olimex-jtag-tiny.rst         |   6 +-
 plus/debug-tools/qemu.rst                     |   6 +-
 plus/debug-tools/raspberrypi-swd.rst          |   2 +-
 plus/debug-tools/renode.rst                   |   6 +-
 plus/debug-tools/rv-link.rst                  |  34 --
 plus/debug-tools/stlink.rst                   |  12 +-
 plus/debug-tools/tumpa.rst                    |   6 +-
 plus/debugging.rst                            |  82 +----
 338 files changed, 1045 insertions(+), 6078 deletions(-)
 delete mode 100644 boards/asrmicro650x/cubecell_board_pro.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny1624.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny1626.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny1627.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny3224.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny3226.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny3227.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny424.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny426.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny427.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny824.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny826.rst
 delete mode 100644 boards/atmelmegaavr/ATtiny827.rst
 delete mode 100644 boards/atmelmegaavr/AVR128DA28.rst
 delete mode 100644 boards/atmelmegaavr/AVR128DA32.rst
 delete mode 100644 boards/atmelmegaavr/AVR128DA48.rst
 delete mode 100644 boards/atmelmegaavr/AVR128DA64.rst
 delete mode 100644 boards/atmelmegaavr/AVR128DB28.rst
 delete mode 100644 boards/atmelmegaavr/AVR128DB32.rst
 delete mode 100644 boards/atmelmegaavr/AVR128DB48.rst
 delete mode 100644 boards/atmelmegaavr/AVR128DB64.rst
 delete mode 100644 boards/atmelmegaavr/AVR32DA28.rst
 delete mode 100644 boards/atmelmegaavr/AVR32DA32.rst
 delete mode 100644 boards/atmelmegaavr/AVR32DA48.rst
 delete mode 100644 boards/atmelmegaavr/AVR32DB28.rst
 delete mode 100644 boards/atmelmegaavr/AVR32DB32.rst
 delete mode 100644 boards/atmelmegaavr/AVR32DB48.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DA28.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DA32.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DA48.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DA64.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DB28.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DB32.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DB48.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DB64.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DD14.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DD20.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DD28.rst
 delete mode 100644 boards/atmelmegaavr/AVR64DD32.rst
 delete mode 100644 boards/atmelmegaavr/curiosity_nano_da.rst
 delete mode 100644 boards/atmelmegaavr/curiosity_nano_db.rst
 delete mode 100644 boards/nuclei/gd32vf103c_longan_nano.rst
 delete mode 100644 boards/nuclei/gd32vf103v_eval.rst
 delete mode 100644 boards/nuclei/gd32vf103v_rvstar.rst
 delete mode 100644 boards/nuclei/hbird_eval.rst
 delete mode 100644 frameworks/logicromsdk.rst
 delete mode 100644 frameworks/nuclei-sdk.rst
 delete mode 100644 platforms/nuclei.rst

diff --git a/boards/asrmicro650x/cubecell_board_pro.rst b/boards/asrmicro650x/cubecell_board_pro.rst
deleted file mode 100644
index a2751edb57..0000000000
--- a/boards/asrmicro650x/cubecell_board_pro.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_asrmicro650x_cubecell_board_pro:
-
-Heltec CubeCell-Board PRO (HTCC-AB03)
-=====================================
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_asrmicro650x`: ASR Microelectronics ASR650x series is highly intergrated and ultra low power SoC based on the PSoC 4000 series MCU (ARM Cortex M0+ Core) and Semtech SX1262 transceiver.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ASR6601
-  * - **Frequency**
-    - 48MHz
-  * - **Flash**
-    - 224KB
-  * - **RAM**
-    - 224KB
-  * - **Vendor**
-    - `Heltec <https://heltec.org/proudct_center?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``cubecell_board_pro`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:cubecell_board_pro]
-  platform = asrmicro650x
-  board = cubecell_board_pro
-
-You can override default Heltec CubeCell-Board PRO (HTCC-AB03) settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `cubecell_board_pro.json <https://github.com/HelTecAutomation/platform-asrmicro650x/blob/master/boards/cubecell_board_pro.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:cubecell_board_pro]
-  platform = asrmicro650x
-  board = cubecell_board_pro
-
-  ; change microcontroller
-  board_build.mcu = asr6601
-
-  ; change MCU frequency
-  board_build.f_cpu = 48000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support Heltec CubeCell-Board PRO (HTCC-AB03) board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/asrmicro650x/cubecell_capsule_solar_sensor.rst b/boards/asrmicro650x/cubecell_capsule_solar_sensor.rst
index 5367c4b8db..c0d144334f 100644
--- a/boards/asrmicro650x/cubecell_capsule_solar_sensor.rst
+++ b/boards/asrmicro650x/cubecell_capsule_solar_sensor.rst
@@ -24,7 +24,7 @@ Platform :ref:`platform_asrmicro650x`: ASR Microelectronics ASR650x series is hi
 .. list-table::
 
   * - **Microcontroller**
-    - ASR6051
+    - ASR6502
   * - **Frequency**
     - 48MHz
   * - **Flash**
@@ -58,7 +58,7 @@ board manifest `cubecell_capsule_solar_sensor.json <https://github.com/HelTecAut
   board = cubecell_capsule_solar_sensor
 
   ; change microcontroller
-  board_build.mcu = asr6051
+  board_build.mcu = asr6502
 
   ; change MCU frequency
   board_build.f_cpu = 48000000L
diff --git a/boards/atmelavr/controllino_maxi.rst b/boards/atmelavr/controllino_maxi.rst
index a93385bdbb..331d3b2bff 100644
--- a/boards/atmelavr/controllino_maxi.rst
+++ b/boards/atmelavr/controllino_maxi.rst
@@ -32,7 +32,7 @@ Platform :ref:`platform_atmelavr`: Atmel AVR 8-bit MCUs deliver a unique combina
   * - **RAM**
     - 8KB
   * - **Vendor**
-    - `Controllino <https://www.controllino.com/product/controllino-maxi/?utm_source=platformio.org&utm_medium=docs>`__
+    - `Controllino <https://controllino.biz/controllino/maxi/?utm_source=platformio.org&utm_medium=docs>`__
 
 
 Configuration
diff --git a/boards/atmelavr/controllino_maxi_automation.rst b/boards/atmelavr/controllino_maxi_automation.rst
index 84d9d0330b..e087d1097d 100644
--- a/boards/atmelavr/controllino_maxi_automation.rst
+++ b/boards/atmelavr/controllino_maxi_automation.rst
@@ -32,7 +32,7 @@ Platform :ref:`platform_atmelavr`: Atmel AVR 8-bit MCUs deliver a unique combina
   * - **RAM**
     - 8KB
   * - **Vendor**
-    - `Controllino <https://www.controllino.com/product/controllino-maxi-automation/?utm_source=platformio.org&utm_medium=docs>`__
+    - `Controllino <https://controllino.biz/controllino/maxi-automation/?utm_source=platformio.org&utm_medium=docs>`__
 
 
 Configuration
diff --git a/boards/atmelavr/controllino_mega.rst b/boards/atmelavr/controllino_mega.rst
index 1cc54f0335..b602013ebc 100644
--- a/boards/atmelavr/controllino_mega.rst
+++ b/boards/atmelavr/controllino_mega.rst
@@ -32,7 +32,7 @@ Platform :ref:`platform_atmelavr`: Atmel AVR 8-bit MCUs deliver a unique combina
   * - **RAM**
     - 8KB
   * - **Vendor**
-    - `Controllino <https://www.controllino.com/product/controllino-mega/?utm_source=platformio.org&utm_medium=docs>`__
+    - `Controllino <https://controllino.biz/controllino/mega/?utm_source=platformio.org&utm_medium=docs>`__
 
 
 Configuration
diff --git a/boards/atmelavr/controllino_mini.rst b/boards/atmelavr/controllino_mini.rst
index 3d91e226c2..fb2c61023d 100644
--- a/boards/atmelavr/controllino_mini.rst
+++ b/boards/atmelavr/controllino_mini.rst
@@ -32,7 +32,7 @@ Platform :ref:`platform_atmelavr`: Atmel AVR 8-bit MCUs deliver a unique combina
   * - **RAM**
     - 2KB
   * - **Vendor**
-    - `Controllino <https://www.controllino.com/product/controllino-mini/?utm_source=platformio.org&utm_medium=docs>`__
+    - `Controllino <https://controllino.biz/controllino/mini/?utm_source=platformio.org&utm_medium=docs>`__
 
 
 Configuration
diff --git a/boards/atmelmegaavr/ATtiny1624.rst b/boards/atmelmegaavr/ATtiny1624.rst
deleted file mode 100644
index 04b23db9bf..0000000000
--- a/boards/atmelmegaavr/ATtiny1624.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny1624:
-
-ATtiny1624
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY1624
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 16KB
-  * - **RAM**
-    - 2KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY1624?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny1624`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny1624]
-  platform = atmelmegaavr
-  board = ATtiny1624
-
-You can override default ATtiny1624 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny1624.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny1624.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny1624]
-  platform = atmelmegaavr
-  board = ATtiny1624
-
-  ; change microcontroller
-  board_build.mcu = attiny1624
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny1624 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny1626.rst b/boards/atmelmegaavr/ATtiny1626.rst
deleted file mode 100644
index 70e95dae98..0000000000
--- a/boards/atmelmegaavr/ATtiny1626.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny1626:
-
-ATtiny1626
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY1626
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 16KB
-  * - **RAM**
-    - 2KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY1626?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny1626`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny1626]
-  platform = atmelmegaavr
-  board = ATtiny1626
-
-You can override default ATtiny1626 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny1626.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny1626.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny1626]
-  platform = atmelmegaavr
-  board = ATtiny1626
-
-  ; change microcontroller
-  board_build.mcu = attiny1626
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny1626 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny1627.rst b/boards/atmelmegaavr/ATtiny1627.rst
deleted file mode 100644
index a808dc7c03..0000000000
--- a/boards/atmelmegaavr/ATtiny1627.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny1627:
-
-ATtiny1627
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY1627
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 16KB
-  * - **RAM**
-    - 2KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY1627?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny1627`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny1627]
-  platform = atmelmegaavr
-  board = ATtiny1627
-
-You can override default ATtiny1627 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny1627.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny1627.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny1627]
-  platform = atmelmegaavr
-  board = ATtiny1627
-
-  ; change microcontroller
-  board_build.mcu = attiny1627
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny1627 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny3224.rst b/boards/atmelmegaavr/ATtiny3224.rst
deleted file mode 100644
index 8692be2b29..0000000000
--- a/boards/atmelmegaavr/ATtiny3224.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny3224:
-
-ATtiny3224
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY3224
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 3KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY3224?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny3224`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny3224]
-  platform = atmelmegaavr
-  board = ATtiny3224
-
-You can override default ATtiny3224 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny3224.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny3224.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny3224]
-  platform = atmelmegaavr
-  board = ATtiny3224
-
-  ; change microcontroller
-  board_build.mcu = attiny3224
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny3224 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny3226.rst b/boards/atmelmegaavr/ATtiny3226.rst
deleted file mode 100644
index 28c7037424..0000000000
--- a/boards/atmelmegaavr/ATtiny3226.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny3226:
-
-ATtiny3226
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY3226
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 3KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY3226?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny3226`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny3226]
-  platform = atmelmegaavr
-  board = ATtiny3226
-
-You can override default ATtiny3226 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny3226.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny3226.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny3226]
-  platform = atmelmegaavr
-  board = ATtiny3226
-
-  ; change microcontroller
-  board_build.mcu = attiny3226
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny3226 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny3227.rst b/boards/atmelmegaavr/ATtiny3227.rst
deleted file mode 100644
index 05163e841e..0000000000
--- a/boards/atmelmegaavr/ATtiny3227.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny3227:
-
-ATtiny3227
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY3227
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 3KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY3227?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny3227`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny3227]
-  platform = atmelmegaavr
-  board = ATtiny3227
-
-You can override default ATtiny3227 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny3227.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny3227.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny3227]
-  platform = atmelmegaavr
-  board = ATtiny3227
-
-  ; change microcontroller
-  board_build.mcu = attiny3227
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny3227 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny424.rst b/boards/atmelmegaavr/ATtiny424.rst
deleted file mode 100644
index 34d036384e..0000000000
--- a/boards/atmelmegaavr/ATtiny424.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny424:
-
-ATtiny424
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY424
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 4KB
-  * - **RAM**
-    - 512B
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY424?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny424`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny424]
-  platform = atmelmegaavr
-  board = ATtiny424
-
-You can override default ATtiny424 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny424.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny424.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny424]
-  platform = atmelmegaavr
-  board = ATtiny424
-
-  ; change microcontroller
-  board_build.mcu = attiny424
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny424 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny426.rst b/boards/atmelmegaavr/ATtiny426.rst
deleted file mode 100644
index ae519ce532..0000000000
--- a/boards/atmelmegaavr/ATtiny426.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny426:
-
-ATtiny426
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY426
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 4KB
-  * - **RAM**
-    - 512B
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY426?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny426`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny426]
-  platform = atmelmegaavr
-  board = ATtiny426
-
-You can override default ATtiny426 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny426.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny426.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny426]
-  platform = atmelmegaavr
-  board = ATtiny426
-
-  ; change microcontroller
-  board_build.mcu = attiny426
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny426 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny427.rst b/boards/atmelmegaavr/ATtiny427.rst
deleted file mode 100644
index 9f2c63a33f..0000000000
--- a/boards/atmelmegaavr/ATtiny427.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny427:
-
-ATtiny427
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY427
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 4KB
-  * - **RAM**
-    - 512B
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY427?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny427`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny427]
-  platform = atmelmegaavr
-  board = ATtiny427
-
-You can override default ATtiny427 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny427.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny427.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny427]
-  platform = atmelmegaavr
-  board = ATtiny427
-
-  ; change microcontroller
-  board_build.mcu = attiny427
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny427 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny824.rst b/boards/atmelmegaavr/ATtiny824.rst
deleted file mode 100644
index c668fd505f..0000000000
--- a/boards/atmelmegaavr/ATtiny824.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny824:
-
-ATtiny824
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY824
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 8KB
-  * - **RAM**
-    - 1KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY824?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny824`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny824]
-  platform = atmelmegaavr
-  board = ATtiny824
-
-You can override default ATtiny824 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny824.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny824.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny824]
-  platform = atmelmegaavr
-  board = ATtiny824
-
-  ; change microcontroller
-  board_build.mcu = attiny824
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny824 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny826.rst b/boards/atmelmegaavr/ATtiny826.rst
deleted file mode 100644
index 02fed1c5fe..0000000000
--- a/boards/atmelmegaavr/ATtiny826.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny826:
-
-ATtiny826
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY826
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 8KB
-  * - **RAM**
-    - 1KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY826?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny826`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny826]
-  platform = atmelmegaavr
-  board = ATtiny826
-
-You can override default ATtiny826 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny826.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny826.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny826]
-  platform = atmelmegaavr
-  board = ATtiny826
-
-  ; change microcontroller
-  board_build.mcu = attiny826
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny826 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/ATtiny827.rst b/boards/atmelmegaavr/ATtiny827.rst
deleted file mode 100644
index 7fc22dc56e..0000000000
--- a/boards/atmelmegaavr/ATtiny827.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_ATtiny827:
-
-ATtiny827
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - ATTINY827
-  * - **Frequency**
-    - 16MHz
-  * - **Flash**
-    - 8KB
-  * - **RAM**
-    - 1KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/ATTINY827?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``ATtiny827`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:ATtiny827]
-  platform = atmelmegaavr
-  board = ATtiny827
-
-You can override default ATtiny827 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `ATtiny827.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/ATtiny827.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:ATtiny827]
-  platform = atmelmegaavr
-  board = ATtiny827
-
-  ; change microcontroller
-  board_build.mcu = attiny827
-
-  ; change MCU frequency
-  board_build.f_cpu = 16000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support ATtiny827 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DA28.rst b/boards/atmelmegaavr/AVR128DA28.rst
deleted file mode 100644
index 29966d2c12..0000000000
--- a/boards/atmelmegaavr/AVR128DA28.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR128DA28:
-
-AVR128DA28
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DA28
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DA28?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR128DA28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR128DA28]
-  platform = atmelmegaavr
-  board = AVR128DA28
-
-You can override default AVR128DA28 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR128DA28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DA28.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR128DA28]
-  platform = atmelmegaavr
-  board = AVR128DA28
-
-  ; change microcontroller
-  board_build.mcu = avr128da28
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR128DA28 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DA32.rst b/boards/atmelmegaavr/AVR128DA32.rst
deleted file mode 100644
index 266338a5b7..0000000000
--- a/boards/atmelmegaavr/AVR128DA32.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR128DA32:
-
-AVR128DA32
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DA32
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DA32?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR128DA32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR128DA32]
-  platform = atmelmegaavr
-  board = AVR128DA32
-
-You can override default AVR128DA32 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR128DA32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DA32.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR128DA32]
-  platform = atmelmegaavr
-  board = AVR128DA32
-
-  ; change microcontroller
-  board_build.mcu = avr128da32
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR128DA32 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DA48.rst b/boards/atmelmegaavr/AVR128DA48.rst
deleted file mode 100644
index 034d018f92..0000000000
--- a/boards/atmelmegaavr/AVR128DA48.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR128DA48:
-
-AVR128DA48
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DA48
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DA48?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR128DA48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR128DA48]
-  platform = atmelmegaavr
-  board = AVR128DA48
-
-You can override default AVR128DA48 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR128DA48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DA48.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR128DA48]
-  platform = atmelmegaavr
-  board = AVR128DA48
-
-  ; change microcontroller
-  board_build.mcu = avr128da48
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR128DA48 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DA64.rst b/boards/atmelmegaavr/AVR128DA64.rst
deleted file mode 100644
index f40098d1df..0000000000
--- a/boards/atmelmegaavr/AVR128DA64.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR128DA64:
-
-AVR128DA64
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DA64
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DA64?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR128DA64`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR128DA64]
-  platform = atmelmegaavr
-  board = AVR128DA64
-
-You can override default AVR128DA64 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR128DA64.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DA64.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR128DA64]
-  platform = atmelmegaavr
-  board = AVR128DA64
-
-  ; change microcontroller
-  board_build.mcu = avr128da64
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR128DA64 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DB28.rst b/boards/atmelmegaavr/AVR128DB28.rst
deleted file mode 100644
index 5b0505064f..0000000000
--- a/boards/atmelmegaavr/AVR128DB28.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR128DB28:
-
-AVR128DB28
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DB28
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DB28?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR128DB28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR128DB28]
-  platform = atmelmegaavr
-  board = AVR128DB28
-
-You can override default AVR128DB28 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR128DB28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DB28.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR128DB28]
-  platform = atmelmegaavr
-  board = AVR128DB28
-
-  ; change microcontroller
-  board_build.mcu = avr128db28
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR128DB28 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DB32.rst b/boards/atmelmegaavr/AVR128DB32.rst
deleted file mode 100644
index 5360aadf5c..0000000000
--- a/boards/atmelmegaavr/AVR128DB32.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR128DB32:
-
-AVR128DB32
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DB32
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DB32?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR128DB32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR128DB32]
-  platform = atmelmegaavr
-  board = AVR128DB32
-
-You can override default AVR128DB32 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR128DB32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DB32.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR128DB32]
-  platform = atmelmegaavr
-  board = AVR128DB32
-
-  ; change microcontroller
-  board_build.mcu = avr128db32
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR128DB32 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DB48.rst b/boards/atmelmegaavr/AVR128DB48.rst
deleted file mode 100644
index 777f7d1e02..0000000000
--- a/boards/atmelmegaavr/AVR128DB48.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR128DB48:
-
-AVR128DB48
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DB48
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DB48?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR128DB48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR128DB48]
-  platform = atmelmegaavr
-  board = AVR128DB48
-
-You can override default AVR128DB48 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR128DB48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DB48.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR128DB48]
-  platform = atmelmegaavr
-  board = AVR128DB48
-
-  ; change microcontroller
-  board_build.mcu = avr128db48
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR128DB48 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR128DB64.rst b/boards/atmelmegaavr/AVR128DB64.rst
deleted file mode 100644
index f9361adf6a..0000000000
--- a/boards/atmelmegaavr/AVR128DB64.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR128DB64:
-
-AVR128DB64
-==========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DB64
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR128DB64?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR128DB64`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR128DB64]
-  platform = atmelmegaavr
-  board = AVR128DB64
-
-You can override default AVR128DB64 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR128DB64.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR128DB64.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR128DB64]
-  platform = atmelmegaavr
-  board = AVR128DB64
-
-  ; change microcontroller
-  board_build.mcu = avr128db64
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR128DB64 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DA28.rst b/boards/atmelmegaavr/AVR32DA28.rst
deleted file mode 100644
index 7c9db1d5d3..0000000000
--- a/boards/atmelmegaavr/AVR32DA28.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR32DA28:
-
-AVR32DA28
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR32DA28
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 4KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DA28?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR32DA28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR32DA28]
-  platform = atmelmegaavr
-  board = AVR32DA28
-
-You can override default AVR32DA28 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR32DA28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DA28.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR32DA28]
-  platform = atmelmegaavr
-  board = AVR32DA28
-
-  ; change microcontroller
-  board_build.mcu = avr32da28
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR32DA28 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DA32.rst b/boards/atmelmegaavr/AVR32DA32.rst
deleted file mode 100644
index bf04e95861..0000000000
--- a/boards/atmelmegaavr/AVR32DA32.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR32DA32:
-
-AVR32DA32
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR32DA32
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 4KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DA32?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR32DA32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR32DA32]
-  platform = atmelmegaavr
-  board = AVR32DA32
-
-You can override default AVR32DA32 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR32DA32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DA32.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR32DA32]
-  platform = atmelmegaavr
-  board = AVR32DA32
-
-  ; change microcontroller
-  board_build.mcu = avr32da32
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR32DA32 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DA48.rst b/boards/atmelmegaavr/AVR32DA48.rst
deleted file mode 100644
index 14619e592f..0000000000
--- a/boards/atmelmegaavr/AVR32DA48.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR32DA48:
-
-AVR32DA48
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR32DA48
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 4KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DA48?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR32DA48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR32DA48]
-  platform = atmelmegaavr
-  board = AVR32DA48
-
-You can override default AVR32DA48 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR32DA48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DA48.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR32DA48]
-  platform = atmelmegaavr
-  board = AVR32DA48
-
-  ; change microcontroller
-  board_build.mcu = avr32da48
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR32DA48 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DB28.rst b/boards/atmelmegaavr/AVR32DB28.rst
deleted file mode 100644
index b24b432b96..0000000000
--- a/boards/atmelmegaavr/AVR32DB28.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR32DB28:
-
-AVR32DB28
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR32DB28
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 4KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DB28?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR32DB28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR32DB28]
-  platform = atmelmegaavr
-  board = AVR32DB28
-
-You can override default AVR32DB28 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR32DB28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DB28.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR32DB28]
-  platform = atmelmegaavr
-  board = AVR32DB28
-
-  ; change microcontroller
-  board_build.mcu = avr32db28
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR32DB28 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DB32.rst b/boards/atmelmegaavr/AVR32DB32.rst
deleted file mode 100644
index 2d68f14ad1..0000000000
--- a/boards/atmelmegaavr/AVR32DB32.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR32DB32:
-
-AVR32DB32
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR32DB32
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 4KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DB32?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR32DB32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR32DB32]
-  platform = atmelmegaavr
-  board = AVR32DB32
-
-You can override default AVR32DB32 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR32DB32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DB32.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR32DB32]
-  platform = atmelmegaavr
-  board = AVR32DB32
-
-  ; change microcontroller
-  board_build.mcu = avr32db32
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR32DB32 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR32DB48.rst b/boards/atmelmegaavr/AVR32DB48.rst
deleted file mode 100644
index ef6721c53f..0000000000
--- a/boards/atmelmegaavr/AVR32DB48.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR32DB48:
-
-AVR32DB48
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR32DB48
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 32KB
-  * - **RAM**
-    - 4KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR32DB48?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR32DB48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR32DB48]
-  platform = atmelmegaavr
-  board = AVR32DB48
-
-You can override default AVR32DB48 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR32DB48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR32DB48.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR32DB48]
-  platform = atmelmegaavr
-  board = AVR32DB48
-
-  ; change microcontroller
-  board_build.mcu = avr32db48
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR32DB48 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DA28.rst b/boards/atmelmegaavr/AVR64DA28.rst
deleted file mode 100644
index 79e8bfde1b..0000000000
--- a/boards/atmelmegaavr/AVR64DA28.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DA28:
-
-AVR64DA28
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DA28
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DA28?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DA28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DA28]
-  platform = atmelmegaavr
-  board = AVR64DA28
-
-You can override default AVR64DA28 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DA28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DA28.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DA28]
-  platform = atmelmegaavr
-  board = AVR64DA28
-
-  ; change microcontroller
-  board_build.mcu = avr64da28
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DA28 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DA32.rst b/boards/atmelmegaavr/AVR64DA32.rst
deleted file mode 100644
index 85664ca3d6..0000000000
--- a/boards/atmelmegaavr/AVR64DA32.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DA32:
-
-AVR64DA32
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DA32
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DA32?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DA32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DA32]
-  platform = atmelmegaavr
-  board = AVR64DA32
-
-You can override default AVR64DA32 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DA32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DA32.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DA32]
-  platform = atmelmegaavr
-  board = AVR64DA32
-
-  ; change microcontroller
-  board_build.mcu = avr64da32
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DA32 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DA48.rst b/boards/atmelmegaavr/AVR64DA48.rst
deleted file mode 100644
index 2e1c81be98..0000000000
--- a/boards/atmelmegaavr/AVR64DA48.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DA48:
-
-AVR64DA48
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DA48
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DA48?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DA48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DA48]
-  platform = atmelmegaavr
-  board = AVR64DA48
-
-You can override default AVR64DA48 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DA48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DA48.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DA48]
-  platform = atmelmegaavr
-  board = AVR64DA48
-
-  ; change microcontroller
-  board_build.mcu = avr64da48
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DA48 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DA64.rst b/boards/atmelmegaavr/AVR64DA64.rst
deleted file mode 100644
index 60e12e63ee..0000000000
--- a/boards/atmelmegaavr/AVR64DA64.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DA64:
-
-AVR64DA64
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DA64
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DA64?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DA64`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DA64]
-  platform = atmelmegaavr
-  board = AVR64DA64
-
-You can override default AVR64DA64 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DA64.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DA64.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DA64]
-  platform = atmelmegaavr
-  board = AVR64DA64
-
-  ; change microcontroller
-  board_build.mcu = avr64da64
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DA64 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DB28.rst b/boards/atmelmegaavr/AVR64DB28.rst
deleted file mode 100644
index 98db2a4cf6..0000000000
--- a/boards/atmelmegaavr/AVR64DB28.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DB28:
-
-AVR64DB28
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DB28
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DB28?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DB28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DB28]
-  platform = atmelmegaavr
-  board = AVR64DB28
-
-You can override default AVR64DB28 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DB28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DB28.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DB28]
-  platform = atmelmegaavr
-  board = AVR64DB28
-
-  ; change microcontroller
-  board_build.mcu = avr64db28
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DB28 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DB32.rst b/boards/atmelmegaavr/AVR64DB32.rst
deleted file mode 100644
index d0152fe9fe..0000000000
--- a/boards/atmelmegaavr/AVR64DB32.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DB32:
-
-AVR64DB32
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DB32
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DB32?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DB32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DB32]
-  platform = atmelmegaavr
-  board = AVR64DB32
-
-You can override default AVR64DB32 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DB32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DB32.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DB32]
-  platform = atmelmegaavr
-  board = AVR64DB32
-
-  ; change microcontroller
-  board_build.mcu = avr64db32
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DB32 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DB48.rst b/boards/atmelmegaavr/AVR64DB48.rst
deleted file mode 100644
index 590ba0fe74..0000000000
--- a/boards/atmelmegaavr/AVR64DB48.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DB48:
-
-AVR64DB48
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DB48
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DB48?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DB48`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DB48]
-  platform = atmelmegaavr
-  board = AVR64DB48
-
-You can override default AVR64DB48 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DB48.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DB48.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DB48]
-  platform = atmelmegaavr
-  board = AVR64DB48
-
-  ; change microcontroller
-  board_build.mcu = avr64db48
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DB48 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DB64.rst b/boards/atmelmegaavr/AVR64DB64.rst
deleted file mode 100644
index 73f6f4b0f4..0000000000
--- a/boards/atmelmegaavr/AVR64DB64.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DB64:
-
-AVR64DB64
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DB64
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DB64?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DB64`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DB64]
-  platform = atmelmegaavr
-  board = AVR64DB64
-
-You can override default AVR64DB64 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DB64.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DB64.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DB64]
-  platform = atmelmegaavr
-  board = AVR64DB64
-
-  ; change microcontroller
-  board_build.mcu = avr64db64
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DB64 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DD14.rst b/boards/atmelmegaavr/AVR64DD14.rst
deleted file mode 100644
index 7b90a459df..0000000000
--- a/boards/atmelmegaavr/AVR64DD14.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DD14:
-
-AVR64DD14
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DD14
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DD14?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DD14`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DD14]
-  platform = atmelmegaavr
-  board = AVR64DD14
-
-You can override default AVR64DD14 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DD14.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DD14.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DD14]
-  platform = atmelmegaavr
-  board = AVR64DD14
-
-  ; change microcontroller
-  board_build.mcu = avr64dd14
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DD14 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DD20.rst b/boards/atmelmegaavr/AVR64DD20.rst
deleted file mode 100644
index dcb4b7aa59..0000000000
--- a/boards/atmelmegaavr/AVR64DD20.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DD20:
-
-AVR64DD20
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DD20
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DD20?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DD20`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DD20]
-  platform = atmelmegaavr
-  board = AVR64DD20
-
-You can override default AVR64DD20 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DD20.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DD20.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DD20]
-  platform = atmelmegaavr
-  board = AVR64DD20
-
-  ; change microcontroller
-  board_build.mcu = avr64dd20
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DD20 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DD28.rst b/boards/atmelmegaavr/AVR64DD28.rst
deleted file mode 100644
index ba4d66ea10..0000000000
--- a/boards/atmelmegaavr/AVR64DD28.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DD28:
-
-AVR64DD28
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DD28
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DD28?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DD28`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DD28]
-  platform = atmelmegaavr
-  board = AVR64DD28
-
-You can override default AVR64DD28 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DD28.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DD28.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DD28]
-  platform = atmelmegaavr
-  board = AVR64DD28
-
-  ; change microcontroller
-  board_build.mcu = avr64dd28
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DD28 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/AVR64DD32.rst b/boards/atmelmegaavr/AVR64DD32.rst
deleted file mode 100644
index 8edccd153a..0000000000
--- a/boards/atmelmegaavr/AVR64DD32.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_AVR64DD32:
-
-AVR64DD32
-=========
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR64DD32
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 8KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/wwwproducts/en/AVR64DD32?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``AVR64DD32`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:AVR64DD32]
-  platform = atmelmegaavr
-  board = AVR64DD32
-
-You can override default AVR64DD32 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `AVR64DD32.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/AVR64DD32.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:AVR64DD32]
-  platform = atmelmegaavr
-  board = AVR64DD32
-
-  ; change microcontroller
-  board_build.mcu = avr64dd32
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support AVR64DD32 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/curiosity_nano_da.rst b/boards/atmelmegaavr/curiosity_nano_da.rst
deleted file mode 100644
index 0f112a7bfd..0000000000
--- a/boards/atmelmegaavr/curiosity_nano_da.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_curiosity_nano_da:
-
-Curiosity Nano AVR128DA48
-=========================
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DA48
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/developmenttools/ProductDetails/DM164151?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``curiosity_nano_da`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:curiosity_nano_da]
-  platform = atmelmegaavr
-  board = curiosity_nano_da
-
-You can override default Curiosity Nano AVR128DA48 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `curiosity_nano_da.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/curiosity_nano_da.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:curiosity_nano_da]
-  platform = atmelmegaavr
-  board = curiosity_nano_da
-
-  ; change microcontroller
-  board_build.mcu = avr128da48
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support Curiosity Nano AVR128DA48 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/atmelmegaavr/curiosity_nano_db.rst b/boards/atmelmegaavr/curiosity_nano_db.rst
deleted file mode 100644
index 8707cfac78..0000000000
--- a/boards/atmelmegaavr/curiosity_nano_db.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_atmelmegaavr_curiosity_nano_db:
-
-Curiosity Nano AVR128DB48
-=========================
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_atmelmegaavr`: 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - AVR128DB48
-  * - **Frequency**
-    - 24MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 16KB
-  * - **Vendor**
-    - `Microchip <https://www.microchip.com/developmenttools/ProductDetails/EV35L43A?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``curiosity_nano_db`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:curiosity_nano_db]
-  platform = atmelmegaavr
-  board = curiosity_nano_db
-
-You can override default Curiosity Nano AVR128DB48 settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `curiosity_nano_db.json <https://github.com/platformio/platform-atmelmegaavr/blob/master/boards/curiosity_nano_db.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:curiosity_nano_db]
-  platform = atmelmegaavr
-  board = curiosity_nano_db
-
-  ; change microcontroller
-  board_build.mcu = avr128db48
-
-  ; change MCU frequency
-  board_build.f_cpu = 24000000L
-
-Debugging
----------
-:ref:`piodebug` currently does not support Curiosity Nano AVR128DB48 board.
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_arduino`
-      - Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
\ No newline at end of file
diff --git a/boards/espressif8266/wifi_slot.rst b/boards/espressif8266/wifi_slot.rst
index c8eefc1342..3531339190 100644
--- a/boards/espressif8266/wifi_slot.rst
+++ b/boards/espressif8266/wifi_slot.rst
@@ -32,7 +32,7 @@ Platform :ref:`platform_espressif8266`: Espressif Systems is a privately held fa
   * - **RAM**
     - 80KB
   * - **Vendor**
-    - `Amperka <https://amperka.ru/product/wifi-slot?utm_source=platformio.org&utm_medium=docs>`__
+    - `Amperka <http://wiki.amperka.ru/wifi-slot?utm_source=platformio.org&utm_medium=docs>`__
 
 
 Configuration
diff --git a/boards/index.rst b/boards/index.rst
index c0ce4a24f8..d272e8a831 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -45,7 +45,6 @@ ASR Microelectronics ASR650x
     asrmicro650x/cubecell_capsule_solar_sensor
     asrmicro650x/cubecell_node
     asrmicro650x/cubecell_board
-    asrmicro650x/cubecell_board_pro
     asrmicro650x/cubecell_board_plus
     asrmicro650x/cubecell_capsule
     asrmicro650x/cubecell_gps
@@ -282,18 +281,12 @@ Atmel megaAVR
     atmelmegaavr/ATtiny1614
     atmelmegaavr/ATtiny1616
     atmelmegaavr/ATtiny1617
-    atmelmegaavr/ATtiny1624
-    atmelmegaavr/ATtiny1626
-    atmelmegaavr/ATtiny1627
     atmelmegaavr/ATtiny202
     atmelmegaavr/ATtiny204
     atmelmegaavr/ATtiny212
     atmelmegaavr/ATtiny214
     atmelmegaavr/ATtiny3216
     atmelmegaavr/ATtiny3217
-    atmelmegaavr/ATtiny3224
-    atmelmegaavr/ATtiny3226
-    atmelmegaavr/ATtiny3227
     atmelmegaavr/ATtiny402
     atmelmegaavr/ATtiny404
     atmelmegaavr/ATtiny406
@@ -301,50 +294,16 @@ Atmel megaAVR
     atmelmegaavr/ATtiny414
     atmelmegaavr/ATtiny416
     atmelmegaavr/ATtiny417
-    atmelmegaavr/ATtiny424
-    atmelmegaavr/ATtiny426
-    atmelmegaavr/ATtiny427
     atmelmegaavr/ATtiny804
     atmelmegaavr/ATtiny806
     atmelmegaavr/ATtiny807
     atmelmegaavr/ATtiny814
     atmelmegaavr/ATtiny816
     atmelmegaavr/ATtiny817
-    atmelmegaavr/ATtiny824
-    atmelmegaavr/ATtiny826
-    atmelmegaavr/ATtiny827
     atmelmegaavr/avr_iot_wg
-    atmelmegaavr/AVR128DA28
-    atmelmegaavr/AVR128DA32
-    atmelmegaavr/AVR128DA48
-    atmelmegaavr/AVR128DA64
-    atmelmegaavr/AVR128DB28
-    atmelmegaavr/AVR128DB32
-    atmelmegaavr/AVR128DB48
-    atmelmegaavr/AVR128DB64
-    atmelmegaavr/AVR32DA28
-    atmelmegaavr/AVR32DA32
-    atmelmegaavr/AVR32DA48
-    atmelmegaavr/AVR32DB28
-    atmelmegaavr/AVR32DB32
-    atmelmegaavr/AVR32DB48
-    atmelmegaavr/AVR64DA28
-    atmelmegaavr/AVR64DA32
-    atmelmegaavr/AVR64DA48
-    atmelmegaavr/AVR64DA64
-    atmelmegaavr/AVR64DB28
-    atmelmegaavr/AVR64DB32
-    atmelmegaavr/AVR64DB48
-    atmelmegaavr/AVR64DB64
-    atmelmegaavr/AVR64DD14
-    atmelmegaavr/AVR64DD20
-    atmelmegaavr/AVR64DD28
-    atmelmegaavr/AVR64DD32
     atmelmegaavr/nano_every
     atmelmegaavr/uno_wifi_rev2
     atmelmegaavr/curiosity_nano_4809
-    atmelmegaavr/curiosity_nano_da
-    atmelmegaavr/curiosity_nano_db
     atmelmegaavr/xplained_pro_4809
 
 Atmel SAM
@@ -864,17 +823,6 @@ Nordic nRF52
     nordicnrf52/ublox_bmd345eval_nrf52840
     nordicnrf52/ublox_evk_nina_b1
 
-Nuclei
-------
-
-.. toctree::
-    :maxdepth: 1
-        
-    nuclei/gd32vf103v_eval
-    nuclei/gd32vf103v_rvstar
-    nuclei/hbird_eval
-    nuclei/gd32vf103c_longan_nano
-
 NXP i.MX RT
 -----------
 
diff --git a/boards/microchippic32/picadillo_35t.rst b/boards/microchippic32/picadillo_35t.rst
index 5232556c03..9369695700 100644
--- a/boards/microchippic32/picadillo_35t.rst
+++ b/boards/microchippic32/picadillo_35t.rst
@@ -11,8 +11,8 @@
 
 .. _board_microchippic32_picadillo_35t:
 
-4D Systems PICadillo 35T
-========================
+4DSystems PICadillo 35T
+=======================
 
 .. contents::
 
@@ -32,7 +32,7 @@ Platform :ref:`platform_microchippic32`: Microchip's 32-bit portfolio with the M
   * - **RAM**
     - 128KB
   * - **Vendor**
-    - `4D Systems <http://www.4dsystems.com.au/product/Picadillo_35T/?utm_source=platformio.org&utm_medium=docs>`__
+    - `4DSystems <http://www.4dsystems.com.au/product/Picadillo_35T/?utm_source=platformio.org&utm_medium=docs>`__
 
 
 Configuration
@@ -46,7 +46,7 @@ Please use ``picadillo_35t`` ID for :ref:`projectconf_env_board` option in :ref:
   platform = microchippic32
   board = picadillo_35t
 
-You can override default 4D Systems PICadillo 35T settings per build environment using
+You can override default 4DSystems PICadillo 35T settings per build environment using
 ``board_***`` option, where ``***`` is a JSON object path from
 board manifest `picadillo_35t.json <https://github.com/platformio/platform-microchippic32/blob/master/boards/picadillo_35t.json>`_. For example,
 ``board_build.mcu``, ``board_build.f_cpu``, etc.
@@ -65,7 +65,7 @@ board manifest `picadillo_35t.json <https://github.com/platformio/platform-micro
 
 Debugging
 ---------
-:ref:`piodebug` currently does not support 4D Systems PICadillo 35T board.
+:ref:`piodebug` currently does not support 4DSystems PICadillo 35T board.
 
 Frameworks
 ----------
diff --git a/boards/nuclei/gd32vf103c_longan_nano.rst b/boards/nuclei/gd32vf103c_longan_nano.rst
deleted file mode 100644
index 2a91aa0810..0000000000
--- a/boards/nuclei/gd32vf103c_longan_nano.rst
+++ /dev/null
@@ -1,131 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_nuclei_gd32vf103c_longan_nano:
-
-Sipeed Longan Nano
-==================
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_nuclei`: Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - GD32VF103CBT6
-  * - **Frequency**
-    - 108MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 32KB
-  * - **Vendor**
-    - `GigaDevice <https://www.gigadevice.com/?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``gd32vf103c_longan_nano`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:gd32vf103c_longan_nano]
-  platform = nuclei
-  board = gd32vf103c_longan_nano
-
-You can override default Sipeed Longan Nano settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `gd32vf103c_longan_nano.json <https://github.com/Nuclei-Software/platform-nuclei/blob/master/boards/gd32vf103c_longan_nano.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:gd32vf103c_longan_nano]
-  platform = nuclei
-  board = gd32vf103c_longan_nano
-
-  ; change microcontroller
-  board_build.mcu = gd32vf103cbt6
-
-  ; change MCU frequency
-  board_build.f_cpu = 108000000L
-
-
-Uploading
----------
-Sipeed Longan Nano supports the following uploading protocols:
-
-* ``altera-usb-blaster``
-* ``gd-link``
-* ``jlink``
-* ``rv-link``
-
-Default protocol is ``rv-link``
-
-You can change upload protocol using :ref:`projectconf_upload_protocol` option:
-
-.. code-block:: ini
-
-  [env:gd32vf103c_longan_nano]
-  platform = nuclei
-  board = gd32vf103c_longan_nano
-
-  upload_protocol = rv-link
-
-Debugging
----------
-
-:ref:`piodebug` - "1-click" solution for debugging with a zero configuration.
-
-.. warning::
-    You will need to install debug tool drivers depending on your system.
-    Please click on compatible debug tool below for the further
-    instructions and configuration information.
-
-You can switch between debugging :ref:`debugging_tools` using
-:ref:`projectconf_debug_tool` option in :ref:`projectconf`.
-
-Sipeed Longan Nano does not have on-board debug probe and **IS NOT READY** for debugging. You will need to use/buy one of external probe listed below.
-
-.. list-table::
-  :header-rows:  1
-
-  * - Compatible Tools
-    - On-board
-    - Default
-  * - :ref:`debugging_tool_altera-usb-blaster`
-    - 
-    - Yes
-  * - :ref:`debugging_tool_gd-link`
-    - 
-    - 
-  * - :ref:`debugging_tool_jlink`
-    - 
-    - 
-  * - :ref:`debugging_tool_rv-link`
-    - 
-    - 
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
\ No newline at end of file
diff --git a/boards/nuclei/gd32vf103v_eval.rst b/boards/nuclei/gd32vf103v_eval.rst
deleted file mode 100644
index 231bbf5cb5..0000000000
--- a/boards/nuclei/gd32vf103v_eval.rst
+++ /dev/null
@@ -1,131 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_nuclei_gd32vf103v_eval:
-
-GD32VF103V Evaluation Kit
-=========================
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_nuclei`: Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - GD32VF103VBT6
-  * - **Frequency**
-    - 108MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 32KB
-  * - **Vendor**
-    - `GigaDevice <https://www.gigadevice.com/?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``gd32vf103v_eval`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:gd32vf103v_eval]
-  platform = nuclei
-  board = gd32vf103v_eval
-
-You can override default GD32VF103V Evaluation Kit settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `gd32vf103v_eval.json <https://github.com/Nuclei-Software/platform-nuclei/blob/master/boards/gd32vf103v_eval.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:gd32vf103v_eval]
-  platform = nuclei
-  board = gd32vf103v_eval
-
-  ; change microcontroller
-  board_build.mcu = gd32vf103vbt6
-
-  ; change MCU frequency
-  board_build.f_cpu = 108000000L
-
-
-Uploading
----------
-GD32VF103V Evaluation Kit supports the following uploading protocols:
-
-* ``altera-usb-blaster``
-* ``gd-link``
-* ``jlink``
-* ``rv-link``
-
-Default protocol is ``rv-link``
-
-You can change upload protocol using :ref:`projectconf_upload_protocol` option:
-
-.. code-block:: ini
-
-  [env:gd32vf103v_eval]
-  platform = nuclei
-  board = gd32vf103v_eval
-
-  upload_protocol = rv-link
-
-Debugging
----------
-
-:ref:`piodebug` - "1-click" solution for debugging with a zero configuration.
-
-.. warning::
-    You will need to install debug tool drivers depending on your system.
-    Please click on compatible debug tool below for the further
-    instructions and configuration information.
-
-You can switch between debugging :ref:`debugging_tools` using
-:ref:`projectconf_debug_tool` option in :ref:`projectconf`.
-
-GD32VF103V Evaluation Kit does not have on-board debug probe and **IS NOT READY** for debugging. You will need to use/buy one of external probe listed below.
-
-.. list-table::
-  :header-rows:  1
-
-  * - Compatible Tools
-    - On-board
-    - Default
-  * - :ref:`debugging_tool_altera-usb-blaster`
-    - 
-    - Yes
-  * - :ref:`debugging_tool_gd-link`
-    - 
-    - 
-  * - :ref:`debugging_tool_jlink`
-    - 
-    - 
-  * - :ref:`debugging_tool_rv-link`
-    - 
-    - 
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
\ No newline at end of file
diff --git a/boards/nuclei/gd32vf103v_rvstar.rst b/boards/nuclei/gd32vf103v_rvstar.rst
deleted file mode 100644
index fb4feacbcf..0000000000
--- a/boards/nuclei/gd32vf103v_rvstar.rst
+++ /dev/null
@@ -1,131 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_nuclei_gd32vf103v_rvstar:
-
-GD32VF103V RVStar Kit
-=====================
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_nuclei`: Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - GD32VF103VBT6
-  * - **Frequency**
-    - 108MHz
-  * - **Flash**
-    - 128KB
-  * - **RAM**
-    - 32KB
-  * - **Vendor**
-    - `Nuclei <https://nucleisys.com/?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``gd32vf103v_rvstar`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:gd32vf103v_rvstar]
-  platform = nuclei
-  board = gd32vf103v_rvstar
-
-You can override default GD32VF103V RVStar Kit settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `gd32vf103v_rvstar.json <https://github.com/Nuclei-Software/platform-nuclei/blob/master/boards/gd32vf103v_rvstar.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:gd32vf103v_rvstar]
-  platform = nuclei
-  board = gd32vf103v_rvstar
-
-  ; change microcontroller
-  board_build.mcu = gd32vf103vbt6
-
-  ; change MCU frequency
-  board_build.f_cpu = 108000000L
-
-
-Uploading
----------
-GD32VF103V RVStar Kit supports the following uploading protocols:
-
-* ``altera-usb-blaster``
-* ``gd-link``
-* ``jlink``
-* ``rv-link``
-
-Default protocol is ``rv-link``
-
-You can change upload protocol using :ref:`projectconf_upload_protocol` option:
-
-.. code-block:: ini
-
-  [env:gd32vf103v_rvstar]
-  platform = nuclei
-  board = gd32vf103v_rvstar
-
-  upload_protocol = rv-link
-
-Debugging
----------
-
-:ref:`piodebug` - "1-click" solution for debugging with a zero configuration.
-
-.. warning::
-    You will need to install debug tool drivers depending on your system.
-    Please click on compatible debug tool below for the further
-    instructions and configuration information.
-
-You can switch between debugging :ref:`debugging_tools` using
-:ref:`projectconf_debug_tool` option in :ref:`projectconf`.
-
-GD32VF103V RVStar Kit has on-board debug probe and **IS READY** for debugging. You don't need to use/buy external debug probe.
-
-.. list-table::
-  :header-rows:  1
-
-  * - Compatible Tools
-    - On-board
-    - Default
-  * - :ref:`debugging_tool_altera-usb-blaster`
-    - 
-    - 
-  * - :ref:`debugging_tool_gd-link`
-    - 
-    - 
-  * - :ref:`debugging_tool_jlink`
-    - 
-    - 
-  * - :ref:`debugging_tool_rv-link`
-    - Yes
-    - Yes
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
\ No newline at end of file
diff --git a/boards/nuclei/hbird_eval.rst b/boards/nuclei/hbird_eval.rst
deleted file mode 100644
index 5149d1db6a..0000000000
--- a/boards/nuclei/hbird_eval.rst
+++ /dev/null
@@ -1,100 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _board_nuclei_hbird_eval:
-
-HummingBird Evaluation Kit
-==========================
-
-.. contents::
-
-Hardware
---------
-
-Platform :ref:`platform_nuclei`: Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
-.. list-table::
-
-  * - **Microcontroller**
-    - HUMMINGBIRD
-  * - **Frequency**
-    - 5MHz
-  * - **Flash**
-    - 64KB
-  * - **RAM**
-    - 64KB
-  * - **Vendor**
-    - `Nuclei <https://nucleisys.com/?utm_source=platformio.org&utm_medium=docs>`__
-
-
-Configuration
--------------
-
-Please use ``hbird_eval`` ID for :ref:`projectconf_env_board` option in :ref:`projectconf`:
-
-.. code-block:: ini
-
-  [env:hbird_eval]
-  platform = nuclei
-  board = hbird_eval
-
-You can override default HummingBird Evaluation Kit settings per build environment using
-``board_***`` option, where ``***`` is a JSON object path from
-board manifest `hbird_eval.json <https://github.com/Nuclei-Software/platform-nuclei/blob/master/boards/hbird_eval.json>`_. For example,
-``board_build.mcu``, ``board_build.f_cpu``, etc.
-
-.. code-block:: ini
-
-  [env:hbird_eval]
-  platform = nuclei
-  board = hbird_eval
-
-  ; change microcontroller
-  board_build.mcu = HummingBird
-
-  ; change MCU frequency
-  board_build.f_cpu = 5000000L
-
-Debugging
----------
-
-:ref:`piodebug` - "1-click" solution for debugging with a zero configuration.
-
-.. warning::
-    You will need to install debug tool drivers depending on your system.
-    Please click on compatible debug tool below for the further
-    instructions and configuration information.
-
-You can switch between debugging :ref:`debugging_tools` using
-:ref:`projectconf_debug_tool` option in :ref:`projectconf`.
-
-HummingBird Evaluation Kit has on-board debug probe and **IS READY** for debugging. You don't need to use/buy external debug probe.
-
-.. list-table::
-  :header-rows:  1
-
-  * - Compatible Tools
-    - On-board
-    - Default
-  * - :ref:`debugging_tool_rv-link`
-    - Yes
-    - Yes
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
\ No newline at end of file
diff --git a/boards/raspberrypi/nanorp2040connect.rst b/boards/raspberrypi/nanorp2040connect.rst
index f603d3d284..6bb5df3692 100644
--- a/boards/raspberrypi/nanorp2040connect.rst
+++ b/boards/raspberrypi/nanorp2040connect.rst
@@ -19,7 +19,7 @@ Arduino Nano RP2040 Connect
 Hardware
 --------
 
-Platform :ref:`platform_raspberrypi`: RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+Platform :ref:`platform_raspberrypi`: RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
 .. list-table::
 
diff --git a/boards/raspberrypi/pico.rst b/boards/raspberrypi/pico.rst
index afe10644ae..b45f8b17e5 100644
--- a/boards/raspberrypi/pico.rst
+++ b/boards/raspberrypi/pico.rst
@@ -19,7 +19,7 @@ Raspberry Pi Pico
 Hardware
 --------
 
-Platform :ref:`platform_raspberrypi`: RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+Platform :ref:`platform_raspberrypi`: RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
 .. list-table::
 
diff --git a/boards/sifive/e310-arty.rst b/boards/sifive/e310-arty.rst
index 45da24c8de..f767afb248 100644
--- a/boards/sifive/e310-arty.rst
+++ b/boards/sifive/e310-arty.rst
@@ -149,8 +149,8 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
-      - Open Source Software for Developing on the SiFive Freedom E Platform
\ No newline at end of file
+      - Open Source Software for Developing on the SiFive Freedom E Platform
+
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
\ No newline at end of file
diff --git a/boards/sifive/hifive-unleashed.rst b/boards/sifive/hifive-unleashed.rst
index b83ed766ef..cfecd9023c 100644
--- a/boards/sifive/hifive-unleashed.rst
+++ b/boards/sifive/hifive-unleashed.rst
@@ -102,8 +102,8 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
-      - Open Source Software for Developing on the SiFive Freedom E Platform
\ No newline at end of file
+      - Open Source Software for Developing on the SiFive Freedom E Platform
+
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
\ No newline at end of file
diff --git a/boards/sifive/hifive1-revb.rst b/boards/sifive/hifive1-revb.rst
index a5663bc6ae..69932120b4 100644
--- a/boards/sifive/hifive1-revb.rst
+++ b/boards/sifive/hifive1-revb.rst
@@ -99,11 +99,11 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/sifive/hifive1.rst b/boards/sifive/hifive1.rst
index 52f0ca7d2c..a3043bb72c 100644
--- a/boards/sifive/hifive1.rst
+++ b/boards/sifive/hifive1.rst
@@ -102,11 +102,11 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/sifive/sparkfun_redboard_v.rst b/boards/sifive/sparkfun_redboard_v.rst
index 0577ba2a58..95d413837d 100644
--- a/boards/sifive/sparkfun_redboard_v.rst
+++ b/boards/sifive/sparkfun_redboard_v.rst
@@ -99,11 +99,11 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/sifive/sparkfun_thing_plus_v.rst b/boards/sifive/sparkfun_thing_plus_v.rst
index f49da19c9f..d200025e6f 100644
--- a/boards/sifive/sparkfun_thing_plus_v.rst
+++ b/boards/sifive/sparkfun_thing_plus_v.rst
@@ -99,11 +99,11 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/1bitsy_stm32f415rgt.rst b/boards/ststm32/1bitsy_stm32f415rgt.rst
index deac577fba..7673c76cc7 100644
--- a/boards/ststm32/1bitsy_stm32f415rgt.rst
+++ b/boards/ststm32/1bitsy_stm32f415rgt.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/adafruit_feather_f405.rst b/boards/ststm32/adafruit_feather_f405.rst
index 4d403d7f7a..20f7dbe106 100644
--- a/boards/ststm32/adafruit_feather_f405.rst
+++ b/boards/ststm32/adafruit_feather_f405.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/afroflight_f103cb.rst b/boards/ststm32/afroflight_f103cb.rst
index bfbf591ef7..5268beea7c 100644
--- a/boards/ststm32/afroflight_f103cb.rst
+++ b/boards/ststm32/afroflight_f103cb.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/armed_v1.rst b/boards/ststm32/armed_v1.rst
index 5e29072959..863926f54c 100644
--- a/boards/ststm32/armed_v1.rst
+++ b/boards/ststm32/armed_v1.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/armstrap_eagle1024.rst b/boards/ststm32/armstrap_eagle1024.rst
index 94860e96de..dc228f8ee7 100644
--- a/boards/ststm32/armstrap_eagle1024.rst
+++ b/boards/ststm32/armstrap_eagle1024.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/armstrap_eagle2048.rst b/boards/ststm32/armstrap_eagle2048.rst
index 30b1d705ab..fe4fe48c41 100644
--- a/boards/ststm32/armstrap_eagle2048.rst
+++ b/boards/ststm32/armstrap_eagle2048.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/armstrap_eagle512.rst b/boards/ststm32/armstrap_eagle512.rst
index d093b3cd25..a80a294f2f 100644
--- a/boards/ststm32/armstrap_eagle512.rst
+++ b/boards/ststm32/armstrap_eagle512.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/b96b_aerocore2.rst b/boards/ststm32/b96b_aerocore2.rst
index d2a65435a6..c3bf9be3c1 100644
--- a/boards/ststm32/b96b_aerocore2.rst
+++ b/boards/ststm32/b96b_aerocore2.rst
@@ -128,11 +128,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/b96b_argonkey.rst b/boards/ststm32/b96b_argonkey.rst
index 66ab1a564c..88e1256807 100644
--- a/boards/ststm32/b96b_argonkey.rst
+++ b/boards/ststm32/b96b_argonkey.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/b96b_f446ve.rst b/boards/ststm32/b96b_f446ve.rst
index d0202609fa..12483c937c 100644
--- a/boards/ststm32/b96b_f446ve.rst
+++ b/boards/ststm32/b96b_f446ve.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/b96b_neonkey.rst b/boards/ststm32/b96b_neonkey.rst
index 00a7569e9c..edabe728c0 100644
--- a/boards/ststm32/b96b_neonkey.rst
+++ b/boards/ststm32/b96b_neonkey.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/black_f407ve.rst b/boards/ststm32/black_f407ve.rst
index b796988ce8..c0c2ba54a3 100644
--- a/boards/ststm32/black_f407ve.rst
+++ b/boards/ststm32/black_f407ve.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/black_f407vg.rst b/boards/ststm32/black_f407vg.rst
index e2a0f1af76..089fd41aa5 100644
--- a/boards/ststm32/black_f407vg.rst
+++ b/boards/ststm32/black_f407vg.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/black_f407ze.rst b/boards/ststm32/black_f407ze.rst
index 3baed674bb..87725b6fdf 100644
--- a/boards/ststm32/black_f407ze.rst
+++ b/boards/ststm32/black_f407ze.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/black_f407zg.rst b/boards/ststm32/black_f407zg.rst
index 2df8bad3c9..8f297d7070 100644
--- a/boards/ststm32/black_f407zg.rst
+++ b/boards/ststm32/black_f407zg.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/blackpill_f103c8.rst b/boards/ststm32/blackpill_f103c8.rst
index 5686183806..31ea9d860e 100644
--- a/boards/ststm32/blackpill_f103c8.rst
+++ b/boards/ststm32/blackpill_f103c8.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/blackpill_f103c8_128.rst b/boards/ststm32/blackpill_f103c8_128.rst
index 80f4ac661d..21e10d08cc 100644
--- a/boards/ststm32/blackpill_f103c8_128.rst
+++ b/boards/ststm32/blackpill_f103c8_128.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/blackpill_f401cc.rst b/boards/ststm32/blackpill_f401cc.rst
index 12f0db3f13..a65f9bfd07 100644
--- a/boards/ststm32/blackpill_f401cc.rst
+++ b/boards/ststm32/blackpill_f401cc.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/blackpill_f401ce.rst b/boards/ststm32/blackpill_f401ce.rst
index ea5eb03fad..ad6f10bd97 100644
--- a/boards/ststm32/blackpill_f401ce.rst
+++ b/boards/ststm32/blackpill_f401ce.rst
@@ -135,11 +135,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/blackpill_f411ce.rst b/boards/ststm32/blackpill_f411ce.rst
index bf1ae5ba4c..efb4355822 100644
--- a/boards/ststm32/blackpill_f411ce.rst
+++ b/boards/ststm32/blackpill_f411ce.rst
@@ -135,11 +135,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/blue_f407ve_mini.rst b/boards/ststm32/blue_f407ve_mini.rst
index 5163a2c99d..bd65bec5b2 100644
--- a/boards/ststm32/blue_f407ve_mini.rst
+++ b/boards/ststm32/blue_f407ve_mini.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/bluepill_f103c6.rst b/boards/ststm32/bluepill_f103c6.rst
index 045e473fb9..10c9c0a5c8 100644
--- a/boards/ststm32/bluepill_f103c6.rst
+++ b/boards/ststm32/bluepill_f103c6.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/bluepill_f103c8.rst b/boards/ststm32/bluepill_f103c8.rst
index 12f0eece66..9d356775a7 100644
--- a/boards/ststm32/bluepill_f103c8.rst
+++ b/boards/ststm32/bluepill_f103c8.rst
@@ -135,6 +135,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -142,7 +145,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/bluepill_f103c8_128k.rst b/boards/ststm32/bluepill_f103c8_128k.rst
index 90462fb056..d91590c056 100644
--- a/boards/ststm32/bluepill_f103c8_128k.rst
+++ b/boards/ststm32/bluepill_f103c8_128k.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/cloud_jam.rst b/boards/ststm32/cloud_jam.rst
index 15c6784363..be863a916c 100644
--- a/boards/ststm32/cloud_jam.rst
+++ b/boards/ststm32/cloud_jam.rst
@@ -131,14 +131,14 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/cloud_jam_l4.rst b/boards/ststm32/cloud_jam_l4.rst
index d96b2d8ef3..f31adec1a0 100644
--- a/boards/ststm32/cloud_jam_l4.rst
+++ b/boards/ststm32/cloud_jam_l4.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/coreboard_f401rc.rst b/boards/ststm32/coreboard_f401rc.rst
index 9282af33aa..5a44317bf7 100644
--- a/boards/ststm32/coreboard_f401rc.rst
+++ b/boards/ststm32/coreboard_f401rc.rst
@@ -136,8 +136,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/demo_f030f4.rst b/boards/ststm32/demo_f030f4.rst
index 698cfd9454..8d34623739 100644
--- a/boards/ststm32/demo_f030f4.rst
+++ b/boards/ststm32/demo_f030f4.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_f030r8.rst b/boards/ststm32/disco_f030r8.rst
index 4d5b5b941c..93d7f981e5 100644
--- a/boards/ststm32/disco_f030r8.rst
+++ b/boards/ststm32/disco_f030r8.rst
@@ -133,11 +133,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_f051r8.rst b/boards/ststm32/disco_f051r8.rst
index 5d5ee019b2..f94d7b0547 100644
--- a/boards/ststm32/disco_f051r8.rst
+++ b/boards/ststm32/disco_f051r8.rst
@@ -130,6 +130,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -137,7 +140,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f072rb.rst b/boards/ststm32/disco_f072rb.rst
index 34d059e2ab..cf00f49b8c 100644
--- a/boards/ststm32/disco_f072rb.rst
+++ b/boards/ststm32/disco_f072rb.rst
@@ -133,6 +133,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -140,7 +143,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f100rb.rst b/boards/ststm32/disco_f100rb.rst
index 32e261bee2..9027f937cf 100644
--- a/boards/ststm32/disco_f100rb.rst
+++ b/boards/ststm32/disco_f100rb.rst
@@ -133,11 +133,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_f303vc.rst b/boards/ststm32/disco_f303vc.rst
index 952ead135c..4a36338cc3 100644
--- a/boards/ststm32/disco_f303vc.rst
+++ b/boards/ststm32/disco_f303vc.rst
@@ -134,17 +134,17 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_zephyr`
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f334c8.rst b/boards/ststm32/disco_f334c8.rst
index 232a61f46d..2945944597 100644
--- a/boards/ststm32/disco_f334c8.rst
+++ b/boards/ststm32/disco_f334c8.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_f401vc.rst b/boards/ststm32/disco_f401vc.rst
index ae75a5db61..1c7d80576c 100644
--- a/boards/ststm32/disco_f401vc.rst
+++ b/boards/ststm32/disco_f401vc.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_f407vg.rst b/boards/ststm32/disco_f407vg.rst
index d7a84a977f..4d61b3df47 100644
--- a/boards/ststm32/disco_f407vg.rst
+++ b/boards/ststm32/disco_f407vg.rst
@@ -134,17 +134,17 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_zephyr`
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f411ve.rst b/boards/ststm32/disco_f411ve.rst
index facc762a84..c60ba8ef5d 100644
--- a/boards/ststm32/disco_f411ve.rst
+++ b/boards/ststm32/disco_f411ve.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f412zg.rst b/boards/ststm32/disco_f412zg.rst
index 1c30a34662..096b159e12 100644
--- a/boards/ststm32/disco_f412zg.rst
+++ b/boards/ststm32/disco_f412zg.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f413zh.rst b/boards/ststm32/disco_f413zh.rst
index 08ddc83853..607b73a3dc 100644
--- a/boards/ststm32/disco_f413zh.rst
+++ b/boards/ststm32/disco_f413zh.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_f429zi.rst b/boards/ststm32/disco_f429zi.rst
index 3280e70903..7503b3b593 100644
--- a/boards/ststm32/disco_f429zi.rst
+++ b/boards/ststm32/disco_f429zi.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f469ni.rst b/boards/ststm32/disco_f469ni.rst
index 312f1aa060..a16f9e3839 100644
--- a/boards/ststm32/disco_f469ni.rst
+++ b/boards/ststm32/disco_f469ni.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f723ie.rst b/boards/ststm32/disco_f723ie.rst
index e0bcadacfd..ddf6c4eeba 100644
--- a/boards/ststm32/disco_f723ie.rst
+++ b/boards/ststm32/disco_f723ie.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f746ng.rst b/boards/ststm32/disco_f746ng.rst
index 0e89662a6c..290c6cae8a 100644
--- a/boards/ststm32/disco_f746ng.rst
+++ b/boards/ststm32/disco_f746ng.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_f750n8.rst b/boards/ststm32/disco_f750n8.rst
index ff61d254df..223d093c23 100644
--- a/boards/ststm32/disco_f750n8.rst
+++ b/boards/ststm32/disco_f750n8.rst
@@ -130,8 +130,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_f769ni.rst b/boards/ststm32/disco_f769ni.rst
index 23367d013c..e0c38f005c 100644
--- a/boards/ststm32/disco_f769ni.rst
+++ b/boards/ststm32/disco_f769ni.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_g031j6.rst b/boards/ststm32/disco_g031j6.rst
index 8bbcd3e62a..e97d67a9c2 100644
--- a/boards/ststm32/disco_g031j6.rst
+++ b/boards/ststm32/disco_g031j6.rst
@@ -132,8 +132,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_g071rb.rst b/boards/ststm32/disco_g071rb.rst
index 0517821985..d0a9b25800 100644
--- a/boards/ststm32/disco_g071rb.rst
+++ b/boards/ststm32/disco_g071rb.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_h747xi.rst b/boards/ststm32/disco_h747xi.rst
index ac8bd68ee1..406cb1d871 100644
--- a/boards/ststm32/disco_h747xi.rst
+++ b/boards/ststm32/disco_h747xi.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_l053c8.rst b/boards/ststm32/disco_l053c8.rst
index 77bd1fdf26..a947b985e7 100644
--- a/boards/ststm32/disco_l053c8.rst
+++ b/boards/ststm32/disco_l053c8.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_l072cz_lrwan1.rst b/boards/ststm32/disco_l072cz_lrwan1.rst
index 9087c33748..c54114dc3e 100644
--- a/boards/ststm32/disco_l072cz_lrwan1.rst
+++ b/boards/ststm32/disco_l072cz_lrwan1.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_l100rc.rst b/boards/ststm32/disco_l100rc.rst
index dcb5b6c5c2..459fd5374b 100644
--- a/boards/ststm32/disco_l100rc.rst
+++ b/boards/ststm32/disco_l100rc.rst
@@ -126,8 +126,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_l152rb.rst b/boards/ststm32/disco_l152rb.rst
index 56ad98e8a9..a8174e44e1 100644
--- a/boards/ststm32/disco_l152rb.rst
+++ b/boards/ststm32/disco_l152rb.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/disco_l475vg_iot01a.rst b/boards/ststm32/disco_l475vg_iot01a.rst
index 25e7bfe682..d649070472 100644
--- a/boards/ststm32/disco_l475vg_iot01a.rst
+++ b/boards/ststm32/disco_l475vg_iot01a.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_l476vg.rst b/boards/ststm32/disco_l476vg.rst
index 373fd24f79..3793cf3679 100644
--- a/boards/ststm32/disco_l476vg.rst
+++ b/boards/ststm32/disco_l476vg.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/disco_l496ag.rst b/boards/ststm32/disco_l496ag.rst
index affe37e14a..3df1ffdc74 100644
--- a/boards/ststm32/disco_l496ag.rst
+++ b/boards/ststm32/disco_l496ag.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/diymore_f407vgt.rst b/boards/ststm32/diymore_f407vgt.rst
index e25027bf84..9bba0d5f72 100644
--- a/boards/ststm32/diymore_f407vgt.rst
+++ b/boards/ststm32/diymore_f407vgt.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/elektor_f072c8.rst b/boards/ststm32/elektor_f072c8.rst
index 318e0ee01e..72b1234d93 100644
--- a/boards/ststm32/elektor_f072c8.rst
+++ b/boards/ststm32/elektor_f072c8.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/elektor_f072cb.rst b/boards/ststm32/elektor_f072cb.rst
index 943538fc2f..25317daecb 100644
--- a/boards/ststm32/elektor_f072cb.rst
+++ b/boards/ststm32/elektor_f072cb.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/elmo_f411re.rst b/boards/ststm32/elmo_f411re.rst
index 23e602a194..47d97c800b 100644
--- a/boards/ststm32/elmo_f411re.rst
+++ b/boards/ststm32/elmo_f411re.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/eval_f072vb.rst b/boards/ststm32/eval_f072vb.rst
index c10d32fb02..db13ceb4b4 100644
--- a/boards/ststm32/eval_f072vb.rst
+++ b/boards/ststm32/eval_f072vb.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/eval_f107vc.rst b/boards/ststm32/eval_f107vc.rst
index 6f0eb43d72..1da3b808bb 100644
--- a/boards/ststm32/eval_f107vc.rst
+++ b/boards/ststm32/eval_f107vc.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/eval_f373vc.rst b/boards/ststm32/eval_f373vc.rst
index fce69e877a..fba39a25e6 100644
--- a/boards/ststm32/eval_f373vc.rst
+++ b/boards/ststm32/eval_f373vc.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/eval_l073z.rst b/boards/ststm32/eval_l073z.rst
index 9500aacd27..f8a64af9c2 100644
--- a/boards/ststm32/eval_l073z.rst
+++ b/boards/ststm32/eval_l073z.rst
@@ -130,8 +130,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/fk407m1.rst b/boards/ststm32/fk407m1.rst
index 9c7d325871..8a04cdcaa7 100644
--- a/boards/ststm32/fk407m1.rst
+++ b/boards/ststm32/fk407m1.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/fysetc_s6.rst b/boards/ststm32/fysetc_s6.rst
index 3552800755..fcf01cdcc8 100644
--- a/boards/ststm32/fysetc_s6.rst
+++ b/boards/ststm32/fysetc_s6.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103C4.rst b/boards/ststm32/genericSTM32F103C4.rst
index 66a3efbd52..2f6c25a730 100644
--- a/boards/ststm32/genericSTM32F103C4.rst
+++ b/boards/ststm32/genericSTM32F103C4.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103C6.rst b/boards/ststm32/genericSTM32F103C6.rst
index 3b30c221b0..0d44490d32 100644
--- a/boards/ststm32/genericSTM32F103C6.rst
+++ b/boards/ststm32/genericSTM32F103C6.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103C8.rst b/boards/ststm32/genericSTM32F103C8.rst
index 19b45b0b95..a07d6337a6 100644
--- a/boards/ststm32/genericSTM32F103C8.rst
+++ b/boards/ststm32/genericSTM32F103C8.rst
@@ -135,11 +135,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103CB.rst b/boards/ststm32/genericSTM32F103CB.rst
index 3237126fdc..2d921814fd 100644
--- a/boards/ststm32/genericSTM32F103CB.rst
+++ b/boards/ststm32/genericSTM32F103CB.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103R4.rst b/boards/ststm32/genericSTM32F103R4.rst
index b7c5c55d87..9c2b0e4027 100644
--- a/boards/ststm32/genericSTM32F103R4.rst
+++ b/boards/ststm32/genericSTM32F103R4.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103R6.rst b/boards/ststm32/genericSTM32F103R6.rst
index e556ae5d58..405b104e37 100644
--- a/boards/ststm32/genericSTM32F103R6.rst
+++ b/boards/ststm32/genericSTM32F103R6.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103R8.rst b/boards/ststm32/genericSTM32F103R8.rst
index 65a4832e8e..7ee095e726 100644
--- a/boards/ststm32/genericSTM32F103R8.rst
+++ b/boards/ststm32/genericSTM32F103R8.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103RB.rst b/boards/ststm32/genericSTM32F103RB.rst
index b1854b0992..499b227b8e 100644
--- a/boards/ststm32/genericSTM32F103RB.rst
+++ b/boards/ststm32/genericSTM32F103RB.rst
@@ -135,11 +135,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103RC.rst b/boards/ststm32/genericSTM32F103RC.rst
index b13cf068f6..6cd489e395 100644
--- a/boards/ststm32/genericSTM32F103RC.rst
+++ b/boards/ststm32/genericSTM32F103RC.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103RD.rst b/boards/ststm32/genericSTM32F103RD.rst
index 4a3a249202..2dbbd5e3df 100644
--- a/boards/ststm32/genericSTM32F103RD.rst
+++ b/boards/ststm32/genericSTM32F103RD.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103RE.rst b/boards/ststm32/genericSTM32F103RE.rst
index ff43b0304a..bc2fedf4ab 100644
--- a/boards/ststm32/genericSTM32F103RE.rst
+++ b/boards/ststm32/genericSTM32F103RE.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103RF.rst b/boards/ststm32/genericSTM32F103RF.rst
index bcdb1eee67..7365c36dba 100644
--- a/boards/ststm32/genericSTM32F103RF.rst
+++ b/boards/ststm32/genericSTM32F103RF.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103RG.rst b/boards/ststm32/genericSTM32F103RG.rst
index 01c3e3a2ac..37cdddc220 100644
--- a/boards/ststm32/genericSTM32F103RG.rst
+++ b/boards/ststm32/genericSTM32F103RG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103T4.rst b/boards/ststm32/genericSTM32F103T4.rst
index 2013da0c04..4441acaf4c 100644
--- a/boards/ststm32/genericSTM32F103T4.rst
+++ b/boards/ststm32/genericSTM32F103T4.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103T6.rst b/boards/ststm32/genericSTM32F103T6.rst
index abba5c3066..899ba5fa76 100644
--- a/boards/ststm32/genericSTM32F103T6.rst
+++ b/boards/ststm32/genericSTM32F103T6.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103T8.rst b/boards/ststm32/genericSTM32F103T8.rst
index dae3a01763..a9f04ebdaf 100644
--- a/boards/ststm32/genericSTM32F103T8.rst
+++ b/boards/ststm32/genericSTM32F103T8.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103TB.rst b/boards/ststm32/genericSTM32F103TB.rst
index 4aabdc390a..15cb380a29 100644
--- a/boards/ststm32/genericSTM32F103TB.rst
+++ b/boards/ststm32/genericSTM32F103TB.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103V8.rst b/boards/ststm32/genericSTM32F103V8.rst
index 91c602dbec..5b2df95a7d 100644
--- a/boards/ststm32/genericSTM32F103V8.rst
+++ b/boards/ststm32/genericSTM32F103V8.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103VB.rst b/boards/ststm32/genericSTM32F103VB.rst
index 86163bcac0..e468d99d82 100644
--- a/boards/ststm32/genericSTM32F103VB.rst
+++ b/boards/ststm32/genericSTM32F103VB.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103VC.rst b/boards/ststm32/genericSTM32F103VC.rst
index 4335787d35..9cf8d0a61c 100644
--- a/boards/ststm32/genericSTM32F103VC.rst
+++ b/boards/ststm32/genericSTM32F103VC.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103VD.rst b/boards/ststm32/genericSTM32F103VD.rst
index a17b8a1589..5898718e43 100644
--- a/boards/ststm32/genericSTM32F103VD.rst
+++ b/boards/ststm32/genericSTM32F103VD.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103VE.rst b/boards/ststm32/genericSTM32F103VE.rst
index 658cb557fd..5c7b6397ec 100644
--- a/boards/ststm32/genericSTM32F103VE.rst
+++ b/boards/ststm32/genericSTM32F103VE.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103VF.rst b/boards/ststm32/genericSTM32F103VF.rst
index b706e31226..23aa764d69 100644
--- a/boards/ststm32/genericSTM32F103VF.rst
+++ b/boards/ststm32/genericSTM32F103VF.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103VG.rst b/boards/ststm32/genericSTM32F103VG.rst
index 41d5a487d0..3c72738c7d 100644
--- a/boards/ststm32/genericSTM32F103VG.rst
+++ b/boards/ststm32/genericSTM32F103VG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103ZC.rst b/boards/ststm32/genericSTM32F103ZC.rst
index 0a392a60ad..61cebbffb8 100644
--- a/boards/ststm32/genericSTM32F103ZC.rst
+++ b/boards/ststm32/genericSTM32F103ZC.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103ZD.rst b/boards/ststm32/genericSTM32F103ZD.rst
index 53ab078974..95e5a5c7e3 100644
--- a/boards/ststm32/genericSTM32F103ZD.rst
+++ b/boards/ststm32/genericSTM32F103ZD.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103ZE.rst b/boards/ststm32/genericSTM32F103ZE.rst
index 5df6fd27e7..782558ff91 100644
--- a/boards/ststm32/genericSTM32F103ZE.rst
+++ b/boards/ststm32/genericSTM32F103ZE.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103ZF.rst b/boards/ststm32/genericSTM32F103ZF.rst
index 99f9450452..20eb371872 100644
--- a/boards/ststm32/genericSTM32F103ZF.rst
+++ b/boards/ststm32/genericSTM32F103ZF.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F103ZG.rst b/boards/ststm32/genericSTM32F103ZG.rst
index abb01146bc..a588bc6a75 100644
--- a/boards/ststm32/genericSTM32F103ZG.rst
+++ b/boards/ststm32/genericSTM32F103ZG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F303CB.rst b/boards/ststm32/genericSTM32F303CB.rst
index 5e10ddd3e4..6e526f5428 100644
--- a/boards/ststm32/genericSTM32F303CB.rst
+++ b/boards/ststm32/genericSTM32F303CB.rst
@@ -130,8 +130,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F401CB.rst b/boards/ststm32/genericSTM32F401CB.rst
index 90007a588c..726c5a74c5 100644
--- a/boards/ststm32/genericSTM32F401CB.rst
+++ b/boards/ststm32/genericSTM32F401CB.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F401CC.rst b/boards/ststm32/genericSTM32F401CC.rst
index 667461d4ab..a0298a04dc 100644
--- a/boards/ststm32/genericSTM32F401CC.rst
+++ b/boards/ststm32/genericSTM32F401CC.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F401CD.rst b/boards/ststm32/genericSTM32F401CD.rst
index 4c02a88921..5a5be66b7b 100644
--- a/boards/ststm32/genericSTM32F401CD.rst
+++ b/boards/ststm32/genericSTM32F401CD.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F401CE.rst b/boards/ststm32/genericSTM32F401CE.rst
index 682253c844..b6e59e2eab 100644
--- a/boards/ststm32/genericSTM32F401CE.rst
+++ b/boards/ststm32/genericSTM32F401CE.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F401RB.rst b/boards/ststm32/genericSTM32F401RB.rst
index 67a0304dfa..8325af1e78 100644
--- a/boards/ststm32/genericSTM32F401RB.rst
+++ b/boards/ststm32/genericSTM32F401RB.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F401RC.rst b/boards/ststm32/genericSTM32F401RC.rst
index cb78f301ff..e2eb133070 100644
--- a/boards/ststm32/genericSTM32F401RC.rst
+++ b/boards/ststm32/genericSTM32F401RC.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F401RD.rst b/boards/ststm32/genericSTM32F401RD.rst
index e106e8ecd9..4adc61119f 100644
--- a/boards/ststm32/genericSTM32F401RD.rst
+++ b/boards/ststm32/genericSTM32F401RD.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F401RE.rst b/boards/ststm32/genericSTM32F401RE.rst
index 607802402d..64070d4719 100644
--- a/boards/ststm32/genericSTM32F401RE.rst
+++ b/boards/ststm32/genericSTM32F401RE.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F405RG.rst b/boards/ststm32/genericSTM32F405RG.rst
index c5a8eaaf04..e274bac474 100644
--- a/boards/ststm32/genericSTM32F405RG.rst
+++ b/boards/ststm32/genericSTM32F405RG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F407IGT6.rst b/boards/ststm32/genericSTM32F407IGT6.rst
index 5e5c49ff86..7af97909f8 100644
--- a/boards/ststm32/genericSTM32F407IGT6.rst
+++ b/boards/ststm32/genericSTM32F407IGT6.rst
@@ -128,8 +128,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F407VET6.rst b/boards/ststm32/genericSTM32F407VET6.rst
index 28c1c1ddf7..b70ee863e4 100644
--- a/boards/ststm32/genericSTM32F407VET6.rst
+++ b/boards/ststm32/genericSTM32F407VET6.rst
@@ -126,8 +126,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F407VGT6.rst b/boards/ststm32/genericSTM32F407VGT6.rst
index e60e878b9f..ae979295ff 100644
--- a/boards/ststm32/genericSTM32F407VGT6.rst
+++ b/boards/ststm32/genericSTM32F407VGT6.rst
@@ -126,8 +126,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F410C8.rst b/boards/ststm32/genericSTM32F410C8.rst
index 65841b7159..62eb23a889 100644
--- a/boards/ststm32/genericSTM32F410C8.rst
+++ b/boards/ststm32/genericSTM32F410C8.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F410CB.rst b/boards/ststm32/genericSTM32F410CB.rst
index a76b19d1a2..601d0a30cc 100644
--- a/boards/ststm32/genericSTM32F410CB.rst
+++ b/boards/ststm32/genericSTM32F410CB.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F410R8.rst b/boards/ststm32/genericSTM32F410R8.rst
index 89379394bb..03ec19bad1 100644
--- a/boards/ststm32/genericSTM32F410R8.rst
+++ b/boards/ststm32/genericSTM32F410R8.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F410RB.rst b/boards/ststm32/genericSTM32F410RB.rst
index efcf53880d..7cc9204138 100644
--- a/boards/ststm32/genericSTM32F410RB.rst
+++ b/boards/ststm32/genericSTM32F410RB.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F411CC.rst b/boards/ststm32/genericSTM32F411CC.rst
index d484178843..c89ced7ab4 100644
--- a/boards/ststm32/genericSTM32F411CC.rst
+++ b/boards/ststm32/genericSTM32F411CC.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F411CE.rst b/boards/ststm32/genericSTM32F411CE.rst
index 1d534e01b0..c037947f6e 100644
--- a/boards/ststm32/genericSTM32F411CE.rst
+++ b/boards/ststm32/genericSTM32F411CE.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F411RC.rst b/boards/ststm32/genericSTM32F411RC.rst
index d160f1de65..35a0da243c 100644
--- a/boards/ststm32/genericSTM32F411RC.rst
+++ b/boards/ststm32/genericSTM32F411RC.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F411RE.rst b/boards/ststm32/genericSTM32F411RE.rst
index 61ff8557de..226b167b59 100644
--- a/boards/ststm32/genericSTM32F411RE.rst
+++ b/boards/ststm32/genericSTM32F411RE.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F412CE.rst b/boards/ststm32/genericSTM32F412CE.rst
index 19086558ca..d317d39028 100644
--- a/boards/ststm32/genericSTM32F412CE.rst
+++ b/boards/ststm32/genericSTM32F412CE.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F412CG.rst b/boards/ststm32/genericSTM32F412CG.rst
index fe29a5df85..e112c5117b 100644
--- a/boards/ststm32/genericSTM32F412CG.rst
+++ b/boards/ststm32/genericSTM32F412CG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F412RE.rst b/boards/ststm32/genericSTM32F412RE.rst
index 506c24cc2e..b6c5ee34b2 100644
--- a/boards/ststm32/genericSTM32F412RE.rst
+++ b/boards/ststm32/genericSTM32F412RE.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F412RG.rst b/boards/ststm32/genericSTM32F412RG.rst
index 9dc6129432..e460ead874 100644
--- a/boards/ststm32/genericSTM32F412RG.rst
+++ b/boards/ststm32/genericSTM32F412RG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F413CG.rst b/boards/ststm32/genericSTM32F413CG.rst
index e4e34afd34..5c44e7875c 100644
--- a/boards/ststm32/genericSTM32F413CG.rst
+++ b/boards/ststm32/genericSTM32F413CG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F413CH.rst b/boards/ststm32/genericSTM32F413CH.rst
index d1137e6719..a4741e8f74 100644
--- a/boards/ststm32/genericSTM32F413CH.rst
+++ b/boards/ststm32/genericSTM32F413CH.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F413RG.rst b/boards/ststm32/genericSTM32F413RG.rst
index 0f5f78720b..ad342f7433 100644
--- a/boards/ststm32/genericSTM32F413RG.rst
+++ b/boards/ststm32/genericSTM32F413RG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F413RH.rst b/boards/ststm32/genericSTM32F413RH.rst
index 7e4baed7a4..89c75b066d 100644
--- a/boards/ststm32/genericSTM32F413RH.rst
+++ b/boards/ststm32/genericSTM32F413RH.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F415RG.rst b/boards/ststm32/genericSTM32F415RG.rst
index 026c717dc3..e03638f073 100644
--- a/boards/ststm32/genericSTM32F415RG.rst
+++ b/boards/ststm32/genericSTM32F415RG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F417VE.rst b/boards/ststm32/genericSTM32F417VE.rst
index d5d5908485..a5bcfd8826 100644
--- a/boards/ststm32/genericSTM32F417VE.rst
+++ b/boards/ststm32/genericSTM32F417VE.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F417VG.rst b/boards/ststm32/genericSTM32F417VG.rst
index b3e00b75ec..3fea43d455 100644
--- a/boards/ststm32/genericSTM32F417VG.rst
+++ b/boards/ststm32/genericSTM32F417VG.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F423CH.rst b/boards/ststm32/genericSTM32F423CH.rst
index 7a80ff45c4..eaf3ec6440 100644
--- a/boards/ststm32/genericSTM32F423CH.rst
+++ b/boards/ststm32/genericSTM32F423CH.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F423RH.rst b/boards/ststm32/genericSTM32F423RH.rst
index ae2a0f20a5..4f5034e5dc 100644
--- a/boards/ststm32/genericSTM32F423RH.rst
+++ b/boards/ststm32/genericSTM32F423RH.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F446RC.rst b/boards/ststm32/genericSTM32F446RC.rst
index ae046d28f2..b7b51ca969 100644
--- a/boards/ststm32/genericSTM32F446RC.rst
+++ b/boards/ststm32/genericSTM32F446RC.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/genericSTM32F446RE.rst b/boards/ststm32/genericSTM32F446RE.rst
index 8240f42529..3c12718a73 100644
--- a/boards/ststm32/genericSTM32F446RE.rst
+++ b/boards/ststm32/genericSTM32F446RE.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/hy_tinystm103tb.rst b/boards/ststm32/hy_tinystm103tb.rst
index d47931a885..f6dc4aeafd 100644
--- a/boards/ststm32/hy_tinystm103tb.rst
+++ b/boards/ststm32/hy_tinystm103tb.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/malyanm200_f070cb.rst b/boards/ststm32/malyanm200_f070cb.rst
index 478ba2bb33..4d77a5670d 100644
--- a/boards/ststm32/malyanm200_f070cb.rst
+++ b/boards/ststm32/malyanm200_f070cb.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/malyanm200_f103cb.rst b/boards/ststm32/malyanm200_f103cb.rst
index 5161fda0c0..f18e93f4ed 100644
--- a/boards/ststm32/malyanm200_f103cb.rst
+++ b/boards/ststm32/malyanm200_f103cb.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/malyanm300_f070cb.rst b/boards/ststm32/malyanm300_f070cb.rst
index 83a2fe7eb5..378870f088 100644
--- a/boards/ststm32/malyanm300_f070cb.rst
+++ b/boards/ststm32/malyanm300_f070cb.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/maple.rst b/boards/ststm32/maple.rst
index 9682736a3e..bd31cd19d9 100644
--- a/boards/ststm32/maple.rst
+++ b/boards/ststm32/maple.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/maple_mini_b20.rst b/boards/ststm32/maple_mini_b20.rst
index e777d2f925..bb877b4415 100644
--- a/boards/ststm32/maple_mini_b20.rst
+++ b/boards/ststm32/maple_mini_b20.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/maple_mini_origin.rst b/boards/ststm32/maple_mini_origin.rst
index 2324827ee3..3cecc49c87 100644
--- a/boards/ststm32/maple_mini_origin.rst
+++ b/boards/ststm32/maple_mini_origin.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/maple_ret6.rst b/boards/ststm32/maple_ret6.rst
index ed23e9f9bf..329f4de019 100644
--- a/boards/ststm32/maple_ret6.rst
+++ b/boards/ststm32/maple_ret6.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/mbed_connect_odin.rst b/boards/ststm32/mbed_connect_odin.rst
index 8cbe77481c..9394f180cd 100644
--- a/boards/ststm32/mbed_connect_odin.rst
+++ b/boards/ststm32/mbed_connect_odin.rst
@@ -127,11 +127,11 @@ Frameworks
     * - Name
       - Description
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/microduino32_flash.rst b/boards/ststm32/microduino32_flash.rst
index cbd8e3c71d..f87ba5526b 100644
--- a/boards/ststm32/microduino32_flash.rst
+++ b/boards/ststm32/microduino32_flash.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/mote_l152rc.rst b/boards/ststm32/mote_l152rc.rst
index 5630bee386..974a7bf1ef 100644
--- a/boards/ststm32/mote_l152rc.rst
+++ b/boards/ststm32/mote_l152rc.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/mts_dragonfly_f411re.rst b/boards/ststm32/mts_dragonfly_f411re.rst
index 0022a176cc..15e47832f6 100644
--- a/boards/ststm32/mts_dragonfly_f411re.rst
+++ b/boards/ststm32/mts_dragonfly_f411re.rst
@@ -128,11 +128,11 @@ Frameworks
     * - Name
       - Description
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/mts_mdot_f405rg.rst b/boards/ststm32/mts_mdot_f405rg.rst
index 0098927584..62c04e0dd5 100644
--- a/boards/ststm32/mts_mdot_f405rg.rst
+++ b/boards/ststm32/mts_mdot_f405rg.rst
@@ -128,11 +128,11 @@ Frameworks
     * - Name
       - Description
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/mts_mdot_f411re.rst b/boards/ststm32/mts_mdot_f411re.rst
index efa56475c9..4066d67ee5 100644
--- a/boards/ststm32/mts_mdot_f411re.rst
+++ b/boards/ststm32/mts_mdot_f411re.rst
@@ -128,11 +128,11 @@ Frameworks
     * - Name
       - Description
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/mxchip_az3166.rst b/boards/ststm32/mxchip_az3166.rst
index a7074999db..54398c2759 100644
--- a/boards/ststm32/mxchip_az3166.rst
+++ b/boards/ststm32/mxchip_az3166.rst
@@ -133,8 +133,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/netduino2plus.rst b/boards/ststm32/netduino2plus.rst
index 9e63c0b0bf..43407bb5e7 100644
--- a/boards/ststm32/netduino2plus.rst
+++ b/boards/ststm32/netduino2plus.rst
@@ -126,8 +126,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f030r8.rst b/boards/ststm32/nucleo_f030r8.rst
index 5a6d7b928a..a988f42e81 100644
--- a/boards/ststm32/nucleo_f030r8.rst
+++ b/boards/ststm32/nucleo_f030r8.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f031k6.rst b/boards/ststm32/nucleo_f031k6.rst
index 031f8931b8..80a1dc2efd 100644
--- a/boards/ststm32/nucleo_f031k6.rst
+++ b/boards/ststm32/nucleo_f031k6.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f042k6.rst b/boards/ststm32/nucleo_f042k6.rst
index 0345109dbe..606faa341f 100644
--- a/boards/ststm32/nucleo_f042k6.rst
+++ b/boards/ststm32/nucleo_f042k6.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f070rb.rst b/boards/ststm32/nucleo_f070rb.rst
index d86729ce98..3aa9617c15 100644
--- a/boards/ststm32/nucleo_f070rb.rst
+++ b/boards/ststm32/nucleo_f070rb.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f072rb.rst b/boards/ststm32/nucleo_f072rb.rst
index bc4f6d167e..6138551831 100644
--- a/boards/ststm32/nucleo_f072rb.rst
+++ b/boards/ststm32/nucleo_f072rb.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f091rc.rst b/boards/ststm32/nucleo_f091rc.rst
index f7b8ce5c7c..6157161a7a 100644
--- a/boards/ststm32/nucleo_f091rc.rst
+++ b/boards/ststm32/nucleo_f091rc.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f103rb.rst b/boards/ststm32/nucleo_f103rb.rst
index c32b07f283..7418951805 100644
--- a/boards/ststm32/nucleo_f103rb.rst
+++ b/boards/ststm32/nucleo_f103rb.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f207zg.rst b/boards/ststm32/nucleo_f207zg.rst
index 9331b4db43..b4e37f4922 100644
--- a/boards/ststm32/nucleo_f207zg.rst
+++ b/boards/ststm32/nucleo_f207zg.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f302r8.rst b/boards/ststm32/nucleo_f302r8.rst
index 627d2bf720..2df2982281 100644
--- a/boards/ststm32/nucleo_f302r8.rst
+++ b/boards/ststm32/nucleo_f302r8.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f303k8.rst b/boards/ststm32/nucleo_f303k8.rst
index a57312558b..685e0791f5 100644
--- a/boards/ststm32/nucleo_f303k8.rst
+++ b/boards/ststm32/nucleo_f303k8.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f303re.rst b/boards/ststm32/nucleo_f303re.rst
index 9bf214f84f..aab85b4a9c 100644
--- a/boards/ststm32/nucleo_f303re.rst
+++ b/boards/ststm32/nucleo_f303re.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f303ze.rst b/boards/ststm32/nucleo_f303ze.rst
index 2c950e18aa..369d9f4e93 100644
--- a/boards/ststm32/nucleo_f303ze.rst
+++ b/boards/ststm32/nucleo_f303ze.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f334r8.rst b/boards/ststm32/nucleo_f334r8.rst
index ec7a7f9f0b..546c087bab 100644
--- a/boards/ststm32/nucleo_f334r8.rst
+++ b/boards/ststm32/nucleo_f334r8.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f401re.rst b/boards/ststm32/nucleo_f401re.rst
index 810cbbbb55..b2dea70107 100644
--- a/boards/ststm32/nucleo_f401re.rst
+++ b/boards/ststm32/nucleo_f401re.rst
@@ -134,17 +134,17 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-    * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+    * - :ref:`framework_zephyr`
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f410rb.rst b/boards/ststm32/nucleo_f410rb.rst
index 458463edd7..7af0e8649d 100644
--- a/boards/ststm32/nucleo_f410rb.rst
+++ b/boards/ststm32/nucleo_f410rb.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f411re.rst b/boards/ststm32/nucleo_f411re.rst
index 246f4ad88d..fa76794be6 100644
--- a/boards/ststm32/nucleo_f411re.rst
+++ b/boards/ststm32/nucleo_f411re.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f412zg.rst b/boards/ststm32/nucleo_f412zg.rst
index 1ccadd9a46..fab8acc019 100644
--- a/boards/ststm32/nucleo_f412zg.rst
+++ b/boards/ststm32/nucleo_f412zg.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f413zh.rst b/boards/ststm32/nucleo_f413zh.rst
index 784aefe0ef..ea3699782e 100644
--- a/boards/ststm32/nucleo_f413zh.rst
+++ b/boards/ststm32/nucleo_f413zh.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f429zi.rst b/boards/ststm32/nucleo_f429zi.rst
index 04dbe730b9..4a1c4467df 100644
--- a/boards/ststm32/nucleo_f429zi.rst
+++ b/boards/ststm32/nucleo_f429zi.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f439zi.rst b/boards/ststm32/nucleo_f439zi.rst
index f9ad4373ce..dc5f267520 100644
--- a/boards/ststm32/nucleo_f439zi.rst
+++ b/boards/ststm32/nucleo_f439zi.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f446re.rst b/boards/ststm32/nucleo_f446re.rst
index 71808d53ff..8b6d4f5ba1 100644
--- a/boards/ststm32/nucleo_f446re.rst
+++ b/boards/ststm32/nucleo_f446re.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f446ze.rst b/boards/ststm32/nucleo_f446ze.rst
index c679d291d2..ed0dec2d19 100644
--- a/boards/ststm32/nucleo_f446ze.rst
+++ b/boards/ststm32/nucleo_f446ze.rst
@@ -131,6 +131,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -138,7 +141,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f722ze.rst b/boards/ststm32/nucleo_f722ze.rst
index a8cf22ffd1..3b21be2910 100644
--- a/boards/ststm32/nucleo_f722ze.rst
+++ b/boards/ststm32/nucleo_f722ze.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f746zg.rst b/boards/ststm32/nucleo_f746zg.rst
index 5e126adb07..aca8970501 100644
--- a/boards/ststm32/nucleo_f746zg.rst
+++ b/boards/ststm32/nucleo_f746zg.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f756zg.rst b/boards/ststm32/nucleo_f756zg.rst
index 07d879c866..2854cc76df 100644
--- a/boards/ststm32/nucleo_f756zg.rst
+++ b/boards/ststm32/nucleo_f756zg.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_f767zi.rst b/boards/ststm32/nucleo_f767zi.rst
index b04d27775c..e11a827ba0 100644
--- a/boards/ststm32/nucleo_f767zi.rst
+++ b/boards/ststm32/nucleo_f767zi.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_g071rb.rst b/boards/ststm32/nucleo_g071rb.rst
index 04c7007955..6487556a68 100644
--- a/boards/ststm32/nucleo_g071rb.rst
+++ b/boards/ststm32/nucleo_g071rb.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_g431kb.rst b/boards/ststm32/nucleo_g431kb.rst
index 057962b590..963119f2f1 100644
--- a/boards/ststm32/nucleo_g431kb.rst
+++ b/boards/ststm32/nucleo_g431kb.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_g431rb.rst b/boards/ststm32/nucleo_g431rb.rst
index d465f33f4e..120dbfb427 100644
--- a/boards/ststm32/nucleo_g431rb.rst
+++ b/boards/ststm32/nucleo_g431rb.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_g474re.rst b/boards/ststm32/nucleo_g474re.rst
index cd5a3d24a2..c8f431ba76 100644
--- a/boards/ststm32/nucleo_g474re.rst
+++ b/boards/ststm32/nucleo_g474re.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l011k4.rst b/boards/ststm32/nucleo_l011k4.rst
index 2b90fc4712..1337577e26 100644
--- a/boards/ststm32/nucleo_l011k4.rst
+++ b/boards/ststm32/nucleo_l011k4.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l031k6.rst b/boards/ststm32/nucleo_l031k6.rst
index 80d1a5f1ee..0935aa3859 100644
--- a/boards/ststm32/nucleo_l031k6.rst
+++ b/boards/ststm32/nucleo_l031k6.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l053r8.rst b/boards/ststm32/nucleo_l053r8.rst
index c3e6b7d7bd..c76084dd00 100644
--- a/boards/ststm32/nucleo_l053r8.rst
+++ b/boards/ststm32/nucleo_l053r8.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l073rz.rst b/boards/ststm32/nucleo_l073rz.rst
index 0242ba4094..e23aab10b8 100644
--- a/boards/ststm32/nucleo_l073rz.rst
+++ b/boards/ststm32/nucleo_l073rz.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l152re.rst b/boards/ststm32/nucleo_l152re.rst
index 448781134f..0b7e351445 100644
--- a/boards/ststm32/nucleo_l152re.rst
+++ b/boards/ststm32/nucleo_l152re.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l432kc.rst b/boards/ststm32/nucleo_l432kc.rst
index b20bfce23a..8168f9605f 100644
--- a/boards/ststm32/nucleo_l432kc.rst
+++ b/boards/ststm32/nucleo_l432kc.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l433rc_p.rst b/boards/ststm32/nucleo_l433rc_p.rst
index da6c3d3167..d9e5e7ea0c 100644
--- a/boards/ststm32/nucleo_l433rc_p.rst
+++ b/boards/ststm32/nucleo_l433rc_p.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l452re.rst b/boards/ststm32/nucleo_l452re.rst
index 20ed242633..0edc007cc3 100644
--- a/boards/ststm32/nucleo_l452re.rst
+++ b/boards/ststm32/nucleo_l452re.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l476rg.rst b/boards/ststm32/nucleo_l476rg.rst
index d49003a4c4..05e590be06 100644
--- a/boards/ststm32/nucleo_l476rg.rst
+++ b/boards/ststm32/nucleo_l476rg.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l486rg.rst b/boards/ststm32/nucleo_l486rg.rst
index fd10bb3bef..5fcf4f3d8a 100644
--- a/boards/ststm32/nucleo_l486rg.rst
+++ b/boards/ststm32/nucleo_l486rg.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l496zg.rst b/boards/ststm32/nucleo_l496zg.rst
index 1cd8766947..3ea30f462f 100644
--- a/boards/ststm32/nucleo_l496zg.rst
+++ b/boards/ststm32/nucleo_l496zg.rst
@@ -134,6 +134,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -141,7 +144,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/nucleo_l496zg_p.rst b/boards/ststm32/nucleo_l496zg_p.rst
index aeb3cd5ffd..c252fe7962 100644
--- a/boards/ststm32/nucleo_l496zg_p.rst
+++ b/boards/ststm32/nucleo_l496zg_p.rst
@@ -134,11 +134,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/olimex_e407.rst b/boards/ststm32/olimex_e407.rst
index dae5804431..881c84fcd3 100644
--- a/boards/ststm32/olimex_e407.rst
+++ b/boards/ststm32/olimex_e407.rst
@@ -133,11 +133,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/olimex_f103.rst b/boards/ststm32/olimex_f103.rst
index 4e6c3cad30..764b5c87d3 100644
--- a/boards/ststm32/olimex_f103.rst
+++ b/boards/ststm32/olimex_f103.rst
@@ -133,11 +133,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/olimex_h407.rst b/boards/ststm32/olimex_h407.rst
index 2820623725..b529375381 100644
--- a/boards/ststm32/olimex_h407.rst
+++ b/boards/ststm32/olimex_h407.rst
@@ -133,11 +133,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/olimex_p405.rst b/boards/ststm32/olimex_p405.rst
index 52e39e059d..2b807f22b3 100644
--- a/boards/ststm32/olimex_p405.rst
+++ b/boards/ststm32/olimex_p405.rst
@@ -133,11 +133,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/olimexino.rst b/boards/ststm32/olimexino.rst
index 553cd317c9..1104dcd18f 100644
--- a/boards/ststm32/olimexino.rst
+++ b/boards/ststm32/olimexino.rst
@@ -133,6 +133,9 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
@@ -140,7 +143,4 @@ Frameworks
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/olimexino_stm32f3.rst b/boards/ststm32/olimexino_stm32f3.rst
index 163e072ddd..d7063c7648 100644
--- a/boards/ststm32/olimexino_stm32f3.rst
+++ b/boards/ststm32/olimexino_stm32f3.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/piconomix_px_her0.rst b/boards/ststm32/piconomix_px_her0.rst
index 814a1d43c6..20262d17e2 100644
--- a/boards/ststm32/piconomix_px_her0.rst
+++ b/boards/ststm32/piconomix_px_her0.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/prntr_v2.rst b/boards/ststm32/prntr_v2.rst
index 407add6130..78e2d95651 100644
--- a/boards/ststm32/prntr_v2.rst
+++ b/boards/ststm32/prntr_v2.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/pybstick26_duino.rst b/boards/ststm32/pybstick26_duino.rst
index e981e5c5f9..a952aed942 100644
--- a/boards/ststm32/pybstick26_duino.rst
+++ b/boards/ststm32/pybstick26_duino.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/pybstick26_lite.rst b/boards/ststm32/pybstick26_lite.rst
index 7d125ba45c..f39288f3cc 100644
--- a/boards/ststm32/pybstick26_lite.rst
+++ b/boards/ststm32/pybstick26_lite.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/pybstick26_pro.rst b/boards/ststm32/pybstick26_pro.rst
index d99962d91c..efddb3f4c3 100644
--- a/boards/ststm32/pybstick26_pro.rst
+++ b/boards/ststm32/pybstick26_pro.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/pybstick26_std.rst b/boards/ststm32/pybstick26_std.rst
index 3c237319e4..b4e6b6980a 100644
--- a/boards/ststm32/pybstick26_std.rst
+++ b/boards/ststm32/pybstick26_std.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/rak811_tracker.rst b/boards/ststm32/rak811_tracker.rst
index 12aafcb44e..d7b1563118 100644
--- a/boards/ststm32/rak811_tracker.rst
+++ b/boards/ststm32/rak811_tracker.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/rak811_tracker_32.rst b/boards/ststm32/rak811_tracker_32.rst
index 75663ac25a..401244e37f 100644
--- a/boards/ststm32/rak811_tracker_32.rst
+++ b/boards/ststm32/rak811_tracker_32.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/remram_v1.rst b/boards/ststm32/remram_v1.rst
index 2b637265ca..ad8c6326a9 100644
--- a/boards/ststm32/remram_v1.rst
+++ b/boards/ststm32/remram_v1.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/rhf76_052.rst b/boards/ststm32/rhf76_052.rst
index 22ab356ded..629aaa5fff 100644
--- a/boards/ststm32/rhf76_052.rst
+++ b/boards/ststm32/rhf76_052.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/rhombio_l476dmw1k.rst b/boards/ststm32/rhombio_l476dmw1k.rst
index 142f139b0c..9f813d5c73 100644
--- a/boards/ststm32/rhombio_l476dmw1k.rst
+++ b/boards/ststm32/rhombio_l476dmw1k.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/robotdyn_blackpill_f303cc.rst b/boards/ststm32/robotdyn_blackpill_f303cc.rst
index 2dc4361b63..2a7bf0db2e 100644
--- a/boards/ststm32/robotdyn_blackpill_f303cc.rst
+++ b/boards/ststm32/robotdyn_blackpill_f303cc.rst
@@ -133,8 +133,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/rumba32_f446ve.rst b/boards/ststm32/rumba32_f446ve.rst
index 0378781f92..accd49a4f9 100644
--- a/boards/ststm32/rumba32_f446ve.rst
+++ b/boards/ststm32/rumba32_f446ve.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/sakuraio_evb_01.rst b/boards/ststm32/sakuraio_evb_01.rst
index 0e32275d3c..9cc5951c7a 100644
--- a/boards/ststm32/sakuraio_evb_01.rst
+++ b/boards/ststm32/sakuraio_evb_01.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/seeedArchMax.rst b/boards/ststm32/seeedArchMax.rst
index 0eacbce968..91afcc4b6e 100644
--- a/boards/ststm32/seeedArchMax.rst
+++ b/boards/ststm32/seeedArchMax.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/silica_sensor_node.rst b/boards/ststm32/silica_sensor_node.rst
index aaa0acdd80..38c4bb8b23 100644
--- a/boards/ststm32/silica_sensor_node.rst
+++ b/boards/ststm32/silica_sensor_node.rst
@@ -131,11 +131,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/sparky_v1.rst b/boards/ststm32/sparky_v1.rst
index c54b0d92e2..ada3a52f9a 100644
--- a/boards/ststm32/sparky_v1.rst
+++ b/boards/ststm32/sparky_v1.rst
@@ -133,8 +133,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/steval_fcu001v1.rst b/boards/ststm32/steval_fcu001v1.rst
index 7b23113d24..e15bc9c268 100644
--- a/boards/ststm32/steval_fcu001v1.rst
+++ b/boards/ststm32/steval_fcu001v1.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_stm32cube`
       - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
     * - :ref:`framework_zephyr`
-      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
\ No newline at end of file
diff --git a/boards/ststm32/steval_mksboxv1.rst b/boards/ststm32/steval_mksboxv1.rst
index 6bfe3e1143..f3a82ef635 100644
--- a/boards/ststm32/steval_mksboxv1.rst
+++ b/boards/ststm32/steval_mksboxv1.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/stm32f4stamp.rst b/boards/ststm32/stm32f4stamp.rst
index 9e2aab63ed..4d090900af 100644
--- a/boards/ststm32/stm32f4stamp.rst
+++ b/boards/ststm32/stm32f4stamp.rst
@@ -126,8 +126,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/storm32_v1_31_rc.rst b/boards/ststm32/storm32_v1_31_rc.rst
index 1041a3f8c3..6ab6248aec 100644
--- a/boards/ststm32/storm32_v1_31_rc.rst
+++ b/boards/ststm32/storm32_v1_31_rc.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/thunder_pack.rst b/boards/ststm32/thunder_pack.rst
index 6e66f5a1ce..00c5d90708 100644
--- a/boards/ststm32/thunder_pack.rst
+++ b/boards/ststm32/thunder_pack.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/thunder_pack_f411.rst b/boards/ststm32/thunder_pack_f411.rst
index 635b9b681d..2ce3176ac3 100644
--- a/boards/ststm32/thunder_pack_f411.rst
+++ b/boards/ststm32/thunder_pack_f411.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/vake_v1.rst b/boards/ststm32/vake_v1.rst
index a71f10d1e2..c47a0fc194 100644
--- a/boards/ststm32/vake_v1.rst
+++ b/boards/ststm32/vake_v1.rst
@@ -134,8 +134,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/vccgnd_f103zet6.rst b/boards/ststm32/vccgnd_f103zet6.rst
index 9e3ea43b0b..5c60752ae7 100644
--- a/boards/ststm32/vccgnd_f103zet6.rst
+++ b/boards/ststm32/vccgnd_f103zet6.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/vccgnd_f407zg_mini.rst b/boards/ststm32/vccgnd_f407zg_mini.rst
index dfc01f3304..da35dc7cb5 100644
--- a/boards/ststm32/vccgnd_f407zg_mini.rst
+++ b/boards/ststm32/vccgnd_f407zg_mini.rst
@@ -135,8 +135,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/waveshare_open103z.rst b/boards/ststm32/waveshare_open103z.rst
index 5999adb078..13c2845ebd 100644
--- a/boards/ststm32/waveshare_open103z.rst
+++ b/boards/ststm32/waveshare_open103z.rst
@@ -133,8 +133,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/wio_3g.rst b/boards/ststm32/wio_3g.rst
index 6bfd5082e6..258748be82 100644
--- a/boards/ststm32/wio_3g.rst
+++ b/boards/ststm32/wio_3g.rst
@@ -126,11 +126,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/wraith32_v1.rst b/boards/ststm32/wraith32_v1.rst
index b0f4d96549..49a07a6887 100644
--- a/boards/ststm32/wraith32_v1.rst
+++ b/boards/ststm32/wraith32_v1.rst
@@ -131,8 +131,8 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/boards/ststm32/xdot_l151cc.rst b/boards/ststm32/xdot_l151cc.rst
index eddb849475..6a5ce94bd0 100644
--- a/boards/ststm32/xdot_l151cc.rst
+++ b/boards/ststm32/xdot_l151cc.rst
@@ -130,11 +130,11 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
     * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
\ No newline at end of file
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
\ No newline at end of file
diff --git a/frameworks/arduino.rst b/frameworks/arduino.rst
index ec63e4d058..2a349f1e4f 100644
--- a/frameworks/arduino.rst
+++ b/frameworks/arduino.rst
@@ -19,9 +19,6 @@ Arduino
 
 Arduino Wiring-based Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences
 
-For more detailed information please visit `vendor site <http://arduino.cc/en/Reference/HomePage?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
@@ -3613,7 +3610,7 @@ Platforms
       - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
     * - :ref:`platform_ststm32`
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
@@ -3650,13 +3647,6 @@ Boards
       - Frequency
       - Flash
       - RAM
-    * - :ref:`board_microchippic32_picadillo_35t`
-      - :ref:`platform_microchippic32`
-      - No
-      - 32MX795F512L
-      - 80MHz
-      - 508KB
-      - 128KB
     * - :ref:`board_espressif8266_gen4iod`
       - :ref:`platform_espressif8266`
       - No
@@ -3665,6 +3655,27 @@ Boards
       - 512KB
       - 80KB
 
+4DSystems
+~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Platform
+      - Debug
+      - MCU
+      - Frequency
+      - Flash
+      - RAM
+    * - :ref:`board_microchippic32_picadillo_35t`
+      - :ref:`platform_microchippic32`
+      - No
+      - 32MX795F512L
+      - 80MHz
+      - 508KB
+      - 128KB
+
 AI Thinker
 ~~~~~~~~~~
 
@@ -6719,7 +6730,7 @@ Heltec
     * - :ref:`board_asrmicro650x_cubecell_capsule_solar_sensor`
       - :ref:`platform_asrmicro650x`
       - No
-      - ASR6051
+      - ASR6502
       - 48MHz
       - 128KB
       - 16KB
@@ -6737,13 +6748,6 @@ Heltec
       - 48MHz
       - 128KB
       - 16KB
-    * - :ref:`board_asrmicro650x_cubecell_board_pro`
-      - :ref:`platform_asrmicro650x`
-      - No
-      - ASR6601
-      - 48MHz
-      - 224KB
-      - 224KB
     * - :ref:`board_asrmicro650x_cubecell_board_plus`
       - :ref:`platform_asrmicro650x`
       - No
@@ -8011,27 +8015,6 @@ Microchip
       - 16MHz
       - 16KB
       - 2KB
-    * - :ref:`board_atmelmegaavr_ATtiny1624`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY1624
-      - 16MHz
-      - 16KB
-      - 2KB
-    * - :ref:`board_atmelmegaavr_ATtiny1626`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY1626
-      - 16MHz
-      - 16KB
-      - 2KB
-    * - :ref:`board_atmelmegaavr_ATtiny1627`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY1627
-      - 16MHz
-      - 16KB
-      - 2KB
     * - :ref:`board_atmelmegaavr_ATtiny202`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8074,27 +8057,6 @@ Microchip
       - 16MHz
       - 32KB
       - 2KB
-    * - :ref:`board_atmelmegaavr_ATtiny3224`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY3224
-      - 16MHz
-      - 32KB
-      - 3KB
-    * - :ref:`board_atmelmegaavr_ATtiny3226`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY3226
-      - 16MHz
-      - 32KB
-      - 3KB
-    * - :ref:`board_atmelmegaavr_ATtiny3227`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY3227
-      - 16MHz
-      - 32KB
-      - 3KB
     * - :ref:`board_atmelmegaavr_ATtiny402`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8144,27 +8106,6 @@ Microchip
       - 16MHz
       - 4KB
       - 256B
-    * - :ref:`board_atmelmegaavr_ATtiny424`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY424
-      - 16MHz
-      - 4KB
-      - 512B
-    * - :ref:`board_atmelmegaavr_ATtiny426`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY426
-      - 16MHz
-      - 4KB
-      - 512B
-    * - :ref:`board_atmelmegaavr_ATtiny427`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY427
-      - 16MHz
-      - 4KB
-      - 512B
     * - :ref:`board_atmelmegaavr_ATtiny804`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8207,27 +8148,6 @@ Microchip
       - 16MHz
       - 8KB
       - 512B
-    * - :ref:`board_atmelmegaavr_ATtiny824`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY824
-      - 16MHz
-      - 8KB
-      - 1KB
-    * - :ref:`board_atmelmegaavr_ATtiny826`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY826
-      - 16MHz
-      - 8KB
-      - 1KB
-    * - :ref:`board_atmelmegaavr_ATtiny827`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - ATTINY827
-      - 16MHz
-      - 8KB
-      - 1KB
     * - :ref:`board_atmelmegaavr_avr_iot_wg`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8235,188 +8155,6 @@ Microchip
       - 16MHz
       - 48KB
       - 6KB
-    * - :ref:`board_atmelmegaavr_AVR128DA28`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DA28
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DA32`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DA32
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DA48`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DA48
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DA64`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DA64
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DB28`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DB28
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DB32`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DB32
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DB48`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DB48
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DB64`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DB64
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR32DA28`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR32DA28
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DA32`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR32DA32
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DA48`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR32DA48
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DB28`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR32DB28
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DB32`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR32DB32
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DB48`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR32DB48
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR64DA28`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DA28
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DA32`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DA32
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DA48`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DA48
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DA64`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DA64
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DB28`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DB28
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DB32`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DB32
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DB48`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DB48
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DB64`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DB64
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DD14`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DD14
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DD20`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DD20
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DD28`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DD28
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DD32`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR64DD32
-      - 24MHz
-      - 64KB
-      - 8KB
     * - :ref:`board_atmelmegaavr_curiosity_nano_4809`
       - :ref:`platform_atmelmegaavr`
       - No
@@ -8424,20 +8162,6 @@ Microchip
       - 16MHz
       - 48KB
       - 6KB
-    * - :ref:`board_atmelmegaavr_curiosity_nano_da`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DA48
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_curiosity_nano_db`
-      - :ref:`platform_atmelmegaavr`
-      - No
-      - AVR128DB48
-      - 24MHz
-      - 128KB
-      - 16KB
     * - :ref:`board_atmelmegaavr_xplained_pro_4809`
       - :ref:`platform_atmelmegaavr`
       - No
diff --git a/frameworks/cmsis.rst b/frameworks/cmsis.rst
index 21704c5637..0ed3fb8f52 100644
--- a/frameworks/cmsis.rst
+++ b/frameworks/cmsis.rst
@@ -19,9 +19,6 @@ CMSIS
 
 The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
-For more detailed information please visit `vendor site <https://developer.arm.com/tools-and-software/embedded/cmsis?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/esp8266-nonos-sdk.rst b/frameworks/esp8266-nonos-sdk.rst
index b4342dc639..13ca0e96b3 100644
--- a/frameworks/esp8266-nonos-sdk.rst
+++ b/frameworks/esp8266-nonos-sdk.rst
@@ -19,9 +19,6 @@ ESP8266 Non-OS SDK
 
 The non-OS SDK provides a set of application programming interfaces (APIs) for core ESP8266 functionalities such as data reception/transmission over Wi-Fi, TCP/IP stack functions, hardware interface functions and basic system management functions
 
-For more detailed information please visit `vendor site <https://github.com/espressif/ESP8266_NONOS_SDK?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/esp8266-rtos-sdk.rst b/frameworks/esp8266-rtos-sdk.rst
index f1ae39f0b8..c9a5b07be7 100644
--- a/frameworks/esp8266-rtos-sdk.rst
+++ b/frameworks/esp8266-rtos-sdk.rst
@@ -19,9 +19,6 @@ ESP8266 RTOS SDK
 
 ESP8266 SDK based on FreeRTOS, a truly free professional grade RTOS for microcontrollers
 
-For more detailed information please visit `vendor site <https://github.com/espressif/ESP8266_RTOS_SDK?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/espidf.rst b/frameworks/espidf.rst
index edeb6f4d20..de7b5373dc 100644
--- a/frameworks/espidf.rst
+++ b/frameworks/espidf.rst
@@ -19,9 +19,6 @@ Espressif IoT Development Framework
 
 ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-For more detailed information please visit `vendor site <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/freedom-e-sdk.rst b/frameworks/freedom-e-sdk.rst
index 7c9b1e93ee..6482bb6858 100644
--- a/frameworks/freedom-e-sdk.rst
+++ b/frameworks/freedom-e-sdk.rst
@@ -19,9 +19,6 @@ Freedom E SDK
 
 Open Source Software for Developing on the SiFive Freedom E Platform
 
-For more detailed information please visit `vendor site <https://github.com/sifive/freedom-e-sdk?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/freertos.rst b/frameworks/freertos.rst
index 5989b5d5b5..80bd511eba 100644
--- a/frameworks/freertos.rst
+++ b/frameworks/freertos.rst
@@ -19,9 +19,6 @@ FreeRTOS
 
 FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
 
-For more detailed information please visit `vendor site <https://www.freertos.org?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/gd32vf103-sdk.rst b/frameworks/gd32vf103-sdk.rst
index 211c20a39b..4b82900134 100644
--- a/frameworks/gd32vf103-sdk.rst
+++ b/frameworks/gd32vf103-sdk.rst
@@ -19,9 +19,6 @@ GigaDevice GD32V SDK
 
 GigaDevice GD32VF103 Firmware Library (SDK) is a firmware function package, including programs, data structures and macro definitions, all the performance features of peripherals of GD32VF103 devices are involved in the package
 
-For more detailed information please visit `vendor site <https://github.com/riscv-mcu/GD32VF103_Firmware_Library?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/index.rst b/frameworks/index.rst
index d744eee5c5..3b1954f7b0 100644
--- a/frameworks/index.rst
+++ b/frameworks/index.rst
@@ -28,9 +28,7 @@ Frameworks
     kendryte-freertos-sdk
     kendryte-standalone-sdk
     libopencm3
-    logicromsdk
     mbed
-    nuclei-sdk
     pulp-os
     pulp-runtime
     pulp-sdk
diff --git a/frameworks/kendryte-freertos-sdk.rst b/frameworks/kendryte-freertos-sdk.rst
index afc7c11be0..69967d5989 100644
--- a/frameworks/kendryte-freertos-sdk.rst
+++ b/frameworks/kendryte-freertos-sdk.rst
@@ -19,9 +19,6 @@ Kendryte FreeRTOS SDK
 
 Kendryte SDK with FreeRTOS support
 
-For more detailed information please visit `vendor site <https://github.com/kendryte/kendryte-freertos-sdk?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/kendryte-standalone-sdk.rst b/frameworks/kendryte-standalone-sdk.rst
index 07e7ab75cd..761ef67b1d 100644
--- a/frameworks/kendryte-standalone-sdk.rst
+++ b/frameworks/kendryte-standalone-sdk.rst
@@ -19,9 +19,6 @@ Kendryte Standalone SDK
 
 Kendryte Standalone SDK without OS support
 
-For more detailed information please visit `vendor site <https://github.com/kendryte/kendryte-standalone-sdk?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/libopencm3.rst b/frameworks/libopencm3.rst
index 54b8da2285..2fdade60a7 100644
--- a/frameworks/libopencm3.rst
+++ b/frameworks/libopencm3.rst
@@ -19,9 +19,6 @@ libopencm3
 
 The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
 
-For more detailed information please visit `vendor site <http://www.libopencm3.org?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/logicromsdk.rst b/frameworks/logicromsdk.rst
deleted file mode 100644
index 9e1415f2c2..0000000000
--- a/frameworks/logicromsdk.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _framework_logicromsdk:
-
-Logicrom SDK
-============
-
-:Configuration:
-  :ref:`projectconf_env_framework` = ``logicromsdk``
-
-Logicrom Software Development Kit is a framework for Wireless IoT development on 4G LTE (RDA8910), GSM (MT2503/MT6261) and NBIoT (MT2625) chipsets/modules.
-
-For more detailed information please visit `vendor site <https://github.com/waybyte/logicromsdk?utm_source=platformio.org&utm_medium=docs>`_.
-
-
-.. contents:: Contents
-    :local:
-    :depth: 1
\ No newline at end of file
diff --git a/frameworks/mbed.rst b/frameworks/mbed.rst
index 08cbf12205..cedf4700d6 100644
--- a/frameworks/mbed.rst
+++ b/frameworks/mbed.rst
@@ -19,9 +19,6 @@ Mbed
 
 Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-For more detailed information please visit `vendor site <https://os.mbed.com/?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/nuclei-sdk.rst b/frameworks/nuclei-sdk.rst
deleted file mode 100644
index 34227a5917..0000000000
--- a/frameworks/nuclei-sdk.rst
+++ /dev/null
@@ -1,189 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _framework_nuclei-sdk:
-
-Nuclei SDK
-==========
-
-:Configuration:
-  :ref:`projectconf_env_framework` = ``nuclei-sdk``
-
-Open Source Software Development Kit for the Nuclei N/NX processors
-
-For more detailed information please visit `vendor site <https://github.com/Nuclei-Software/nuclei-sdk?utm_source=platformio.org&utm_medium=docs>`_.
-
-
-.. contents:: Contents
-    :local:
-    :depth: 1
-
-Debugging
----------
-
-:ref:`piodebug` - "1-click" solution for debugging with a zero configuration.
-
-.. contents::
-    :local:
-
-
-Tools & Debug Probes
-~~~~~~~~~~~~~~~~~~~~
-
-Supported debugging tools are listed in "Debug" column. For more detailed
-information, please scroll table by horizontal.
-You can switch between debugging :ref:`debugging_tools` using
-:ref:`projectconf_debug_tool` option in :ref:`projectconf`.
-
-.. warning::
-    You will need to install debug tool drivers depending on your system.
-    Please click on compatible debug tool below for the further instructions.
-
-
-On-Board Debug Tools
-^^^^^^^^^^^^^^^^^^^^
-
-Boards listed below have on-board debug probe and **ARE READY** for debugging!
-You do not need to use/buy external debug probe.
-
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Platform
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - :ref:`platform_nuclei`
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_hbird_eval`
-      - :ref:`platform_nuclei`
-      - HUMMINGBIRD
-      - 5MHz
-      - 64KB
-      - 64KB
-
-
-External Debug Tools
-^^^^^^^^^^^^^^^^^^^^
-
-Boards listed below are compatible with :ref:`piodebug` but **DEPEND ON**
-external debug probe. They **ARE NOT READY** for debugging.
-Please click on board name for the further details.
-
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Platform
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - :ref:`platform_nuclei`
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - :ref:`platform_nuclei`
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-
-
-Examples
---------
-
-* `Nuclei SDK for Nuclei <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_nuclei`
-      - Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
-Boards
-------
-
-.. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command
-    * For more detailed ``board`` information please scroll the tables below by horizontally.
-
-GigaDevice
-~~~~~~~~~~
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Platform
-      - Debug
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-
-Nuclei
-~~~~~~
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Platform
-      - Debug
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - :ref:`platform_nuclei`
-      - On-board
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_hbird_eval`
-      - :ref:`platform_nuclei`
-      - On-board
-      - HUMMINGBIRD
-      - 5MHz
-      - 64KB
-      - 64KB
diff --git a/frameworks/pulp-os.rst b/frameworks/pulp-os.rst
index ec1c364c1e..f0cf201612 100644
--- a/frameworks/pulp-os.rst
+++ b/frameworks/pulp-os.rst
@@ -19,9 +19,6 @@ PULP OS
 
 PULP is a silicon-proven Parallel Ultra Low Power platform targeting high energy efficiencies. The platform is organized in clusters of RISC-V cores that share a tightly-coupled data memory
 
-For more detailed information please visit `vendor site <https://www.pulp-platform.org?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/pulp-runtime.rst b/frameworks/pulp-runtime.rst
index 184c9db411..0436a2e839 100644
--- a/frameworks/pulp-runtime.rst
+++ b/frameworks/pulp-runtime.rst
@@ -19,9 +19,6 @@ PULP Runtime Environment
 
 Runtime Environment for Parallel Ultra Low Power platform targeting high energy efficiencies
 
-For more detailed information please visit `vendor site <https://github.com/pulp-platform/pulp-runtime?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/pulp-sdk.rst b/frameworks/pulp-sdk.rst
index 27b817a953..4ab2333d5f 100644
--- a/frameworks/pulp-sdk.rst
+++ b/frameworks/pulp-sdk.rst
@@ -19,9 +19,6 @@ PULP SDK
 
 Software Development Kit for Parallel Ultra Low Power platform targeting high energy efficiencies
 
-For more detailed information please visit `vendor site <https://github.com/pulp-platform/pulp-sdk?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/pumbaa.rst b/frameworks/pumbaa.rst
index 19f767e155..e0ba413151 100644
--- a/frameworks/pumbaa.rst
+++ b/frameworks/pumbaa.rst
@@ -19,9 +19,6 @@ Pumbaa
 
 Pumbaa is Python on top of Simba. The implementation is a port of MicroPython, designed for embedded devices with limited amount of RAM and code memory
 
-For more detailed information please visit `vendor site <http://pumbaa.readthedocs.org/?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/shakti-sdk.rst b/frameworks/shakti-sdk.rst
index 51a8334842..7c344fcd9a 100644
--- a/frameworks/shakti-sdk.rst
+++ b/frameworks/shakti-sdk.rst
@@ -19,9 +19,6 @@ Shakti SDK
 
 A software development kit for developing applications on Shakti class of processors
 
-For more detailed information please visit `vendor site <https://gitlab.com/shaktiproject/software/shakti-sdk?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/simba.rst b/frameworks/simba.rst
index c0ac06787c..c53abcb00b 100644
--- a/frameworks/simba.rst
+++ b/frameworks/simba.rst
@@ -19,9 +19,6 @@ Simba
 
 Simba is an RTOS and build framework with aims to make embedded programming easy and portable
 
-For more detailed information please visit `vendor site <http://simba-os.readthedocs.org?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/spl.rst b/frameworks/spl.rst
index 2f2026c6bd..3a3c74cb68 100644
--- a/frameworks/spl.rst
+++ b/frameworks/spl.rst
@@ -19,9 +19,6 @@ Standard Peripheral Library
 
 The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
-For more detailed information please visit `vendor site <https://www.st.com/en/embedded-software/stsw-stm8069.html?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/stm32cube.rst b/frameworks/stm32cube.rst
index ccc6e3027b..404b497e48 100644
--- a/frameworks/stm32cube.rst
+++ b/frameworks/stm32cube.rst
@@ -19,9 +19,6 @@ STM32Cube
 
 STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
 
-For more detailed information please visit `vendor site <https://www.st.com/en/ecosystems/stm32cube.html?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/wd-riscv-sdk.rst b/frameworks/wd-riscv-sdk.rst
index 4539ecf034..542d277ffd 100644
--- a/frameworks/wd-riscv-sdk.rst
+++ b/frameworks/wd-riscv-sdk.rst
@@ -19,9 +19,6 @@ WD-Firmware
 
 The WD Firmware package contains firmware applications and Processor Support Package (PSP) for various cores, alongside demos which support all features
 
-For more detailed information please visit `vendor site <https://github.com/westerndigitalcorporation/riscv-fw-infrastructure?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/wiringpi.rst b/frameworks/wiringpi.rst
index 1c0309ddd8..7162b1dabd 100644
--- a/frameworks/wiringpi.rst
+++ b/frameworks/wiringpi.rst
@@ -19,9 +19,6 @@ WiringPi
 
 WiringPi is a GPIO access library written in C for the BCM2835 used in the Raspberry Pi. It's designed to be familiar to people who have used the Arduino 'wiring' system
 
-For more detailed information please visit `vendor site <http://wiringpi.com?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/frameworks/zephyr.rst b/frameworks/zephyr.rst
index 83612c4466..6ad209aecc 100644
--- a/frameworks/zephyr.rst
+++ b/frameworks/zephyr.rst
@@ -19,9 +19,6 @@ Zephyr RTOS
 
 The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
-For more detailed information please visit `vendor site <https://www.zephyrproject.org?utm_source=platformio.org&utm_medium=docs>`_.
-
-
 .. contents:: Contents
     :local:
     :depth: 1
diff --git a/platforms/asrmicro650x.rst b/platforms/asrmicro650x.rst
index aad68bae9d..ae66827178 100644
--- a/platforms/asrmicro650x.rst
+++ b/platforms/asrmicro650x.rst
@@ -79,8 +79,8 @@ Packages
     * - Name
       - Description
 
-    * - `framework-arduinoasrmicro <https://registry.platformio.org/tools/heltecautomation/framework-arduinoasrmicro>`__
-      - Arduino Wiring-based Framework for ASR Microelectronics (Heltec core)
+    * - `framework-arduinoasrmicro650x <https://registry.platformio.org/tools/heltecautomation/framework-arduinoasrmicro650x>`__
+      - Arduino Wiring-based Framework for ASR Microelectronics ASR650x (Heltec core)
 
     * - `tool-cubecellelftool <https://registry.platformio.org/tools/heltecautomation/tool-cubecellelftool>`__
       - CubeCell ELF tool
@@ -88,9 +88,6 @@ Packages
     * - `tool-cubecellflash <https://registry.platformio.org/tools/heltecautomation/tool-cubecellflash>`__
       - CubeCell Flash tool
 
-    * - `tool-cubecellflash6601 <https://registry.platformio.org/tools/heltecautomation/tool-cubecellflash6601>`__
-      - CubeCell Flash tool for ASR6601
-
     * - `toolchain-gccarmnoneeabi <https://registry.platformio.org/tools/platformio/toolchain-gccarmnoneeabi>`__
       - GNU toolchain for Arm Cortex-M and Cortex-R processors
 
@@ -141,7 +138,7 @@ Heltec
       - RAM
     * - :ref:`board_asrmicro650x_cubecell_capsule_solar_sensor`
       - No
-      - ASR6051
+      - ASR6502
       - 48MHz
       - 128KB
       - 16KB
@@ -157,12 +154,6 @@ Heltec
       - 48MHz
       - 128KB
       - 16KB
-    * - :ref:`board_asrmicro650x_cubecell_board_pro`
-      - No
-      - ASR6601
-      - 48MHz
-      - 224KB
-      - 224KB
     * - :ref:`board_asrmicro650x_cubecell_board_plus`
       - No
       - ASR6502
diff --git a/platforms/atmelmegaavr.rst b/platforms/atmelmegaavr.rst
index 0b47ee3924..5b177ffaea 100644
--- a/platforms/atmelmegaavr.rst
+++ b/platforms/atmelmegaavr.rst
@@ -81,9 +81,6 @@ Packages
     * - `framework-arduino-megaavr <https://registry.platformio.org/tools/platformio/framework-arduino-megaavr>`__
       - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers
 
-    * - `framework-arduino-megaavr-dxcore <https://registry.platformio.org/tools/platformio/framework-arduino-megaavr-dxcore>`__
-      - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers (DxCore)
-
     * - `framework-arduino-megaavr-megacorex <https://registry.platformio.org/tools/platformio/framework-arduino-megaavr-megacorex>`__
       - Arduino Wiring-based Framework for Microchip megaAVR microcontrollers (MegaCoreX)
 
@@ -250,24 +247,6 @@ Microchip
       - 16MHz
       - 16KB
       - 2KB
-    * - :ref:`board_atmelmegaavr_ATtiny1624`
-      - No
-      - ATTINY1624
-      - 16MHz
-      - 16KB
-      - 2KB
-    * - :ref:`board_atmelmegaavr_ATtiny1626`
-      - No
-      - ATTINY1626
-      - 16MHz
-      - 16KB
-      - 2KB
-    * - :ref:`board_atmelmegaavr_ATtiny1627`
-      - No
-      - ATTINY1627
-      - 16MHz
-      - 16KB
-      - 2KB
     * - :ref:`board_atmelmegaavr_ATtiny202`
       - No
       - ATTINY202
@@ -304,24 +283,6 @@ Microchip
       - 16MHz
       - 32KB
       - 2KB
-    * - :ref:`board_atmelmegaavr_ATtiny3224`
-      - No
-      - ATTINY3224
-      - 16MHz
-      - 32KB
-      - 3KB
-    * - :ref:`board_atmelmegaavr_ATtiny3226`
-      - No
-      - ATTINY3226
-      - 16MHz
-      - 32KB
-      - 3KB
-    * - :ref:`board_atmelmegaavr_ATtiny3227`
-      - No
-      - ATTINY3227
-      - 16MHz
-      - 32KB
-      - 3KB
     * - :ref:`board_atmelmegaavr_ATtiny402`
       - No
       - ATTINY402
@@ -364,24 +325,6 @@ Microchip
       - 16MHz
       - 4KB
       - 256B
-    * - :ref:`board_atmelmegaavr_ATtiny424`
-      - No
-      - ATTINY424
-      - 16MHz
-      - 4KB
-      - 512B
-    * - :ref:`board_atmelmegaavr_ATtiny426`
-      - No
-      - ATTINY426
-      - 16MHz
-      - 4KB
-      - 512B
-    * - :ref:`board_atmelmegaavr_ATtiny427`
-      - No
-      - ATTINY427
-      - 16MHz
-      - 4KB
-      - 512B
     * - :ref:`board_atmelmegaavr_ATtiny804`
       - No
       - ATTINY804
@@ -418,204 +361,18 @@ Microchip
       - 16MHz
       - 8KB
       - 512B
-    * - :ref:`board_atmelmegaavr_ATtiny824`
-      - No
-      - ATTINY824
-      - 16MHz
-      - 8KB
-      - 1KB
-    * - :ref:`board_atmelmegaavr_ATtiny826`
-      - No
-      - ATTINY826
-      - 16MHz
-      - 8KB
-      - 1KB
-    * - :ref:`board_atmelmegaavr_ATtiny827`
-      - No
-      - ATTINY827
-      - 16MHz
-      - 8KB
-      - 1KB
     * - :ref:`board_atmelmegaavr_avr_iot_wg`
       - No
       - ATMEGA4808
       - 16MHz
       - 48KB
       - 6KB
-    * - :ref:`board_atmelmegaavr_AVR128DA28`
-      - No
-      - AVR128DA28
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DA32`
-      - No
-      - AVR128DA32
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DA48`
-      - No
-      - AVR128DA48
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DA64`
-      - No
-      - AVR128DA64
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DB28`
-      - No
-      - AVR128DB28
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DB32`
-      - No
-      - AVR128DB32
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DB48`
-      - No
-      - AVR128DB48
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR128DB64`
-      - No
-      - AVR128DB64
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_AVR32DA28`
-      - No
-      - AVR32DA28
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DA32`
-      - No
-      - AVR32DA32
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DA48`
-      - No
-      - AVR32DA48
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DB28`
-      - No
-      - AVR32DB28
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DB32`
-      - No
-      - AVR32DB32
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR32DB48`
-      - No
-      - AVR32DB48
-      - 24MHz
-      - 32KB
-      - 4KB
-    * - :ref:`board_atmelmegaavr_AVR64DA28`
-      - No
-      - AVR64DA28
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DA32`
-      - No
-      - AVR64DA32
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DA48`
-      - No
-      - AVR64DA48
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DA64`
-      - No
-      - AVR64DA64
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DB28`
-      - No
-      - AVR64DB28
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DB32`
-      - No
-      - AVR64DB32
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DB48`
-      - No
-      - AVR64DB48
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DB64`
-      - No
-      - AVR64DB64
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DD14`
-      - No
-      - AVR64DD14
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DD20`
-      - No
-      - AVR64DD20
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DD28`
-      - No
-      - AVR64DD28
-      - 24MHz
-      - 64KB
-      - 8KB
-    * - :ref:`board_atmelmegaavr_AVR64DD32`
-      - No
-      - AVR64DD32
-      - 24MHz
-      - 64KB
-      - 8KB
     * - :ref:`board_atmelmegaavr_curiosity_nano_4809`
       - No
       - ATMEGA4809
       - 16MHz
       - 48KB
       - 6KB
-    * - :ref:`board_atmelmegaavr_curiosity_nano_da`
-      - No
-      - AVR128DA48
-      - 24MHz
-      - 128KB
-      - 16KB
-    * - :ref:`board_atmelmegaavr_curiosity_nano_db`
-      - No
-      - AVR128DB48
-      - 24MHz
-      - 128KB
-      - 16KB
     * - :ref:`board_atmelmegaavr_xplained_pro_4809`
       - No
       - ATMEGA4809
diff --git a/platforms/chipsalliance.rst b/platforms/chipsalliance.rst
index de2b977d5f..622834b66e 100644
--- a/platforms/chipsalliance.rst
+++ b/platforms/chipsalliance.rst
@@ -31,7 +31,6 @@ Examples
 
 Examples are listed from `CHIPS Alliance development platform repository <https://github.com/platformio/platform-chipsalliance/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_:
 
-* `native-blink_asm <https://github.com/platformio/platform-chipsalliance/tree/master/examples/native-blink_asm?utm_source=platformio.org&utm_medium=docs>`_
 * `native-bare_c <https://github.com/platformio/platform-chipsalliance/tree/master/examples/native-bare_c?utm_source=platformio.org&utm_medium=docs>`_
 * `rtosal-freertos <https://github.com/platformio/platform-chipsalliance/tree/master/examples/rtosal-freertos?utm_source=platformio.org&utm_medium=docs>`_
 * `native-asm <https://github.com/platformio/platform-chipsalliance/tree/master/examples/native-asm?utm_source=platformio.org&utm_medium=docs>`_
diff --git a/platforms/index.rst b/platforms/index.rst
index 1c2bbb6163..72218b73d1 100644
--- a/platforms/index.rst
+++ b/platforms/index.rst
@@ -67,7 +67,6 @@ Embedded
     microchippic32
     nordicnrf51
     nordicnrf52
-    nuclei
     nxpimxrt
     nxplpc
     openhw
diff --git a/platforms/microchippic32.rst b/platforms/microchippic32.rst
index c5be0d7f72..5aaea18164 100644
--- a/platforms/microchippic32.rst
+++ b/platforms/microchippic32.rst
@@ -117,8 +117,8 @@ Boards
     * For more detailed ``board`` information please scroll the tables below by
       horizontally.
 
-4D Systems
-~~~~~~~~~~
+4DSystems
+~~~~~~~~~
 
 .. list-table::
     :header-rows:  1
diff --git a/platforms/nuclei.rst b/platforms/nuclei.rst
deleted file mode 100644
index 5352a27351..0000000000
--- a/platforms/nuclei.rst
+++ /dev/null
@@ -1,258 +0,0 @@
-..  Copyright (c) 2014-present PlatformIO <contact@platformio.org>
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-.. _platform_nuclei:
-
-Nuclei
-======
-
-:Configuration:
-  :ref:`projectconf_env_platform` = ``nuclei``
-
-Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
-For more detailed information please visit `vendor site <https://nucleisys.com/?utm_source=platformio.org&utm_medium=docs>`_.
-
-.. contents:: Contents
-    :local:
-    :depth: 1
-
-
-Examples
---------
-
-Examples are listed from `Nuclei development platform repository <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_:
-
-* `freertos_demo <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/freertos_demo?utm_source=platformio.org&utm_medium=docs>`_
-* `rtthread_demo <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/rtthread_demo?utm_source=platformio.org&utm_medium=docs>`_
-* `demo_dsp <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/demo_dsp?utm_source=platformio.org&utm_medium=docs>`_
-* `helloworld <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/helloworld?utm_source=platformio.org&utm_medium=docs>`_
-* `dhrystone <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/dhrystone?utm_source=platformio.org&utm_medium=docs>`_
-* `whetstone <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/whetstone?utm_source=platformio.org&utm_medium=docs>`_
-* `demo_eclic <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/demo_eclic?utm_source=platformio.org&utm_medium=docs>`_
-* `ucosii_demo <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/ucosii_demo?utm_source=platformio.org&utm_medium=docs>`_
-* `coremark <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/coremark?utm_source=platformio.org&utm_medium=docs>`_
-* `demo_timer <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/demo_timer?utm_source=platformio.org&utm_medium=docs>`_
-* `rtthread_msh <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/rtthread_msh?utm_source=platformio.org&utm_medium=docs>`_
-* `demo_nice <https://github.com/Nuclei-Software/platform-nuclei/tree/master/examples/demo_nice?utm_source=platformio.org&utm_medium=docs>`_
-
-Debugging
----------
-
-:ref:`piodebug` - "1-click" solution for debugging with a zero configuration.
-
-.. contents::
-    :local:
-
-
-Tools & Debug Probes
-~~~~~~~~~~~~~~~~~~~~
-
-Supported debugging tools are listed in "Debug" column. For more detailed
-information, please scroll table by horizontal.
-You can switch between debugging :ref:`debugging_tools` using
-:ref:`projectconf_debug_tool` option in :ref:`projectconf`.
-
-.. warning::
-    You will need to install debug tool drivers depending on your system.
-    Please click on compatible debug tool below for the further instructions.
-
-
-On-Board Debug Tools
-^^^^^^^^^^^^^^^^^^^^
-
-Boards listed below have on-board debug probe and **ARE READY** for debugging!
-You do not need to use/buy external debug probe.
-
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_hbird_eval`
-      - HUMMINGBIRD
-      - 5MHz
-      - 64KB
-      - 64KB
-
-
-External Debug Tools
-^^^^^^^^^^^^^^^^^^^^
-
-Boards listed below are compatible with :ref:`piodebug` but **DEPEND ON**
-external debug probe. They **ARE NOT READY** for debugging.
-Please click on board name for the further details.
-
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-
-
-Stable and upstream versions
-----------------------------
-
-You can switch between `stable releases <https://github.com/Nuclei-Software/platform-nuclei/releases>`__
-of Nuclei development platform and the latest upstream version using
-:ref:`projectconf_env_platform` option in :ref:`projectconf` as described below.
-
-Stable
-~~~~~~
-
-.. code-block:: ini
-
-    ; Latest stable version
-    [env:latest_stable]
-    platform = nuclei
-    board = ...
-
-    ; Custom stable version
-    [env:custom_stable]
-    platform = nuclei@x.y.z
-    board = ...
-
-Upstream
-~~~~~~~~
-
-.. code-block:: ini
-
-    [env:upstream_develop]
-    platform = https://github.com/Nuclei-Software/platform-nuclei.git
-    board = ...
-
-
-Packages
---------
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - `framework-nuclei-sdk <https://registry.platformio.org/tools/nuclei/framework-nuclei-sdk>`__
-      - Nuclei N/NX Embedded Software Development Kit
-
-    * - `tool-jlink <https://registry.platformio.org/tools/platformio/tool-jlink>`__
-      - Software and Documentation Pack for SEGGER J-Link debug probes
-
-    * - `tool-openocd-nuclei <https://registry.platformio.org/tools/nuclei/tool-openocd-nuclei>`__
-      - Open On-Chip Debugger branch with RISC-V Nuclei support
-
-    * - `toolchain-riscv-gcc-nuclei <https://registry.platformio.org/tools/nuclei/toolchain-riscv-gcc-nuclei>`__
-      - Nuclei RISC-V GCC toolchain
-
-.. warning::
-    **Linux Users**:
-
-        * Install "udev" rules :ref:`faq_udev_rules`
-        * Raspberry Pi users, please read this article
-          `Enable serial port on Raspberry Pi <https://hallard.me/enable-serial-port-on-raspberry-pi/>`__.
-
-
-    **Windows Users:**
-
-        Please check that you have a correctly installed USB driver from board
-        manufacturer
-
-
-Frameworks
-----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
-
-Boards
-------
-
-.. note::
-    * You can list pre-configured boards by :ref:`cmd_boards` command
-    * For more detailed ``board`` information please scroll the tables below by
-      horizontally.
-
-GigaDevice
-~~~~~~~~~~
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Debug
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - External
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - External
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-
-Nuclei
-~~~~~~
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Debug
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - On-board
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_hbird_eval`
-      - On-board
-      - HUMMINGBIRD
-      - 5MHz
-      - 64KB
-      - 64KB
diff --git a/platforms/raspberrypi.rst b/platforms/raspberrypi.rst
index c03555321c..f391198097 100644
--- a/platforms/raspberrypi.rst
+++ b/platforms/raspberrypi.rst
@@ -17,7 +17,7 @@ Raspberry Pi RP2040
 :Configuration:
   :ref:`projectconf_env_platform` = ``raspberrypi``
 
-RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
 For more detailed information please visit `vendor site <https://www.raspberrypi.org/documentation/rp2040/getting-started/?utm_source=platformio.org&utm_medium=docs>`_.
 
diff --git a/platforms/sifive.rst b/platforms/sifive.rst
index ed08cd7d4d..df5b0562e2 100644
--- a/platforms/sifive.rst
+++ b/platforms/sifive.rst
@@ -212,12 +212,12 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
diff --git a/platforms/ststm32.rst b/platforms/ststm32.rst
index 479a8431ea..0c8bf04c90 100644
--- a/platforms/ststm32.rst
+++ b/platforms/ststm32.rst
@@ -1630,21 +1630,21 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
-
 Boards
 ------
 
diff --git a/plus/debug-tools/altera-usb-blaster.rst b/plus/debug-tools/altera-usb-blaster.rst
index 8edcfc6b73..c7ab28bdf8 100644
--- a/plus/debug-tools/altera-usb-blaster.rst
+++ b/plus/debug-tools/altera-usb-blaster.rst
@@ -103,9 +103,6 @@ Platforms
     * - :ref:`platform_gd32v`
       - The GigaDevice GD32V device is a 32-bit general-purpose microcontroller based on the RISC-V core with an impressive balance of processing power, reduced power consumption and peripheral set.
 
-    * - :ref:`platform_nuclei`
-      - Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
 Frameworks
 ----------
 .. list-table::
@@ -120,9 +117,6 @@ Frameworks
     * - :ref:`framework_gd32vf103-sdk`
       - GigaDevice GD32VF103 Firmware Library (SDK) is a firmware function package, including programs, data structures and macro definitions, all the performance features of peripherals of GD32VF103 devices are involved in the package
 
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
-
 Boards
 ------
 
@@ -140,20 +134,6 @@ Boards
       - Frequency
       - Flash
       - RAM
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - :ref:`platform_nuclei`
-      - On-board
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
     * - :ref:`board_gd32v_gd32vf103v-eval`
       - :ref:`platform_gd32v`
       - External
@@ -168,13 +148,6 @@ Boards
       - 108MHz
       - 128KB
       - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
     * - :ref:`board_gd32v_sipeed-longan-nano-lite`
       - :ref:`platform_gd32v`
       - External
diff --git a/plus/debug-tools/blackmagic.rst b/plus/debug-tools/blackmagic.rst
index 4d03451e92..7611d9a731 100644
--- a/plus/debug-tools/blackmagic.rst
+++ b/plus/debug-tools/blackmagic.rst
@@ -207,24 +207,24 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_simba`
       - Simba is an RTOS and build framework with aims to make embedded programming easy and portable
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
-
 Boards
 ------
 
diff --git a/plus/debug-tools/cmsis-dap.rst b/plus/debug-tools/cmsis-dap.rst
index b45f6349f2..43ba99535f 100644
--- a/plus/debug-tools/cmsis-dap.rst
+++ b/plus/debug-tools/cmsis-dap.rst
@@ -98,7 +98,7 @@ Platforms
       - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
     * - :ref:`platform_ststm32`
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
@@ -120,24 +120,24 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_simba`
       - Simba is an RTOS and build framework with aims to make embedded programming easy and portable
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
-
 Boards
 ------
 
diff --git a/plus/debug-tools/ftdi.rst b/plus/debug-tools/ftdi.rst
index 9f33b1c992..f3c9450c34 100644
--- a/plus/debug-tools/ftdi.rst
+++ b/plus/debug-tools/ftdi.rst
@@ -92,12 +92,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
diff --git a/plus/debug-tools/gd-link.rst b/plus/debug-tools/gd-link.rst
index fe50fd7761..03f4e69e05 100644
--- a/plus/debug-tools/gd-link.rst
+++ b/plus/debug-tools/gd-link.rst
@@ -138,9 +138,6 @@ Platforms
     * - :ref:`platform_gd32v`
       - The GigaDevice GD32V device is a 32-bit general-purpose microcontroller based on the RISC-V core with an impressive balance of processing power, reduced power consumption and peripheral set.
 
-    * - :ref:`platform_nuclei`
-      - Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
 Frameworks
 ----------
 .. list-table::
@@ -155,9 +152,6 @@ Frameworks
     * - :ref:`framework_gd32vf103-sdk`
       - GigaDevice GD32VF103 Firmware Library (SDK) is a firmware function package, including programs, data structures and macro definitions, all the performance features of peripherals of GD32VF103 devices are involved in the package
 
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
-
 Boards
 ------
 
@@ -175,20 +169,6 @@ Boards
       - Frequency
       - Flash
       - RAM
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - :ref:`platform_nuclei`
-      - On-board
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
     * - :ref:`board_gd32v_gd32vf103v-eval`
       - :ref:`platform_gd32v`
       - External
@@ -203,13 +183,6 @@ Boards
       - 108MHz
       - 128KB
       - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
     * - :ref:`board_gd32v_sipeed-longan-nano-lite`
       - :ref:`platform_gd32v`
       - External
diff --git a/plus/debug-tools/jlink.rst b/plus/debug-tools/jlink.rst
index 8d75c4905f..20bc06a86f 100644
--- a/plus/debug-tools/jlink.rst
+++ b/plus/debug-tools/jlink.rst
@@ -225,9 +225,6 @@ Platforms
     * - :ref:`platform_nordicnrf52`
       - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
-    * - :ref:`platform_nuclei`
-      - Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
     * - :ref:`platform_nxpimxrt`
       - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
 
@@ -235,7 +232,7 @@ Platforms
       - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
     * - :ref:`platform_shakti`
       - Shakti is an open-source initiative by the RISE group at IIT-Madras, which is not only building open source, production grade processors, but also associated components like interconnect fabrics, verification tools, storage controllers, peripheral IPs and SOC tools.
@@ -272,12 +269,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_gd32vf103-sdk`
       - GigaDevice GD32VF103 Firmware Library (SDK) is a firmware function package, including programs, data structures and macro definitions, all the performance features of peripherals of GD32VF103 devices are involved in the package
 
@@ -287,15 +284,12 @@ Frameworks
     * - :ref:`framework_kendryte-standalone-sdk`
       - Kendryte Standalone SDK without OS support
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
-
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_shakti-sdk`
       - A software development kit for developing applications on Shakti class of processors
 
@@ -305,12 +299,12 @@ Frameworks
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
-
 Boards
 ------
 
@@ -1588,20 +1582,6 @@ Boards
       - 240MHz
       - 4MB
       - 320KB
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - :ref:`platform_nuclei`
-      - On-board
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
     * - :ref:`board_gd32v_gd32vf103v-eval`
       - :ref:`platform_gd32v`
       - External
@@ -3702,13 +3682,6 @@ Boards
       - 108MHz
       - 128KB
       - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
     * - :ref:`board_gd32v_sipeed-longan-nano-lite`
       - :ref:`platform_gd32v`
       - External
diff --git a/plus/debug-tools/minimodule.rst b/plus/debug-tools/minimodule.rst
index 81a07aad9a..26ef445e17 100644
--- a/plus/debug-tools/minimodule.rst
+++ b/plus/debug-tools/minimodule.rst
@@ -123,12 +123,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_kendryte-freertos-sdk`
       - Kendryte SDK with FreeRTOS support
 
diff --git a/plus/debug-tools/olimex-arm-usb-ocd-h.rst b/plus/debug-tools/olimex-arm-usb-ocd-h.rst
index f7dd1189d7..fed6df9fee 100644
--- a/plus/debug-tools/olimex-arm-usb-ocd-h.rst
+++ b/plus/debug-tools/olimex-arm-usb-ocd-h.rst
@@ -127,12 +127,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_kendryte-freertos-sdk`
       - Kendryte SDK with FreeRTOS support
 
diff --git a/plus/debug-tools/olimex-arm-usb-ocd.rst b/plus/debug-tools/olimex-arm-usb-ocd.rst
index 24da9de690..976491effe 100644
--- a/plus/debug-tools/olimex-arm-usb-ocd.rst
+++ b/plus/debug-tools/olimex-arm-usb-ocd.rst
@@ -127,12 +127,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_kendryte-freertos-sdk`
       - Kendryte SDK with FreeRTOS support
 
diff --git a/plus/debug-tools/olimex-arm-usb-tiny-h.rst b/plus/debug-tools/olimex-arm-usb-tiny-h.rst
index c244d88692..72eba118cf 100644
--- a/plus/debug-tools/olimex-arm-usb-tiny-h.rst
+++ b/plus/debug-tools/olimex-arm-usb-tiny-h.rst
@@ -126,12 +126,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_kendryte-freertos-sdk`
       - Kendryte SDK with FreeRTOS support
 
diff --git a/plus/debug-tools/olimex-jtag-tiny.rst b/plus/debug-tools/olimex-jtag-tiny.rst
index 8c26ee110b..c39f4604c6 100644
--- a/plus/debug-tools/olimex-jtag-tiny.rst
+++ b/plus/debug-tools/olimex-jtag-tiny.rst
@@ -126,12 +126,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_kendryte-freertos-sdk`
       - Kendryte SDK with FreeRTOS support
 
diff --git a/plus/debug-tools/qemu.rst b/plus/debug-tools/qemu.rst
index e64ddf12db..12b9e72842 100644
--- a/plus/debug-tools/qemu.rst
+++ b/plus/debug-tools/qemu.rst
@@ -61,12 +61,12 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
diff --git a/plus/debug-tools/raspberrypi-swd.rst b/plus/debug-tools/raspberrypi-swd.rst
index c21dfa9dcb..7dd414dd6d 100644
--- a/plus/debug-tools/raspberrypi-swd.rst
+++ b/plus/debug-tools/raspberrypi-swd.rst
@@ -62,7 +62,7 @@ Platforms
       - Description
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
 Frameworks
 ----------
diff --git a/plus/debug-tools/renode.rst b/plus/debug-tools/renode.rst
index d6e5f8ad91..70a5485914 100644
--- a/plus/debug-tools/renode.rst
+++ b/plus/debug-tools/renode.rst
@@ -56,12 +56,12 @@ Frameworks
     * - Name
       - Description
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_pulp-runtime`
       - Runtime Environment for Parallel Ultra Low Power platform targeting high energy efficiencies
 
diff --git a/plus/debug-tools/rv-link.rst b/plus/debug-tools/rv-link.rst
index 6a2e38eecb..2f72dd7e17 100644
--- a/plus/debug-tools/rv-link.rst
+++ b/plus/debug-tools/rv-link.rst
@@ -64,9 +64,6 @@ Platforms
     * - :ref:`platform_gd32v`
       - The GigaDevice GD32V device is a 32-bit general-purpose microcontroller based on the RISC-V core with an impressive balance of processing power, reduced power consumption and peripheral set.
 
-    * - :ref:`platform_nuclei`
-      - Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
 Frameworks
 ----------
 .. list-table::
@@ -81,9 +78,6 @@ Frameworks
     * - :ref:`framework_gd32vf103-sdk`
       - GigaDevice GD32VF103 Firmware Library (SDK) is a firmware function package, including programs, data structures and macro definitions, all the performance features of peripherals of GD32VF103 devices are involved in the package
 
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
-
 Boards
 ------
 
@@ -101,20 +95,6 @@ Boards
       - Frequency
       - Flash
       - RAM
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - :ref:`platform_nuclei`
-      - On-board
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
     * - :ref:`board_gd32v_gd32vf103v-eval`
       - :ref:`platform_gd32v`
       - External
@@ -122,13 +102,6 @@ Boards
       - 108MHz
       - 128KB
       - 32KB
-    * - :ref:`board_nuclei_hbird_eval`
-      - :ref:`platform_nuclei`
-      - On-board
-      - HUMMINGBIRD
-      - 5MHz
-      - 64KB
-      - 64KB
     * - :ref:`board_gd32v_sipeed-longan-nano`
       - :ref:`platform_gd32v`
       - External
@@ -136,13 +109,6 @@ Boards
       - 108MHz
       - 128KB
       - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
     * - :ref:`board_gd32v_sipeed-longan-nano-lite`
       - :ref:`platform_gd32v`
       - External
diff --git a/plus/debug-tools/stlink.rst b/plus/debug-tools/stlink.rst
index 1b83a0809d..094188a095 100644
--- a/plus/debug-tools/stlink.rst
+++ b/plus/debug-tools/stlink.rst
@@ -120,24 +120,24 @@ Frameworks
     * - :ref:`framework_cmsis`
       - The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-independent hardware abstraction layer for the Cortex-M processor series and specifies debugger interfaces. The CMSIS enables consistent and simple software interfaces to the processor for interface peripherals, real-time operating systems, and middleware. It simplifies software re-use, reducing the learning curve for new microcontroller developers and cutting the time-to-market for devices
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_simba`
       - Simba is an RTOS and build framework with aims to make embedded programming easy and portable
 
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
-
 Boards
 ------
 
diff --git a/plus/debug-tools/tumpa.rst b/plus/debug-tools/tumpa.rst
index f4848b000c..19b445e89c 100644
--- a/plus/debug-tools/tumpa.rst
+++ b/plus/debug-tools/tumpa.rst
@@ -153,12 +153,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_kendryte-freertos-sdk`
       - Kendryte SDK with FreeRTOS support
 
diff --git a/plus/debugging.rst b/plus/debugging.rst
index 836bde3009..777939eed6 100644
--- a/plus/debugging.rst
+++ b/plus/debugging.rst
@@ -199,9 +199,6 @@ Platforms
     * - :ref:`platform_nordicnrf52`
       - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
 
-    * - :ref:`platform_nuclei`
-      - Find professional RISC-V Processor IP in Nuclei, first professional RISC-V IP company in Mainland China, match all your requirements in AIoT Era.
-
     * - :ref:`platform_nxpimxrt`
       - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
 
@@ -212,7 +209,7 @@ Platforms
       - OpenHW Group is a not-for-profit, global organization that provides an infrastructure for hosting high quality open-source HW developments in line with industry best practices. The OpenHW CV32E40P RISC-V core is the first open-source core for high-volume chips verified with the state-of-the-art process required for high-integrity, commercial SoCs.
 
     * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
 
     * - :ref:`platform_riscv_gap`
       - GreenWaves GAP8 IoT application processor enables the cost-effective development, deployment and autonomous operation of intelligent sensing devices that capture, analyze, classify and act on the fusion of rich data sources such as images, sounds or vibrations.
@@ -261,12 +258,12 @@ Frameworks
     * - :ref:`framework_espidf`
       - ESP-IDF is the official development framework for the ESP32 and ESP32-S Series SoCs.
 
-    * - :ref:`framework_freertos`
-      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
-
     * - :ref:`framework_freedom-e-sdk`
       - Open Source Software for Developing on the SiFive Freedom E Platform
 
+    * - :ref:`framework_freertos`
+      - FreeRTOS is a real-time operating system kernel for embedded devices that has been ported to 40 microcontroller platforms
+
     * - :ref:`framework_gd32vf103-sdk`
       - GigaDevice GD32VF103 Firmware Library (SDK) is a firmware function package, including programs, data structures and macro definitions, all the performance features of peripherals of GD32VF103 devices are involved in the package
 
@@ -276,12 +273,12 @@ Frameworks
     * - :ref:`framework_kendryte-standalone-sdk`
       - Kendryte Standalone SDK without OS support
 
+    * - :ref:`framework_libopencm3`
+      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
+
     * - :ref:`framework_mbed`
       - Arm Mbed OS is an open source embedded operating system designed specifically for the 'things' in the Internet of Things. It includes all the features you need to develop a connected product based on an Arm Cortex-M microcontroller, including security, connectivity, an RTOS and drivers for sensors and I/O devices
 
-    * - :ref:`framework_nuclei-sdk`
-      - Open Source Software Development Kit for the Nuclei N/NX processors
-
     * - :ref:`framework_pulp-os`
       - PULP is a silicon-proven Parallel Ultra Low Power platform targeting high energy efficiencies. The platform is organized in clusters of RISC-V cores that share a tightly-coupled data memory
 
@@ -291,9 +288,6 @@ Frameworks
     * - :ref:`framework_pulp-sdk`
       - Software Development Kit for Parallel Ultra Low Power platform targeting high energy efficiencies
 
-    * - :ref:`framework_stm32cube`
-      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
-
     * - :ref:`framework_shakti-sdk`
       - A software development kit for developing applications on Shakti class of processors
 
@@ -303,15 +297,15 @@ Frameworks
     * - :ref:`framework_spl`
       - The ST Standard Peripheral Library provides a set of functions for handling the peripherals on the STM32 family of microcontrollers.
 
+    * - :ref:`framework_stm32cube`
+      - STM32Cube embedded software libraries, including: The HAL hardware abstraction layer, enabling portability between different STM32 devices via standardized API calls; The Low-Layer (LL) APIs, a light-weight, optimized, expert oriented set of APIs designed for both performance and runtime efficiency
+
     * - :ref:`framework_wd-riscv-sdk`
       - The WD Firmware package contains firmware applications and Processor Support Package (PSP) for various cores, alongside demos which support all features
 
     * - :ref:`framework_zephyr`
       - The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple hardware architectures, optimized for resource constrained devices, and built with safety and security in mind
 
-    * - :ref:`framework_libopencm3`
-      - The libOpenCM3 framework aims to create a free and open-source firmware library for various ARM Cortex-M0(+)/M3/M4 microcontrollers, including ST STM32, Ti Tiva and Stellaris, NXP LPC, Atmel SAM3, Energy Micro EFM32 and others
-
 Boards
 ------
 
@@ -3139,34 +3133,6 @@ Generic
       - 1MB
       - 128KB
 
-GigaDevice
-~~~~~~~~~~
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Platform
-      - Debug
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_eval`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_gd32vf103c_longan_nano`
-      - :ref:`platform_nuclei`
-      - External
-      - GD32VF103CBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-
 Gimasi
 ~~~~~~
 
@@ -4497,34 +4463,6 @@ Nordic
       - 796KB
       - 243KB
 
-Nuclei
-~~~~~~
-
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Platform
-      - Debug
-      - MCU
-      - Frequency
-      - Flash
-      - RAM
-    * - :ref:`board_nuclei_gd32vf103v_rvstar`
-      - :ref:`platform_nuclei`
-      - On-board
-      - GD32VF103VBT6
-      - 108MHz
-      - 128KB
-      - 32KB
-    * - :ref:`board_nuclei_hbird_eval`
-      - :ref:`platform_nuclei`
-      - On-board
-      - HUMMINGBIRD
-      - 5MHz
-      - 64KB
-      - 64KB
-
 OLIMEX
 ~~~~~~
 

From 43eece0a6f4646ff9f6e03974805d3a46530201d Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 1 Feb 2022 21:55:18 +0200
Subject: [PATCH 16/17] Swap platform section

---
 frameworks/arduino.rst                 | 176 ++++++++++++-------------
 frameworks/cmsis.rst                   |  32 ++---
 frameworks/esp8266-nonos-sdk.rst       |  10 +-
 frameworks/esp8266-rtos-sdk.rst        |  10 +-
 frameworks/espidf.rst                  |  32 ++---
 frameworks/freedom-e-sdk.rst           |  32 ++---
 frameworks/freertos.rst                |  40 +++---
 frameworks/gd32vf103-sdk.rst           |  32 ++---
 frameworks/kendryte-freertos-sdk.rst   |  32 ++---
 frameworks/kendryte-standalone-sdk.rst |  32 ++---
 frameworks/libopencm3.rst              |  40 +++---
 frameworks/mbed.rst                    | 120 ++++++++---------
 frameworks/pulp-os.rst                 |  32 ++---
 frameworks/pulp-runtime.rst            |  32 ++---
 frameworks/pulp-sdk.rst                |  32 ++---
 frameworks/pumbaa.rst                  |  10 +-
 frameworks/shakti-sdk.rst              |  32 ++---
 frameworks/simba.rst                   |  56 ++++----
 frameworks/spl.rst                     |  40 +++---
 frameworks/stm32cube.rst               |  32 ++---
 frameworks/wd-riscv-sdk.rst            |  32 ++---
 frameworks/wiringpi.rst                |  10 +-
 frameworks/zephyr.rst                  | 104 +++++++--------
 23 files changed, 500 insertions(+), 500 deletions(-)

diff --git a/frameworks/arduino.rst b/frameworks/arduino.rst
index 2a349f1e4f..ef4de3b3bd 100644
--- a/frameworks/arduino.rst
+++ b/frameworks/arduino.rst
@@ -24,6 +24,94 @@ Arduino Wiring-based Framework allows writing cross-platform software to control
     :depth: 1
 .. include:: arduino_extra.rst
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_asrmicro650x`
+      - ASR Microelectronics ASR650x series is highly intergrated and ultra low power SoC based on the PSoC 4000 series MCU (ARM Cortex M0+ Core) and Semtech SX1262 transceiver.
+
+    * - :ref:`platform_atmelavr`
+      - Atmel AVR 8-bit MCUs deliver a unique combination of performance, power efficiency and design flexibility. Optimized to speed time to market-and easily adapt to new ones-they are based on the industry's most code-efficient architecture for C and assembly programming
+
+    * - :ref:`platform_atmelmegaavr`
+      - 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
+
+    * - :ref:`platform_atmelsam`
+      - Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
+
+    * - :ref:`platform_espressif32`
+      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
+
+    * - :ref:`platform_espressif8266`
+      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
+
+    * - :ref:`platform_gd32v`
+      - The GigaDevice GD32V device is a 32-bit general-purpose microcontroller based on the RISC-V core with an impressive balance of processing power, reduced power consumption and peripheral set.
+
+    * - :ref:`platform_infineonxmc`
+      - Infineon has designed the XMC microcontrollers for real-time critical applications with an industry-standard core. The XMC microcontrollers can be integrated with the Arduino platform
+
+    * - :ref:`platform_intel_arc32`
+      - ARC embedded processors are a family of 32-bit CPUs that are widely used in SoC devices for storage, home, mobile, automotive, and Internet of Things applications.
+
+    * - :ref:`platform_kendryte210`
+      - Kendryte K210 is an AI capable RISCV64 dual core SoC.
+
+    * - :ref:`platform_microchippic32`
+      - Microchip's 32-bit portfolio with the MIPS microAptiv or M4K core offer high performance microcontrollers, and all the tools needed to develop your embedded projects. PIC32 MCUs gives your application the processing power, memory and peripherals your design needs!
+
+    * - :ref:`platform_nordicnrf51`
+      - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
+
+    * - :ref:`platform_nordicnrf52`
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
+
+    * - :ref:`platform_raspberrypi`
+      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
+
+    * - :ref:`platform_ststm32`
+      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+
+    * - :ref:`platform_ststm8`
+      - The STM8 is an 8-bit microcontroller family by STMicroelectronics an extended variant of the ST7 microcontroller architecture. STM8 microcontrollers are particularly low cost for a full-featured 8-bit microcontroller.
+
+    * - :ref:`platform_teensy`
+      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
+
+    * - :ref:`platform_timsp430`
+      - MSP430 microcontrollers (MCUs) from Texas Instruments (TI) are 16-bit, RISC-based, mixed-signal processors designed for ultra-low power. These MCUs offer the lowest power consumption and the perfect mix of integrated peripherals for thousands of applications.
+
+    * - :ref:`platform_titiva`
+      - Texas Instruments TM4C12x MCUs offer the industrys most popular ARM Cortex-M4 core with scalable memory and package options, unparalleled connectivity peripherals, advanced application functions, industry-leading analog integration, and extensive software solutions.
+
+Examples
+--------
+
+* `Arduino for ASR Microelectronics ASR650x <https://github.com/HelTecAutomation/platform-asrmicro650x/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Atmel AVR <https://github.com/platformio/platform-atmelavr/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Atmel megaAVR <https://github.com/platformio/platform-atmelmegaavr/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Atmel SAM <https://github.com/platformio/platform-atmelsam/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Espressif 32 <https://github.com/platformio/platform-espressif32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Espressif 8266 <https://github.com/platformio/platform-espressif8266/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for GigaDevice GD32V <https://github.com/sipeed/platform-gd32v/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Infineon XMC <https://github.com/Infineon/platformio-infineonxmc/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Intel ARC32 <https://github.com/platformio/platform-intel_arc32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Kendryte K210 <https://github.com/sipeed/platform-kendryte210/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Microchip PIC32 <https://github.com/platformio/platform-microchippic32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Nordic nRF51 <https://github.com/platformio/platform-nordicnrf51/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Nordic nRF52 <https://github.com/platformio/platform-nordicnrf52/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Raspberry Pi RP2040 <https://github.com/platformio/platform-raspberrypi/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for ST STM8 <https://github.com/platformio/platform-ststm8/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for Teensy <https://github.com/platformio/platform-teensy/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for TI MSP430 <https://github.com/platformio/platform-timsp430/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Arduino for TI TIVA <https://github.com/platformio/platform-titiva/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -3539,94 +3627,6 @@ Please click on board name for the further details.
       - 2KB
 
 
-Examples
---------
-
-* `Arduino for ASR Microelectronics ASR650x <https://github.com/HelTecAutomation/platform-asrmicro650x/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Atmel AVR <https://github.com/platformio/platform-atmelavr/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Atmel megaAVR <https://github.com/platformio/platform-atmelmegaavr/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Atmel SAM <https://github.com/platformio/platform-atmelsam/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Espressif 32 <https://github.com/platformio/platform-espressif32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Espressif 8266 <https://github.com/platformio/platform-espressif8266/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for GigaDevice GD32V <https://github.com/sipeed/platform-gd32v/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Infineon XMC <https://github.com/Infineon/platformio-infineonxmc/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Intel ARC32 <https://github.com/platformio/platform-intel_arc32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Kendryte K210 <https://github.com/sipeed/platform-kendryte210/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Microchip PIC32 <https://github.com/platformio/platform-microchippic32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Nordic nRF51 <https://github.com/platformio/platform-nordicnrf51/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Nordic nRF52 <https://github.com/platformio/platform-nordicnrf52/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Raspberry Pi RP2040 <https://github.com/platformio/platform-raspberrypi/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for ST STM8 <https://github.com/platformio/platform-ststm8/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for Teensy <https://github.com/platformio/platform-teensy/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for TI MSP430 <https://github.com/platformio/platform-timsp430/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Arduino for TI TIVA <https://github.com/platformio/platform-titiva/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_asrmicro650x`
-      - ASR Microelectronics ASR650x series is highly intergrated and ultra low power SoC based on the PSoC 4000 series MCU (ARM Cortex M0+ Core) and Semtech SX1262 transceiver.
-
-    * - :ref:`platform_atmelavr`
-      - Atmel AVR 8-bit MCUs deliver a unique combination of performance, power efficiency and design flexibility. Optimized to speed time to market-and easily adapt to new ones-they are based on the industry's most code-efficient architecture for C and assembly programming
-
-    * - :ref:`platform_atmelmegaavr`
-      - 8-bit MCUs Built for Real-time Control with Core Independent Peripherals combining intelligent hardware peripherals along with the low-power capability of an AVR core, megaAVR microcontrollers (MCUs) broaden the effectiveness of your real-time control systems.
-
-    * - :ref:`platform_atmelsam`
-      - Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
-
-    * - :ref:`platform_espressif32`
-      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
-
-    * - :ref:`platform_espressif8266`
-      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
-
-    * - :ref:`platform_gd32v`
-      - The GigaDevice GD32V device is a 32-bit general-purpose microcontroller based on the RISC-V core with an impressive balance of processing power, reduced power consumption and peripheral set.
-
-    * - :ref:`platform_infineonxmc`
-      - Infineon has designed the XMC microcontrollers for real-time critical applications with an industry-standard core. The XMC microcontrollers can be integrated with the Arduino platform
-
-    * - :ref:`platform_intel_arc32`
-      - ARC embedded processors are a family of 32-bit CPUs that are widely used in SoC devices for storage, home, mobile, automotive, and Internet of Things applications.
-
-    * - :ref:`platform_kendryte210`
-      - Kendryte K210 is an AI capable RISCV64 dual core SoC.
-
-    * - :ref:`platform_microchippic32`
-      - Microchip's 32-bit portfolio with the MIPS microAptiv or M4K core offer high performance microcontrollers, and all the tools needed to develop your embedded projects. PIC32 MCUs gives your application the processing power, memory and peripherals your design needs!
-
-    * - :ref:`platform_nordicnrf51`
-      - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
-
-    * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
-
-    * - :ref:`platform_raspberrypi`
-      - RP2040 is a low-cost, high-performance microcontroller device with with a large on-chip memory, symmetric dual-core processor complex, and rich peripheral.
-
-    * - :ref:`platform_ststm32`
-      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
-
-    * - :ref:`platform_ststm8`
-      - The STM8 is an 8-bit microcontroller family by STMicroelectronics an extended variant of the ST7 microcontroller architecture. STM8 microcontrollers are particularly low cost for a full-featured 8-bit microcontroller.
-
-    * - :ref:`platform_teensy`
-      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
-
-    * - :ref:`platform_timsp430`
-      - MSP430 microcontrollers (MCUs) from Texas Instruments (TI) are 16-bit, RISC-based, mixed-signal processors designed for ultra-low power. These MCUs offer the lowest power consumption and the perfect mix of integrated peripherals for thousands of applications.
-
-    * - :ref:`platform_titiva`
-      - Texas Instruments TM4C12x MCUs offer the industrys most popular ARM Cortex-M4 core with scalable memory and package options, unparalleled connectivity peripherals, advanced application functions, industry-leading analog integration, and extensive software solutions.
-
 Boards
 ------
 
diff --git a/frameworks/cmsis.rst b/frameworks/cmsis.rst
index 0ed3fb8f52..e0816ea2de 100644
--- a/frameworks/cmsis.rst
+++ b/frameworks/cmsis.rst
@@ -23,6 +23,22 @@ The ARM Cortex Microcontroller Software Interface Standard (CMSIS) is a vendor-i
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_ststm32`
+      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+
+Examples
+--------
+
+* `CMSIS for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -1486,22 +1502,6 @@ Please click on board name for the further details.
       - 7.75KB
 
 
-Examples
---------
-
-* `CMSIS for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_ststm32`
-      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
-
 Boards
 ------
 
diff --git a/frameworks/esp8266-nonos-sdk.rst b/frameworks/esp8266-nonos-sdk.rst
index 13ca0e96b3..7d831980f5 100644
--- a/frameworks/esp8266-nonos-sdk.rst
+++ b/frameworks/esp8266-nonos-sdk.rst
@@ -23,11 +23,6 @@ The non-OS SDK provides a set of application programming interfaces (APIs) for c
     :local:
     :depth: 1
 
-Examples
---------
-
-* `ESP8266 Non-OS SDK for Espressif 8266 <https://github.com/platformio/platform-espressif8266/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
 Platforms
 ---------
 .. list-table::
@@ -39,6 +34,11 @@ Platforms
     * - :ref:`platform_espressif8266`
       - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
 
+Examples
+--------
+
+* `ESP8266 Non-OS SDK for Espressif 8266 <https://github.com/platformio/platform-espressif8266/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Boards
 ------
 
diff --git a/frameworks/esp8266-rtos-sdk.rst b/frameworks/esp8266-rtos-sdk.rst
index c9a5b07be7..9a77cce70d 100644
--- a/frameworks/esp8266-rtos-sdk.rst
+++ b/frameworks/esp8266-rtos-sdk.rst
@@ -23,11 +23,6 @@ ESP8266 SDK based on FreeRTOS, a truly free professional grade RTOS for microcon
     :local:
     :depth: 1
 
-Examples
---------
-
-* `ESP8266 RTOS SDK for Espressif 8266 <https://github.com/platformio/platform-espressif8266/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
 Platforms
 ---------
 .. list-table::
@@ -39,6 +34,11 @@ Platforms
     * - :ref:`platform_espressif8266`
       - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
 
+Examples
+--------
+
+* `ESP8266 RTOS SDK for Espressif 8266 <https://github.com/platformio/platform-espressif8266/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Boards
 ------
 
diff --git a/frameworks/espidf.rst b/frameworks/espidf.rst
index de7b5373dc..4dc585f47b 100644
--- a/frameworks/espidf.rst
+++ b/frameworks/espidf.rst
@@ -24,6 +24,22 @@ ESP-IDF is the official development framework for the ESP32 and ESP32-S Series S
     :depth: 1
 .. include:: espidf_extra.rst
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_espressif32`
+      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
+
+Examples
+--------
+
+* `Espressif IoT Development Framework for Espressif 32 <https://github.com/platformio/platform-espressif32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -431,22 +447,6 @@ Please click on board name for the further details.
       - 320KB
 
 
-Examples
---------
-
-* `Espressif IoT Development Framework for Espressif 32 <https://github.com/platformio/platform-espressif32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_espressif32`
-      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
-
 Boards
 ------
 
diff --git a/frameworks/freedom-e-sdk.rst b/frameworks/freedom-e-sdk.rst
index 6482bb6858..1dc3ad79dc 100644
--- a/frameworks/freedom-e-sdk.rst
+++ b/frameworks/freedom-e-sdk.rst
@@ -24,6 +24,22 @@ Open Source Software for Developing on the SiFive Freedom E Platform
     :depth: 1
 .. include:: freedom-e-sdk_extra.rst
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_sifive`
+      - SiFive brings the power of open source and software automation to the semiconductor industry, making it possible to develop new hardware faster and more affordably than ever before. 
+
+Examples
+--------
+
+* `Freedom E SDK for SiFive <https://github.com/platformio/platform-sifive/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -100,22 +116,6 @@ You do not need to use/buy external debug probe.
       - 16KB
 
 
-Examples
---------
-
-* `Freedom E SDK for SiFive <https://github.com/platformio/platform-sifive/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_sifive`
-      - SiFive brings the power of open source and software automation to the semiconductor industry, making it possible to develop new hardware faster and more affordably than ever before. 
-
 Boards
 ------
 
diff --git a/frameworks/freertos.rst b/frameworks/freertos.rst
index 80bd511eba..25ac080ac8 100644
--- a/frameworks/freertos.rst
+++ b/frameworks/freertos.rst
@@ -23,6 +23,26 @@ FreeRTOS is a real-time operating system kernel for embedded devices that has be
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_chipsalliance`
+      - The CHIPS Alliance develops high-quality, open source hardware designs relevant to silicon devices and FPGAs.
+
+    * - :ref:`platform_sifive`
+      - SiFive brings the power of open source and software automation to the semiconductor industry, making it possible to develop new hardware faster and more affordably than ever before. 
+
+Examples
+--------
+
+* `FreeRTOS for CHIPS Alliance <https://github.com/platformio/platform-chipsalliance/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `FreeRTOS for SiFive <https://github.com/platformio/platform-sifive/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -105,26 +125,6 @@ You do not need to use/buy external debug probe.
       - 16KB
 
 
-Examples
---------
-
-* `FreeRTOS for CHIPS Alliance <https://github.com/platformio/platform-chipsalliance/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `FreeRTOS for SiFive <https://github.com/platformio/platform-sifive/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_chipsalliance`
-      - The CHIPS Alliance develops high-quality, open source hardware designs relevant to silicon devices and FPGAs.
-
-    * - :ref:`platform_sifive`
-      - SiFive brings the power of open source and software automation to the semiconductor industry, making it possible to develop new hardware faster and more affordably than ever before. 
-
 Boards
 ------
 
diff --git a/frameworks/gd32vf103-sdk.rst b/frameworks/gd32vf103-sdk.rst
index 4b82900134..401913337a 100644
--- a/frameworks/gd32vf103-sdk.rst
+++ b/frameworks/gd32vf103-sdk.rst
@@ -23,6 +23,22 @@ GigaDevice GD32VF103 Firmware Library (SDK) is a firmware function package, incl
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_gd32v`
+      - The GigaDevice GD32V device is a 32-bit general-purpose microcontroller based on the RISC-V core with an impressive balance of processing power, reduced power consumption and peripheral set.
+
+Examples
+--------
+
+* `GigaDevice GD32V SDK for GigaDevice GD32V <https://github.com/sipeed/platform-gd32v/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -88,22 +104,6 @@ Please click on board name for the further details.
       - 32KB
 
 
-Examples
---------
-
-* `GigaDevice GD32V SDK for GigaDevice GD32V <https://github.com/sipeed/platform-gd32v/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_gd32v`
-      - The GigaDevice GD32V device is a 32-bit general-purpose microcontroller based on the RISC-V core with an impressive balance of processing power, reduced power consumption and peripheral set.
-
 Boards
 ------
 
diff --git a/frameworks/kendryte-freertos-sdk.rst b/frameworks/kendryte-freertos-sdk.rst
index 69967d5989..5b5e3a4b2d 100644
--- a/frameworks/kendryte-freertos-sdk.rst
+++ b/frameworks/kendryte-freertos-sdk.rst
@@ -23,6 +23,22 @@ Kendryte SDK with FreeRTOS support
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_kendryte210`
+      - Kendryte K210 is an AI capable RISCV64 dual core SoC.
+
+Examples
+--------
+
+* `Kendryte FreeRTOS SDK for Kendryte K210 <https://github.com/sipeed/platform-kendryte210/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -100,22 +116,6 @@ Please click on board name for the further details.
       - 6MB
 
 
-Examples
---------
-
-* `Kendryte FreeRTOS SDK for Kendryte K210 <https://github.com/sipeed/platform-kendryte210/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_kendryte210`
-      - Kendryte K210 is an AI capable RISCV64 dual core SoC.
-
 Boards
 ------
 
diff --git a/frameworks/kendryte-standalone-sdk.rst b/frameworks/kendryte-standalone-sdk.rst
index 761ef67b1d..975c4d5a2f 100644
--- a/frameworks/kendryte-standalone-sdk.rst
+++ b/frameworks/kendryte-standalone-sdk.rst
@@ -23,6 +23,22 @@ Kendryte Standalone SDK without OS support
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_kendryte210`
+      - Kendryte K210 is an AI capable RISCV64 dual core SoC.
+
+Examples
+--------
+
+* `Kendryte Standalone SDK for Kendryte K210 <https://github.com/sipeed/platform-kendryte210/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -100,22 +116,6 @@ Please click on board name for the further details.
       - 6MB
 
 
-Examples
---------
-
-* `Kendryte Standalone SDK for Kendryte K210 <https://github.com/sipeed/platform-kendryte210/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_kendryte210`
-      - Kendryte K210 is an AI capable RISCV64 dual core SoC.
-
 Boards
 ------
 
diff --git a/frameworks/libopencm3.rst b/frameworks/libopencm3.rst
index 2fdade60a7..db7ae65765 100644
--- a/frameworks/libopencm3.rst
+++ b/frameworks/libopencm3.rst
@@ -23,6 +23,26 @@ The libOpenCM3 framework aims to create a free and open-source firmware library
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_ststm32`
+      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+
+    * - :ref:`platform_titiva`
+      - Texas Instruments TM4C12x MCUs offer the industrys most popular ARM Cortex-M4 core with scalable memory and package options, unparalleled connectivity peripherals, advanced application functions, industry-leading analog integration, and extensive software solutions.
+
+Examples
+--------
+
+* `libopencm3 for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `libopencm3 for TI TIVA <https://github.com/platformio/platform-titiva/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -1444,26 +1464,6 @@ Please click on board name for the further details.
       - 7.75KB
 
 
-Examples
---------
-
-* `libopencm3 for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `libopencm3 for TI TIVA <https://github.com/platformio/platform-titiva/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_ststm32`
-      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
-
-    * - :ref:`platform_titiva`
-      - Texas Instruments TM4C12x MCUs offer the industrys most popular ARM Cortex-M4 core with scalable memory and package options, unparalleled connectivity peripherals, advanced application functions, industry-leading analog integration, and extensive software solutions.
-
 Boards
 ------
 
diff --git a/frameworks/mbed.rst b/frameworks/mbed.rst
index cedf4700d6..64e7c35f3d 100644
--- a/frameworks/mbed.rst
+++ b/frameworks/mbed.rst
@@ -24,6 +24,66 @@ Arm Mbed OS is an open source embedded operating system designed specifically fo
     :depth: 1
 .. include:: mbed_extra.rst
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_atmelsam`
+      - Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
+
+    * - :ref:`platform_freescalekinetis`
+      - Freescale Kinetis Microcontrollers is family of multiple hardware- and software-compatible ARM Cortex-M0+, Cortex-M4 and Cortex-M7-based MCU series. Kinetis MCUs offer exceptional low-power performance, scalability and feature integration.
+
+    * - :ref:`platform_maxim32`
+      - Maxim's microcontrollers provide low-power, efficient, and secure solutions for challenging embedded applications. Maxim's processors embed cutting-edge technologies to secure data and intellectual property, proven analog circuitry for real-world applications, and battery-conserving low power operation.
+
+    * - :ref:`platform_nordicnrf51`
+      - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
+
+    * - :ref:`platform_nordicnrf52`
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
+
+    * - :ref:`platform_nxpimxrt`
+      - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
+
+    * - :ref:`platform_nxplpc`
+      - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
+
+    * - :ref:`platform_riscv_gap`
+      - GreenWaves GAP8 IoT application processor enables the cost-effective development, deployment and autonomous operation of intelligent sensing devices that capture, analyze, classify and act on the fusion of rich data sources such as images, sounds or vibrations.
+
+    * - :ref:`platform_siliconlabsefm32`
+      - Silicon Labs EFM32 Gecko 32-bit microcontroller (MCU) family includes devices that offer flash memory configurations up to 256 kB, 32 kB of RAM and CPU speeds up to 48 MHz. Based on the powerful ARM Cortex-M core, the Gecko family features innovative low energy techniques, short wake-up time from energy saving modes and a wide selection of peripherals, making it ideal for battery operated applications and other systems requiring high performance and low-energy consumption.
+
+    * - :ref:`platform_ststm32`
+      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+
+    * - :ref:`platform_teensy`
+      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
+
+    * - :ref:`platform_wiznet7500`
+      - The IOP (Internet Offload Processor) W7500 is the one-chip solution which integrates an ARM Cortex-M0, 128KB Flash and hardwired TCP/IP core for various embedded application platform especially requiring Internet of things
+
+Examples
+--------
+
+* `Mbed for Atmel SAM <https://github.com/platformio/platform-atmelsam/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for Freescale Kinetis <https://github.com/platformio/platform-freescalekinetis/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for Maxim 32 <https://github.com/platformio/platform-maxim32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for Nordic nRF51 <https://github.com/platformio/platform-nordicnrf51/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for Nordic nRF52 <https://github.com/platformio/platform-nordicnrf52/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for NXP i.MX RT <https://github.com/platformio/platform-nxpimxrt/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for NXP LPC <https://github.com/platformio/platform-nxplpc/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for RISC-V GAP <https://github.com/platformio/platform-riscv_gap/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for Silicon Labs EFM32 <https://github.com/platformio/platform-siliconlabsefm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for Teensy <https://github.com/platformio/platform-teensy/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Mbed for WIZNet W7500 <https://github.com/platformio/platform-wiznet7500/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -1097,66 +1157,6 @@ Please click on board name for the further details.
       - 10KB
 
 
-Examples
---------
-
-* `Mbed for Atmel SAM <https://github.com/platformio/platform-atmelsam/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for Freescale Kinetis <https://github.com/platformio/platform-freescalekinetis/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for Maxim 32 <https://github.com/platformio/platform-maxim32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for Nordic nRF51 <https://github.com/platformio/platform-nordicnrf51/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for Nordic nRF52 <https://github.com/platformio/platform-nordicnrf52/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for NXP i.MX RT <https://github.com/platformio/platform-nxpimxrt/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for NXP LPC <https://github.com/platformio/platform-nxplpc/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for RISC-V GAP <https://github.com/platformio/platform-riscv_gap/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for Silicon Labs EFM32 <https://github.com/platformio/platform-siliconlabsefm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for Teensy <https://github.com/platformio/platform-teensy/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Mbed for WIZNet W7500 <https://github.com/platformio/platform-wiznet7500/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_atmelsam`
-      - Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
-
-    * - :ref:`platform_freescalekinetis`
-      - Freescale Kinetis Microcontrollers is family of multiple hardware- and software-compatible ARM Cortex-M0+, Cortex-M4 and Cortex-M7-based MCU series. Kinetis MCUs offer exceptional low-power performance, scalability and feature integration.
-
-    * - :ref:`platform_maxim32`
-      - Maxim's microcontrollers provide low-power, efficient, and secure solutions for challenging embedded applications. Maxim's processors embed cutting-edge technologies to secure data and intellectual property, proven analog circuitry for real-world applications, and battery-conserving low power operation.
-
-    * - :ref:`platform_nordicnrf51`
-      - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
-
-    * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
-
-    * - :ref:`platform_nxpimxrt`
-      - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
-
-    * - :ref:`platform_nxplpc`
-      - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
-
-    * - :ref:`platform_riscv_gap`
-      - GreenWaves GAP8 IoT application processor enables the cost-effective development, deployment and autonomous operation of intelligent sensing devices that capture, analyze, classify and act on the fusion of rich data sources such as images, sounds or vibrations.
-
-    * - :ref:`platform_siliconlabsefm32`
-      - Silicon Labs EFM32 Gecko 32-bit microcontroller (MCU) family includes devices that offer flash memory configurations up to 256 kB, 32 kB of RAM and CPU speeds up to 48 MHz. Based on the powerful ARM Cortex-M core, the Gecko family features innovative low energy techniques, short wake-up time from energy saving modes and a wide selection of peripherals, making it ideal for battery operated applications and other systems requiring high performance and low-energy consumption.
-
-    * - :ref:`platform_ststm32`
-      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
-
-    * - :ref:`platform_teensy`
-      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
-
-    * - :ref:`platform_wiznet7500`
-      - The IOP (Internet Offload Processor) W7500 is the one-chip solution which integrates an ARM Cortex-M0, 128KB Flash and hardwired TCP/IP core for various embedded application platform especially requiring Internet of things
-
 Boards
 ------
 
diff --git a/frameworks/pulp-os.rst b/frameworks/pulp-os.rst
index f0cf201612..13c015da54 100644
--- a/frameworks/pulp-os.rst
+++ b/frameworks/pulp-os.rst
@@ -23,6 +23,22 @@ PULP is a silicon-proven Parallel Ultra Low Power platform targeting high energy
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_riscv_gap`
+      - GreenWaves GAP8 IoT application processor enables the cost-effective development, deployment and autonomous operation of intelligent sensing devices that capture, analyze, classify and act on the fusion of rich data sources such as images, sounds or vibrations.
+
+Examples
+--------
+
+* `PULP OS for RISC-V GAP <https://github.com/platformio/platform-riscv_gap/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -69,22 +85,6 @@ You do not need to use/buy external debug probe.
       - 8MB
 
 
-Examples
---------
-
-* `PULP OS for RISC-V GAP <https://github.com/platformio/platform-riscv_gap/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_riscv_gap`
-      - GreenWaves GAP8 IoT application processor enables the cost-effective development, deployment and autonomous operation of intelligent sensing devices that capture, analyze, classify and act on the fusion of rich data sources such as images, sounds or vibrations.
-
 Boards
 ------
 
diff --git a/frameworks/pulp-runtime.rst b/frameworks/pulp-runtime.rst
index 0436a2e839..28b1682717 100644
--- a/frameworks/pulp-runtime.rst
+++ b/frameworks/pulp-runtime.rst
@@ -23,6 +23,22 @@ Runtime Environment for Parallel Ultra Low Power platform targeting high energy
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_openhw`
+      - OpenHW Group is a not-for-profit, global organization that provides an infrastructure for hosting high quality open-source HW developments in line with industry best practices. The OpenHW CV32E40P RISC-V core is the first open-source core for high-volume chips verified with the state-of-the-art process required for high-integrity, commercial SoCs.
+
+Examples
+--------
+
+* `PULP Runtime Environment for OpenHW Group <https://github.com/platformio/platform-openhw/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -69,22 +85,6 @@ You do not need to use/buy external debug probe.
       - 1.16MB
 
 
-Examples
---------
-
-* `PULP Runtime Environment for OpenHW Group <https://github.com/platformio/platform-openhw/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_openhw`
-      - OpenHW Group is a not-for-profit, global organization that provides an infrastructure for hosting high quality open-source HW developments in line with industry best practices. The OpenHW CV32E40P RISC-V core is the first open-source core for high-volume chips verified with the state-of-the-art process required for high-integrity, commercial SoCs.
-
 Boards
 ------
 
diff --git a/frameworks/pulp-sdk.rst b/frameworks/pulp-sdk.rst
index 4ab2333d5f..572c4ffe57 100644
--- a/frameworks/pulp-sdk.rst
+++ b/frameworks/pulp-sdk.rst
@@ -23,6 +23,22 @@ Software Development Kit for Parallel Ultra Low Power platform targeting high en
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_openhw`
+      - OpenHW Group is a not-for-profit, global organization that provides an infrastructure for hosting high quality open-source HW developments in line with industry best practices. The OpenHW CV32E40P RISC-V core is the first open-source core for high-volume chips verified with the state-of-the-art process required for high-integrity, commercial SoCs.
+
+Examples
+--------
+
+* `PULP SDK for OpenHW Group <https://github.com/platformio/platform-openhw/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -69,22 +85,6 @@ You do not need to use/buy external debug probe.
       - 1.16MB
 
 
-Examples
---------
-
-* `PULP SDK for OpenHW Group <https://github.com/platformio/platform-openhw/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_openhw`
-      - OpenHW Group is a not-for-profit, global organization that provides an infrastructure for hosting high quality open-source HW developments in line with industry best practices. The OpenHW CV32E40P RISC-V core is the first open-source core for high-volume chips verified with the state-of-the-art process required for high-integrity, commercial SoCs.
-
 Boards
 ------
 
diff --git a/frameworks/pumbaa.rst b/frameworks/pumbaa.rst
index e0ba413151..be60f3d6c7 100644
--- a/frameworks/pumbaa.rst
+++ b/frameworks/pumbaa.rst
@@ -23,11 +23,6 @@ Pumbaa is Python on top of Simba. The implementation is a port of MicroPython, d
     :local:
     :depth: 1
 
-Examples
---------
-
-* `Pumbaa for Espressif 32 <https://github.com/platformio/platform-espressif32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
 Platforms
 ---------
 .. list-table::
@@ -39,6 +34,11 @@ Platforms
     * - :ref:`platform_espressif32`
       - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
 
+Examples
+--------
+
+* `Pumbaa for Espressif 32 <https://github.com/platformio/platform-espressif32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Boards
 ------
 
diff --git a/frameworks/shakti-sdk.rst b/frameworks/shakti-sdk.rst
index 7c344fcd9a..48bf5d4d63 100644
--- a/frameworks/shakti-sdk.rst
+++ b/frameworks/shakti-sdk.rst
@@ -23,6 +23,22 @@ A software development kit for developing applications on Shakti class of proces
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_shakti`
+      - Shakti is an open-source initiative by the RISE group at IIT-Madras, which is not only building open source, production grade processors, but also associated components like interconnect fabrics, verification tools, storage controllers, peripheral IPs and SOC tools.
+
+Examples
+--------
+
+* `Shakti SDK for Shakti <https://github.com/platformio/platform-shakti/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -93,22 +109,6 @@ You do not need to use/buy external debug probe.
       - 128MB
 
 
-Examples
---------
-
-* `Shakti SDK for Shakti <https://github.com/platformio/platform-shakti/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_shakti`
-      - Shakti is an open-source initiative by the RISE group at IIT-Madras, which is not only building open source, production grade processors, but also associated components like interconnect fabrics, verification tools, storage controllers, peripheral IPs and SOC tools.
-
 Boards
 ------
 
diff --git a/frameworks/simba.rst b/frameworks/simba.rst
index c53abcb00b..c21494b0fa 100644
--- a/frameworks/simba.rst
+++ b/frameworks/simba.rst
@@ -23,6 +23,34 @@ Simba is an RTOS and build framework with aims to make embedded programming easy
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_atmelavr`
+      - Atmel AVR 8-bit MCUs deliver a unique combination of performance, power efficiency and design flexibility. Optimized to speed time to market-and easily adapt to new ones-they are based on the industry's most code-efficient architecture for C and assembly programming
+
+    * - :ref:`platform_atmelsam`
+      - Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
+
+    * - :ref:`platform_espressif32`
+      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
+
+    * - :ref:`platform_espressif8266`
+      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
+
+Examples
+--------
+
+* `Simba for Atmel AVR <https://github.com/platformio/platform-atmelavr/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Simba for Atmel SAM <https://github.com/platformio/platform-atmelsam/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Simba for Espressif 32 <https://github.com/platformio/platform-espressif32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Simba for Espressif 8266 <https://github.com/platformio/platform-espressif8266/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -118,34 +146,6 @@ Please click on board name for the further details.
       - 96KB
 
 
-Examples
---------
-
-* `Simba for Atmel AVR <https://github.com/platformio/platform-atmelavr/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Simba for Atmel SAM <https://github.com/platformio/platform-atmelsam/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Simba for Espressif 32 <https://github.com/platformio/platform-espressif32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Simba for Espressif 8266 <https://github.com/platformio/platform-espressif8266/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_atmelavr`
-      - Atmel AVR 8-bit MCUs deliver a unique combination of performance, power efficiency and design flexibility. Optimized to speed time to market-and easily adapt to new ones-they are based on the industry's most code-efficient architecture for C and assembly programming
-
-    * - :ref:`platform_atmelsam`
-      - Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
-
-    * - :ref:`platform_espressif32`
-      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
-
-    * - :ref:`platform_espressif8266`
-      - Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
-
 Boards
 ------
 
diff --git a/frameworks/spl.rst b/frameworks/spl.rst
index 3a3c74cb68..ce7d1d64d5 100644
--- a/frameworks/spl.rst
+++ b/frameworks/spl.rst
@@ -24,6 +24,26 @@ The ST Standard Peripheral Library provides a set of functions for handling the
     :depth: 1
 .. include:: spl_extra.rst
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_ststm32`
+      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+
+    * - :ref:`platform_ststm8`
+      - The STM8 is an 8-bit microcontroller family by STMicroelectronics an extended variant of the ST7 microcontroller architecture. STM8 microcontrollers are particularly low cost for a full-featured 8-bit microcontroller.
+
+Examples
+--------
+
+* `Standard Peripheral Library for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Standard Peripheral Library for ST STM8 <https://github.com/platformio/platform-ststm8/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -203,26 +223,6 @@ Please click on board name for the further details.
       - 2KB
 
 
-Examples
---------
-
-* `Standard Peripheral Library for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Standard Peripheral Library for ST STM8 <https://github.com/platformio/platform-ststm8/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_ststm32`
-      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
-
-    * - :ref:`platform_ststm8`
-      - The STM8 is an 8-bit microcontroller family by STMicroelectronics an extended variant of the ST7 microcontroller architecture. STM8 microcontrollers are particularly low cost for a full-featured 8-bit microcontroller.
-
 Boards
 ------
 
diff --git a/frameworks/stm32cube.rst b/frameworks/stm32cube.rst
index 404b497e48..e3afc007cd 100644
--- a/frameworks/stm32cube.rst
+++ b/frameworks/stm32cube.rst
@@ -24,6 +24,22 @@ STM32Cube embedded software libraries, including: The HAL hardware abstraction l
     :depth: 1
 .. include:: stm32cube_extra.rst
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_ststm32`
+      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+
+Examples
+--------
+
+* `STM32Cube for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -1595,22 +1611,6 @@ Please click on board name for the further details.
       - 256KB
 
 
-Examples
---------
-
-* `STM32Cube for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_ststm32`
-      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
-
 Boards
 ------
 
diff --git a/frameworks/wd-riscv-sdk.rst b/frameworks/wd-riscv-sdk.rst
index 542d277ffd..8d0203eb61 100644
--- a/frameworks/wd-riscv-sdk.rst
+++ b/frameworks/wd-riscv-sdk.rst
@@ -23,6 +23,22 @@ The WD Firmware package contains firmware applications and Processor Support Pac
     :local:
     :depth: 1
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_chipsalliance`
+      - The CHIPS Alliance develops high-quality, open source hardware designs relevant to silicon devices and FPGAs.
+
+Examples
+--------
+
+* `WD-Firmware for CHIPS Alliance <https://github.com/platformio/platform-chipsalliance/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -69,22 +85,6 @@ You do not need to use/buy external debug probe.
       - 1.16MB
 
 
-Examples
---------
-
-* `WD-Firmware for CHIPS Alliance <https://github.com/platformio/platform-chipsalliance/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_chipsalliance`
-      - The CHIPS Alliance develops high-quality, open source hardware designs relevant to silicon devices and FPGAs.
-
 Boards
 ------
 
diff --git a/frameworks/wiringpi.rst b/frameworks/wiringpi.rst
index 7162b1dabd..9328aa3604 100644
--- a/frameworks/wiringpi.rst
+++ b/frameworks/wiringpi.rst
@@ -23,11 +23,6 @@ WiringPi is a GPIO access library written in C for the BCM2835 used in the Raspb
     :local:
     :depth: 1
 
-Examples
---------
-
-* `WiringPi for Linux ARM <https://github.com/platformio/platform-linux_arm/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
 Platforms
 ---------
 .. list-table::
@@ -39,6 +34,11 @@ Platforms
     * - :ref:`platform_linux_arm`
       - Linux ARM is a Unix-like and mostly POSIX-compliant computer operating system (OS) assembled under the model of free and open-source software development and distribution. Using host OS (Mac OS X, Linux ARM) you can build native application for Linux ARM platform.
 
+Examples
+--------
+
+* `WiringPi for Linux ARM <https://github.com/platformio/platform-linux_arm/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Boards
 ------
 
diff --git a/frameworks/zephyr.rst b/frameworks/zephyr.rst
index 6ad209aecc..40be29ef73 100644
--- a/frameworks/zephyr.rst
+++ b/frameworks/zephyr.rst
@@ -24,6 +24,58 @@ The Zephyr Project is a scalable real-time operating system (RTOS) supporting mu
     :depth: 1
 .. include:: zephyr_extra.rst
 
+Platforms
+---------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`platform_atmelsam`
+      - Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
+
+    * - :ref:`platform_freescalekinetis`
+      - Freescale Kinetis Microcontrollers is family of multiple hardware- and software-compatible ARM Cortex-M0+, Cortex-M4 and Cortex-M7-based MCU series. Kinetis MCUs offer exceptional low-power performance, scalability and feature integration.
+
+    * - :ref:`platform_nordicnrf51`
+      - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
+
+    * - :ref:`platform_nordicnrf52`
+      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
+
+    * - :ref:`platform_nxpimxrt`
+      - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
+
+    * - :ref:`platform_nxplpc`
+      - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
+
+    * - :ref:`platform_sifive`
+      - SiFive brings the power of open source and software automation to the semiconductor industry, making it possible to develop new hardware faster and more affordably than ever before. 
+
+    * - :ref:`platform_siliconlabsefm32`
+      - Silicon Labs EFM32 Gecko 32-bit microcontroller (MCU) family includes devices that offer flash memory configurations up to 256 kB, 32 kB of RAM and CPU speeds up to 48 MHz. Based on the powerful ARM Cortex-M core, the Gecko family features innovative low energy techniques, short wake-up time from energy saving modes and a wide selection of peripherals, making it ideal for battery operated applications and other systems requiring high performance and low-energy consumption.
+
+    * - :ref:`platform_ststm32`
+      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
+
+    * - :ref:`platform_teensy`
+      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
+
+Examples
+--------
+
+* `Zephyr RTOS for Atmel SAM <https://github.com/platformio/platform-atmelsam/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for Freescale Kinetis <https://github.com/platformio/platform-freescalekinetis/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for Nordic nRF51 <https://github.com/platformio/platform-nordicnrf51/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for Nordic nRF52 <https://github.com/platformio/platform-nordicnrf52/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for NXP i.MX RT <https://github.com/platformio/platform-nxpimxrt/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for NXP LPC <https://github.com/platformio/platform-nxplpc/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for SiFive <https://github.com/platformio/platform-sifive/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for Silicon Labs EFM32 <https://github.com/platformio/platform-siliconlabsefm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+* `Zephyr RTOS for Teensy <https://github.com/platformio/platform-teensy/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
+
 Debugging
 ---------
 
@@ -959,58 +1011,6 @@ Please click on board name for the further details.
       - 96KB
 
 
-Examples
---------
-
-* `Zephyr RTOS for Atmel SAM <https://github.com/platformio/platform-atmelsam/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for Freescale Kinetis <https://github.com/platformio/platform-freescalekinetis/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for Nordic nRF51 <https://github.com/platformio/platform-nordicnrf51/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for Nordic nRF52 <https://github.com/platformio/platform-nordicnrf52/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for NXP i.MX RT <https://github.com/platformio/platform-nxpimxrt/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for NXP LPC <https://github.com/platformio/platform-nxplpc/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for SiFive <https://github.com/platformio/platform-sifive/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for Silicon Labs EFM32 <https://github.com/platformio/platform-siliconlabsefm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for ST STM32 <https://github.com/platformio/platform-ststm32/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-* `Zephyr RTOS for Teensy <https://github.com/platformio/platform-teensy/tree/master/examples?utm_source=platformio.org&utm_medium=docs>`_
-
-Platforms
----------
-.. list-table::
-    :header-rows:  1
-
-    * - Name
-      - Description
-
-    * - :ref:`platform_atmelsam`
-      - Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
-
-    * - :ref:`platform_freescalekinetis`
-      - Freescale Kinetis Microcontrollers is family of multiple hardware- and software-compatible ARM Cortex-M0+, Cortex-M4 and Cortex-M7-based MCU series. Kinetis MCUs offer exceptional low-power performance, scalability and feature integration.
-
-    * - :ref:`platform_nordicnrf51`
-      - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
-
-    * - :ref:`platform_nordicnrf52`
-      - The nRF52 Series are built for speed to carry out increasingly complex tasks in the shortest possible time and return to sleep, conserving precious battery power. They have a Cortex-M4F processor which makes them quite capable Bluetooth Smart SoCs.
-
-    * - :ref:`platform_nxpimxrt`
-      - The i.MX RT series of crossover processors features the Arm Cortex-M core, real-time functionality and MCU usability at a cost-effective price.
-
-    * - :ref:`platform_nxplpc`
-      - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
-
-    * - :ref:`platform_sifive`
-      - SiFive brings the power of open source and software automation to the semiconductor industry, making it possible to develop new hardware faster and more affordably than ever before. 
-
-    * - :ref:`platform_siliconlabsefm32`
-      - Silicon Labs EFM32 Gecko 32-bit microcontroller (MCU) family includes devices that offer flash memory configurations up to 256 kB, 32 kB of RAM and CPU speeds up to 48 MHz. Based on the powerful ARM Cortex-M core, the Gecko family features innovative low energy techniques, short wake-up time from energy saving modes and a wide selection of peripherals, making it ideal for battery operated applications and other systems requiring high performance and low-energy consumption.
-
-    * - :ref:`platform_ststm32`
-      - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
-
-    * - :ref:`platform_teensy`
-      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
-
 Boards
 ------
 

From 4de1b83a71aeb6870ceb2ecd8ec4c2e38939f361 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 1 Feb 2022 21:56:00 +0200
Subject: [PATCH 17/17] Add platform link to the registry

---
 platforms/aceinna_imu.rst      | 2 ++
 platforms/asrmicro650x.rst     | 2 ++
 platforms/atmelavr.rst         | 2 ++
 platforms/atmelmegaavr.rst     | 2 ++
 platforms/atmelsam.rst         | 2 ++
 platforms/chipsalliance.rst    | 2 ++
 platforms/espressif32.rst      | 2 ++
 platforms/espressif8266.rst    | 2 ++
 platforms/freescalekinetis.rst | 2 ++
 platforms/gd32v.rst            | 2 ++
 platforms/infineonxmc.rst      | 2 ++
 platforms/intel_arc32.rst      | 2 ++
 platforms/intel_mcs51.rst      | 2 ++
 platforms/kendryte210.rst      | 2 ++
 platforms/lattice_ice40.rst    | 2 ++
 platforms/linux_arm.rst        | 2 ++
 platforms/linux_i686.rst       | 2 ++
 platforms/linux_x86_64.rst     | 2 ++
 platforms/maxim32.rst          | 2 ++
 platforms/microchippic32.rst   | 2 ++
 platforms/native.rst           | 2 ++
 platforms/nordicnrf51.rst      | 2 ++
 platforms/nordicnrf52.rst      | 2 ++
 platforms/nxpimxrt.rst         | 2 ++
 platforms/nxplpc.rst           | 2 ++
 platforms/openhw.rst           | 2 ++
 platforms/raspberrypi.rst      | 2 ++
 platforms/riscv_gap.rst        | 2 ++
 platforms/shakti.rst           | 2 ++
 platforms/sifive.rst           | 2 ++
 platforms/siliconlabsefm32.rst | 2 ++
 platforms/ststm32.rst          | 2 ++
 platforms/ststm8.rst           | 2 ++
 platforms/teensy.rst           | 2 ++
 platforms/timsp430.rst         | 2 ++
 platforms/titiva.rst           | 2 ++
 platforms/windows_x86.rst      | 2 ++
 platforms/wiznet7500.rst       | 2 ++
 38 files changed, 76 insertions(+)

diff --git a/platforms/aceinna_imu.rst b/platforms/aceinna_imu.rst
index dbfeadabd7..58f82c2465 100644
--- a/platforms/aceinna_imu.rst
+++ b/platforms/aceinna_imu.rst
@@ -14,6 +14,8 @@
 Aceinna IMU
 ===========
 
+:Registry:
+  `https://registry.platformio.org/platforms/aceinna/aceinna_imu <https://registry.platformio.org/platforms/aceinna/aceinna_imu>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``aceinna_imu``
 
diff --git a/platforms/asrmicro650x.rst b/platforms/asrmicro650x.rst
index ae66827178..bae6dbeb33 100644
--- a/platforms/asrmicro650x.rst
+++ b/platforms/asrmicro650x.rst
@@ -14,6 +14,8 @@
 ASR Microelectronics ASR650x
 ============================
 
+:Registry:
+  `https://registry.platformio.org/platforms/heltecautomation/asrmicro650x <https://registry.platformio.org/platforms/heltecautomation/asrmicro650x>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``asrmicro650x``
 
diff --git a/platforms/atmelavr.rst b/platforms/atmelavr.rst
index 93a2077ee6..5d4433506f 100644
--- a/platforms/atmelavr.rst
+++ b/platforms/atmelavr.rst
@@ -14,6 +14,8 @@
 Atmel AVR
 =========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/atmelavr <https://registry.platformio.org/platforms/platformio/atmelavr>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``atmelavr``
 
diff --git a/platforms/atmelmegaavr.rst b/platforms/atmelmegaavr.rst
index 5b177ffaea..917ee32667 100644
--- a/platforms/atmelmegaavr.rst
+++ b/platforms/atmelmegaavr.rst
@@ -14,6 +14,8 @@
 Atmel megaAVR
 =============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/atmelmegaavr <https://registry.platformio.org/platforms/platformio/atmelmegaavr>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``atmelmegaavr``
 
diff --git a/platforms/atmelsam.rst b/platforms/atmelsam.rst
index 5c3969b32d..ff85105f82 100644
--- a/platforms/atmelsam.rst
+++ b/platforms/atmelsam.rst
@@ -14,6 +14,8 @@
 Atmel SAM
 =========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/atmelsam <https://registry.platformio.org/platforms/platformio/atmelsam>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``atmelsam``
 
diff --git a/platforms/chipsalliance.rst b/platforms/chipsalliance.rst
index 622834b66e..ddb7e9f35e 100644
--- a/platforms/chipsalliance.rst
+++ b/platforms/chipsalliance.rst
@@ -14,6 +14,8 @@
 CHIPS Alliance
 ==============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/chipsalliance <https://registry.platformio.org/platforms/platformio/chipsalliance>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``chipsalliance``
 
diff --git a/platforms/espressif32.rst b/platforms/espressif32.rst
index f393ff2742..7bd7dfd77e 100644
--- a/platforms/espressif32.rst
+++ b/platforms/espressif32.rst
@@ -14,6 +14,8 @@
 Espressif 32
 ============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/espressif32 <https://registry.platformio.org/platforms/platformio/espressif32>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``espressif32``
 
diff --git a/platforms/espressif8266.rst b/platforms/espressif8266.rst
index 842c3deb68..bf16145e07 100644
--- a/platforms/espressif8266.rst
+++ b/platforms/espressif8266.rst
@@ -14,6 +14,8 @@
 Espressif 8266
 ==============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/espressif8266 <https://registry.platformio.org/platforms/platformio/espressif8266>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``espressif8266``
 
diff --git a/platforms/freescalekinetis.rst b/platforms/freescalekinetis.rst
index 883b149d81..a1cbafc007 100644
--- a/platforms/freescalekinetis.rst
+++ b/platforms/freescalekinetis.rst
@@ -14,6 +14,8 @@
 Freescale Kinetis
 =================
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/freescalekinetis <https://registry.platformio.org/platforms/platformio/freescalekinetis>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``freescalekinetis``
 
diff --git a/platforms/gd32v.rst b/platforms/gd32v.rst
index 989971aa4a..5dc5dee9b1 100644
--- a/platforms/gd32v.rst
+++ b/platforms/gd32v.rst
@@ -14,6 +14,8 @@
 GigaDevice GD32V
 ================
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/gd32v <https://registry.platformio.org/platforms/platformio/gd32v>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``gd32v``
 
diff --git a/platforms/infineonxmc.rst b/platforms/infineonxmc.rst
index e2780479a3..fa5fc4a2c2 100644
--- a/platforms/infineonxmc.rst
+++ b/platforms/infineonxmc.rst
@@ -14,6 +14,8 @@
 Infineon XMC
 ============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/infineonxmc <https://registry.platformio.org/platforms/platformio/infineonxmc>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``infineonxmc``
 
diff --git a/platforms/intel_arc32.rst b/platforms/intel_arc32.rst
index 39e757cc47..ac5bad3efb 100644
--- a/platforms/intel_arc32.rst
+++ b/platforms/intel_arc32.rst
@@ -14,6 +14,8 @@
 Intel ARC32
 ===========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/intel_arc32 <https://registry.platformio.org/platforms/platformio/intel_arc32>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``intel_arc32``
 
diff --git a/platforms/intel_mcs51.rst b/platforms/intel_mcs51.rst
index cb8d85b6e2..d5c2fbd70b 100644
--- a/platforms/intel_mcs51.rst
+++ b/platforms/intel_mcs51.rst
@@ -14,6 +14,8 @@
 Intel MCS-51 (8051)
 ===================
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/intel_mcs51 <https://registry.platformio.org/platforms/platformio/intel_mcs51>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``intel_mcs51``
 
diff --git a/platforms/kendryte210.rst b/platforms/kendryte210.rst
index d4b1ed4940..b45979a2b3 100644
--- a/platforms/kendryte210.rst
+++ b/platforms/kendryte210.rst
@@ -14,6 +14,8 @@
 Kendryte K210
 =============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/kendryte210 <https://registry.platformio.org/platforms/platformio/kendryte210>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``kendryte210``
 
diff --git a/platforms/lattice_ice40.rst b/platforms/lattice_ice40.rst
index f833638eb9..b662e7d381 100644
--- a/platforms/lattice_ice40.rst
+++ b/platforms/lattice_ice40.rst
@@ -14,6 +14,8 @@
 Lattice iCE40
 =============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/lattice_ice40 <https://registry.platformio.org/platforms/platformio/lattice_ice40>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``lattice_ice40``
 
diff --git a/platforms/linux_arm.rst b/platforms/linux_arm.rst
index 56a21cb82d..1bec477137 100644
--- a/platforms/linux_arm.rst
+++ b/platforms/linux_arm.rst
@@ -14,6 +14,8 @@
 Linux ARM
 =========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/linux_arm <https://registry.platformio.org/platforms/platformio/linux_arm>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``linux_arm``
 
diff --git a/platforms/linux_i686.rst b/platforms/linux_i686.rst
index 342e02d682..a9bf194c3e 100644
--- a/platforms/linux_i686.rst
+++ b/platforms/linux_i686.rst
@@ -14,6 +14,8 @@
 Linux i686
 ==========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/linux_i686 <https://registry.platformio.org/platforms/platformio/linux_i686>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``linux_i686``
 
diff --git a/platforms/linux_x86_64.rst b/platforms/linux_x86_64.rst
index 439edec696..99fd32c3f0 100644
--- a/platforms/linux_x86_64.rst
+++ b/platforms/linux_x86_64.rst
@@ -14,6 +14,8 @@
 Linux x86_64
 ============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/linux_x86_64 <https://registry.platformio.org/platforms/platformio/linux_x86_64>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``linux_x86_64``
 
diff --git a/platforms/maxim32.rst b/platforms/maxim32.rst
index a02df6c8f3..ca97256631 100644
--- a/platforms/maxim32.rst
+++ b/platforms/maxim32.rst
@@ -14,6 +14,8 @@
 Maxim 32
 ========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/maxim32 <https://registry.platformio.org/platforms/platformio/maxim32>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``maxim32``
 
diff --git a/platforms/microchippic32.rst b/platforms/microchippic32.rst
index 5aaea18164..0b79620d0f 100644
--- a/platforms/microchippic32.rst
+++ b/platforms/microchippic32.rst
@@ -14,6 +14,8 @@
 Microchip PIC32
 ===============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/microchippic32 <https://registry.platformio.org/platforms/platformio/microchippic32>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``microchippic32``
 
diff --git a/platforms/native.rst b/platforms/native.rst
index 12e08733c2..9503f3147e 100644
--- a/platforms/native.rst
+++ b/platforms/native.rst
@@ -14,6 +14,8 @@
 Native
 ======
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/native <https://registry.platformio.org/platforms/platformio/native>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``native``
 
diff --git a/platforms/nordicnrf51.rst b/platforms/nordicnrf51.rst
index 6b2840730d..fd0d5fa0f2 100644
--- a/platforms/nordicnrf51.rst
+++ b/platforms/nordicnrf51.rst
@@ -14,6 +14,8 @@
 Nordic nRF51
 ============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/nordicnrf51 <https://registry.platformio.org/platforms/platformio/nordicnrf51>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``nordicnrf51``
 
diff --git a/platforms/nordicnrf52.rst b/platforms/nordicnrf52.rst
index 532e994518..5497c1bfbb 100644
--- a/platforms/nordicnrf52.rst
+++ b/platforms/nordicnrf52.rst
@@ -14,6 +14,8 @@
 Nordic nRF52
 ============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/nordicnrf52 <https://registry.platformio.org/platforms/platformio/nordicnrf52>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``nordicnrf52``
 
diff --git a/platforms/nxpimxrt.rst b/platforms/nxpimxrt.rst
index 3a5a31cfef..f670776899 100644
--- a/platforms/nxpimxrt.rst
+++ b/platforms/nxpimxrt.rst
@@ -14,6 +14,8 @@
 NXP i.MX RT
 ===========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/nxpimxrt <https://registry.platformio.org/platforms/platformio/nxpimxrt>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``nxpimxrt``
 
diff --git a/platforms/nxplpc.rst b/platforms/nxplpc.rst
index 36a68373ef..d5901f3173 100644
--- a/platforms/nxplpc.rst
+++ b/platforms/nxplpc.rst
@@ -14,6 +14,8 @@
 NXP LPC
 =======
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/nxplpc <https://registry.platformio.org/platforms/platformio/nxplpc>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``nxplpc``
 
diff --git a/platforms/openhw.rst b/platforms/openhw.rst
index 28397d2407..cad551e125 100644
--- a/platforms/openhw.rst
+++ b/platforms/openhw.rst
@@ -14,6 +14,8 @@
 OpenHW Group
 ============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/openhw <https://registry.platformio.org/platforms/platformio/openhw>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``openhw``
 
diff --git a/platforms/raspberrypi.rst b/platforms/raspberrypi.rst
index f391198097..03b924d91a 100644
--- a/platforms/raspberrypi.rst
+++ b/platforms/raspberrypi.rst
@@ -14,6 +14,8 @@
 Raspberry Pi RP2040
 ===================
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/raspberrypi <https://registry.platformio.org/platforms/platformio/raspberrypi>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``raspberrypi``
 
diff --git a/platforms/riscv_gap.rst b/platforms/riscv_gap.rst
index c38ef038b7..c4f9ef84fd 100644
--- a/platforms/riscv_gap.rst
+++ b/platforms/riscv_gap.rst
@@ -14,6 +14,8 @@
 RISC-V GAP
 ==========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/riscv_gap <https://registry.platformio.org/platforms/platformio/riscv_gap>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``riscv_gap``
 
diff --git a/platforms/shakti.rst b/platforms/shakti.rst
index ea62606a98..97ad95e525 100644
--- a/platforms/shakti.rst
+++ b/platforms/shakti.rst
@@ -14,6 +14,8 @@
 Shakti
 ======
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/shakti <https://registry.platformio.org/platforms/platformio/shakti>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``shakti``
 
diff --git a/platforms/sifive.rst b/platforms/sifive.rst
index df5b0562e2..2e480a37fb 100644
--- a/platforms/sifive.rst
+++ b/platforms/sifive.rst
@@ -14,6 +14,8 @@
 SiFive
 ======
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/sifive <https://registry.platformio.org/platforms/platformio/sifive>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``sifive``
 
diff --git a/platforms/siliconlabsefm32.rst b/platforms/siliconlabsefm32.rst
index fb35687624..e82c5f866d 100644
--- a/platforms/siliconlabsefm32.rst
+++ b/platforms/siliconlabsefm32.rst
@@ -14,6 +14,8 @@
 Silicon Labs EFM32
 ==================
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/siliconlabsefm32 <https://registry.platformio.org/platforms/platformio/siliconlabsefm32>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``siliconlabsefm32``
 
diff --git a/platforms/ststm32.rst b/platforms/ststm32.rst
index 0c8bf04c90..efc8169b6f 100644
--- a/platforms/ststm32.rst
+++ b/platforms/ststm32.rst
@@ -14,6 +14,8 @@
 ST STM32
 ========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/ststm32 <https://registry.platformio.org/platforms/platformio/ststm32>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``ststm32``
 
diff --git a/platforms/ststm8.rst b/platforms/ststm8.rst
index 804ffeb02c..3556d4dc13 100644
--- a/platforms/ststm8.rst
+++ b/platforms/ststm8.rst
@@ -14,6 +14,8 @@
 ST STM8
 =======
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/ststm8 <https://registry.platformio.org/platforms/platformio/ststm8>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``ststm8``
 
diff --git a/platforms/teensy.rst b/platforms/teensy.rst
index 444c2b443c..d50d35f0e3 100644
--- a/platforms/teensy.rst
+++ b/platforms/teensy.rst
@@ -14,6 +14,8 @@
 Teensy
 ======
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/teensy <https://registry.platformio.org/platforms/platformio/teensy>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``teensy``
 
diff --git a/platforms/timsp430.rst b/platforms/timsp430.rst
index 13b0437497..172a509475 100644
--- a/platforms/timsp430.rst
+++ b/platforms/timsp430.rst
@@ -14,6 +14,8 @@
 TI MSP430
 =========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/timsp430 <https://registry.platformio.org/platforms/platformio/timsp430>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``timsp430``
 
diff --git a/platforms/titiva.rst b/platforms/titiva.rst
index 65f10794cc..065c2caa71 100644
--- a/platforms/titiva.rst
+++ b/platforms/titiva.rst
@@ -14,6 +14,8 @@
 TI TIVA
 =======
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/titiva <https://registry.platformio.org/platforms/platformio/titiva>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``titiva``
 
diff --git a/platforms/windows_x86.rst b/platforms/windows_x86.rst
index 98c6fe4445..4a317f6db9 100644
--- a/platforms/windows_x86.rst
+++ b/platforms/windows_x86.rst
@@ -14,6 +14,8 @@
 Windows x86
 ===========
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/windows_x86 <https://registry.platformio.org/platforms/platformio/windows_x86>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``windows_x86``
 
diff --git a/platforms/wiznet7500.rst b/platforms/wiznet7500.rst
index 29579c6d46..e2338b795e 100644
--- a/platforms/wiznet7500.rst
+++ b/platforms/wiznet7500.rst
@@ -14,6 +14,8 @@
 WIZNet W7500
 ============
 
+:Registry:
+  `https://registry.platformio.org/platforms/platformio/wiznet7500 <https://registry.platformio.org/platforms/platformio/wiznet7500>`__
 :Configuration:
   :ref:`projectconf_env_platform` = ``wiznet7500``