diff --git a/boards/beaglebone/ai-64/ch10.rst b/boards/beaglebone/ai-64/ch10.rst
index 97d15c3b0f749f5e5862fe178452220270c7e3ce..fb21a8d4f2e4ba1ef25c8e0519625775228cf9a3 100644
--- a/boards/beaglebone/ai-64/ch10.rst
+++ b/boards/beaglebone/ai-64/ch10.rst
@@ -24,7 +24,7 @@ Pictures
 
    Fig: BeagleBone AI-64 back with heatsink
 
-.. figure:: images/ch10/45-front.jpg
+.. figure:: images/bbai64-45-front.jpg
    :width: 400px
    :align: center 
    :alt: Fig: BeagleBone AI-64 front at 45° angle
diff --git a/boards/beaglebone/ai-64/images/ch10/45-front.jpg b/boards/beaglebone/ai-64/images/bbai64-45-front.jpg
similarity index 100%
rename from boards/beaglebone/ai-64/images/ch10/45-front.jpg
rename to boards/beaglebone/ai-64/images/bbai64-45-front.jpg
diff --git a/boards/beaglebone/ai-64/index.rst b/boards/beaglebone/ai-64/index.rst
index 2ada5d10add415612bd67765ec2189287e6689af..2d99ca7e318ba80ec3f22ed60e62552165267435 100644
--- a/boards/beaglebone/ai-64/index.rst
+++ b/boards/beaglebone/ai-64/index.rst
@@ -3,12 +3,12 @@
 BeagleBone AI-64
 ###################
 
-BeagleBone® AI-64 brings a complete system for developing artificial intelligence (AI) and machine learning 
-solutions with the convenience and expandability of the BeagleBone® platform and the peripherals on board to 
-get started right away learning and building applications. With locally hosted, ready-to-use, open-source 
-focused tool chains and development environment, a simple web browser, power source and network connection 
-are all that need to be added to start building performance-optimized embedded applications. Industry-leading 
-expansion possibilities are enabled through familiar BeagleBone® cape headers, with hundreds of open-source 
+BeagleBone® AI-64 brings a complete system for developing artificial intelligence (AI) and machine learning
+solutions with the convenience and expandability of the BeagleBone® platform and the peripherals on board to
+get started right away learning and building applications. With locally hosted, ready-to-use, open-source
+focused tool chains and development environment, a simple web browser, power source and network connection
+are all that need to be added to start building performance-optimized embedded applications. Industry-leading
+expansion possibilities are enabled through familiar BeagleBone® cape headers, with hundreds of open-source
 hardware examples and dozens of readily available embedded expansion options available off-the-shelf.
 
 .. grid:: 2
@@ -32,17 +32,22 @@ hardware examples and dozens of readily available embedded expansion options ava
             * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai-64>`__
             * For export, emissions and other compliance, see :ref:`beaglebone-ai-64-support-information`
 
+.. image:: images/bbai64-45-front.jpg
+   :width: 400px
+   :align: center
+   :alt: Fig: BeagleBone AI-64 front at 45° angle
+
 .. toctree::
    :maxdepth: 1
 
-   /boards/beaglebone/ai-64/ch01.rst
-   /boards/beaglebone/ai-64/ch02.rst
-   /boards/beaglebone/ai-64/ch03.rst
-   /boards/beaglebone/ai-64/ch04.rst
-   /boards/beaglebone/ai-64/ch05.rst
-   /boards/beaglebone/ai-64/ch07.rst
-   /boards/beaglebone/ai-64/ch09.rst
-   /boards/beaglebone/ai-64/ch10.rst
-   /boards/beaglebone/ai-64/ch11.rst
-   /boards/beaglebone/ai-64/update.rst
-   /boards/beaglebone/ai-64/edge_ai_apps/index.rst
+   ch01
+   ch02
+   ch03
+   ch04
+   ch05
+   ch07
+   ch09
+   ch10
+   ch11
+   update
+   edge_ai_apps/index
diff --git a/boards/beaglebone/ai/index.rst b/boards/beaglebone/ai/index.rst
index 95e4b5d15cf99937991c7a8be87db66539881bfa..6588c1086ce23167a5d6e4661afa2962be2290c5 100644
--- a/boards/beaglebone/ai/index.rst
+++ b/boards/beaglebone/ai/index.rst
@@ -27,20 +27,20 @@ BeagleBone AI is based on the Texas Instruments AM5729 dual-core Cortex-A15 SoC
                 * For export, emissions and other compliance, see :ref:`beaglebone-ai-support`
 
 .. image:: images/BB_AI_handheld_500px.jpg
-   :width: 500
-   :align: center
-   :height: 333
-   :alt: BeagleBone AI
+    :width: 500
+    :align: center
+    :height: 333
+    :alt: BeagleBone AI
 
 .. toctree::
     :maxdepth: 1
 
-    ch01.rst
-    ch03.rst
-    ch04.rst
-    ch05.rst
-    ch06.rst
-    ch07.rst
-    ch08.rst
-    ch11.rst
+    ch01
+    ch03
+    ch04
+    ch05
+    ch06
+    ch07
+    ch08
+    ch11
 
diff --git a/boards/beaglebone/black/index.rst b/boards/beaglebone/black/index.rst
index 49c58856d675ae0eed10c048a9f9b3e79bca23ad..a34b23ffe154fbdea58945f89a223f62ffe08b7b 100644
--- a/boards/beaglebone/black/index.rst
+++ b/boards/beaglebone/black/index.rst
@@ -36,15 +36,15 @@ Boot Linux in under 10 seconds and get started on development in less than 5 min
 .. toctree::
    :maxdepth: 1
 
-   /boards/beaglebone/black/ch01.rst
-   /boards/beaglebone/black/ch02.rst
-   /boards/beaglebone/black/ch03.rst
-   /boards/beaglebone/black/ch04.rst
-   /boards/beaglebone/black/ch05.rst
-   /boards/beaglebone/black/ch06.rst
-   /boards/beaglebone/black/ch07.rst
-   /boards/beaglebone/black/ch08.rst
-   /boards/beaglebone/black/ch09.rst
-   /boards/beaglebone/black/ch10.rst
-   /boards/beaglebone/black/ch11.rst
+   ch01
+   ch02
+   ch03
+   ch04
+   ch05
+   ch06
+   ch07
+   ch08
+   ch09
+   ch10
+   ch11
 
diff --git a/boards/beaglebone/index.rst b/boards/beaglebone/index.rst
index 780dc00a5bb05990b82619951e2702b250052296..c261f0ef56681ba3d27dcff6288da5c05dd7c00b 100644
--- a/boards/beaglebone/index.rst
+++ b/boards/beaglebone/index.rst
@@ -22,17 +22,6 @@ with links to their latest PDF-formatted System Reference Manual and the latest
 included both here and in the downloadable beagleboard-docs.pdf linked on the bottom-left
 of your screen.
 
-.. note::
-
-    This work is licensed under a `Creative Commons Attribution-ShareAlike
-    4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
-
-.. tip::
-    Make sure to read and accept all the terms & condition provided in the :ref:`boards-terms-and-conditions` page. 
-    
-    Use of either the boards or the design materials constitutes agreement to the T&C including any 
-    modifications done to the hardware or software solutions provided by beagleboard.org foundation.
-
 All boards received without RMA approval will not be worked on.
 
 * `BeagleBone (original) <https://git.beagleboard.org/beagleboard/beaglebone/-/blob/master/BeagleBone_SRM_A6_0_1.pdf>`__
diff --git a/boards/beagleconnect/index.rst b/boards/beagleconnect/index.rst
index af997de6b2485a5b76911a96b13ad54c99336f9b..8f08420c67cec5fc8647ee3a3119cf3fba408493 100644
--- a/boards/beagleconnect/index.rst
+++ b/boards/beagleconnect/index.rst
@@ -7,18 +7,6 @@ BeagleConnect
 
    Currently under development
 
-.. note::
-
-    This work is licensed under a `Creative Commons Attribution-ShareAlike
-    4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
-
-.. tip::
-
-    Make sure to read and accept all the terms & condition provided in the :ref:`boards-terms-and-conditions` page. 
-    
-    Use of either the boards or the design materials constitutes agreement to the T&C including any 
-    modifications done to the hardware or software solutions provided by beagleboard.org foundation.
-
 BeagleConnectâ„¢ is a revolutionary technology virtually eliminating low-level 
 software development for `IoT <https://en.wikipedia.org/wiki/Internet_of_things>`_ 
 and `IIoT <https://en.wikipedia.org/wiki/Industrial_internet_of_things>`_ 
diff --git a/boards/beagleplay/index.rst b/boards/beagleplay/index.rst
index 99d490e345193e13ee7bf0e8868629bc667ad3d6..868bc38ded5a392d9255a7bab2a6ddcfe5ead39d 100644
--- a/boards/beagleplay/index.rst
+++ b/boards/beagleplay/index.rst
@@ -7,6 +7,9 @@ BeaglePlay
     This is a work in progress, for latest documentation please 
     visit https://docs.beagleboard.org/latest/
 
+BeaglePlay is an open-source single board computer based on the Texas Instruments AM6254 quad-core Cortex-A53 Arm SoC designed to simplify the process of adding
+sensors, actuators, indicators, human interfaces, and connectivity to a reliable embedded system.
+
 .. grid:: 2
 
     .. grid-item::
diff --git a/boards/beaglev/ahead/01-introduction.rst b/boards/beaglev/ahead/01-introduction.rst
index 1e15df1cdeb069b6c5dc3933438b4456a8edc1da..db7d0783d92707111311af9b5a95e95060e41502 100644
--- a/boards/beaglev/ahead/01-introduction.rst
+++ b/boards/beaglev/ahead/01-introduction.rst
@@ -3,10 +3,10 @@
 Introduction
 #############
 
-BeagleV Ahead is an open-source RISC-V Single Board Computer (SBC) in the form 
-factor of BeagleBone Black. It has the same P8 & P9 cape header pins as BeagleBone Black 
-allowing you to stack your favourite BeagleBone cape on top to expand it's capability. 
-Featuring a powerful quad-core RISC-V processor BeagleV Ahead is designed as an affordable 
+BeagleV-Ahead is a high-performance open-source RISC-V single board computer (SBC) built around
+the Alibaba TH1520 SoC. It provides the same P8 & P9 cape header pins as BeagleBone Black 
+allowing you to stack your favorite BeagleBone cape on top to expand it's capability. 
+Featuring a powerful quad-core RISC-V processor BeagleV-Ahead is designed as an affordable 
 RISC-V enabled pocket-size computer for anybody who want's to dive deep into the new RISC-V ISA.
 
 .. table::
@@ -53,6 +53,10 @@ BeagleV Ahead is build around T-Head TH1520 RISC-V SoC with quad-core
 Xuantie C910 processor clocked at 1.85GHz with a 4 TOPS NPU, support for 
 64-bit DDR, and audio processing using a single core C906.
 
+.. todo::
+
+    remove "<To-Do>" items in the table below.
+
 .. table:: BeagleV Ahead features
         
     +----------------------------+---------------------------------------------------------------------------+
diff --git a/boards/beaglev/ahead/index.rst b/boards/beaglev/ahead/index.rst
index d63db69fab8d2d5cc9ba405a9af08a48ed53e5dc..4f409523be713009965ba3342ac4586c4775a606 100644
--- a/boards/beaglev/ahead/index.rst
+++ b/boards/beaglev/ahead/index.rst
@@ -3,13 +3,11 @@
 BeagleV-Ahead
 ###################
 
-.. image:: media/BeagleV-Ahead-with-hand.*
-    :align: center
-    :alt: BeagleV Ahead with hand
- 
-.. important::
-    This is a work in progress, for latest documentation please 
-    visit https://docs.beagleboard.org/latest/
+BeagleV-Ahead is a high-performance open-source RISC-V single board computer (SBC) built around
+the Alibaba TH1520 SoC. It provides the same P8 & P9 cape header pins as BeagleBone Black
+allowing you to stack your favorite BeagleBone cape on top to expand it's capability.
+Featuring a powerful quad-core RISC-V processor BeagleV-Ahead is designed as an affordable
+RISC-V enabled pocket-size computer for anybody who want's to dive deep into the new RISC-V ISA.
 
 .. grid:: 2
 
@@ -33,19 +31,13 @@ BeagleV-Ahead
             * For export, emissions and other compliance, see :ref:`beaglev-ahead-support`
 
 
-.. note:: 
-
-    This work is licensed under a `Creative Commons Attribution-ShareAlike
-    4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
-
-    Hardware design files can be found at 
-
-.. tip::
+.. image:: media/BeagleV-Ahead-with-hand.*
+    :align: center
+    :alt: BeagleV Ahead with hand
 
-    Make sure to read and accept all the terms & condition provided in the :ref:`boards-terms-and-conditions` page. 
-    
-    Use of either the boards or the design materials constitutes agreement to the T&C including any 
-    modifications done to the hardware or software solutions provided by beagleboard.org foundation.
+.. important::
+    This is a work in progress, for latest documentation please
+    visit https://docs.beagleboard.org/latest/
 
 .. only:: html
 
@@ -63,13 +55,13 @@ BeagleV-Ahead
         .. image:: media/chapter-thumbnails/01-introduction.*
             :align: center
             :alt: BeagleV Ahead Chapter01 thumbnail
-        
+
         +++
 
-        Introduction to BeagleV Ahead board with information on each component 
+        Introduction to BeagleV Ahead board with information on each component
         location on both front and back of the board.
 
-    .. grid-item-card:: 
+    .. grid-item-card::
         :link: beaglev-ahead-quick-start
         :link-type: ref
 
@@ -82,10 +74,10 @@ BeagleV-Ahead
 
         +++
 
-        Getting started guide to enable you to start building your projects 
+        Getting started guide to enable you to start building your projects
         in no time.
 
-    .. grid-item-card:: 
+    .. grid-item-card::
         :link: beaglev-ahead-design
         :link-type: ref
 
@@ -98,10 +90,10 @@ BeagleV-Ahead
 
         +++
 
-        Hardware and mechanical design and specifications of BeagleV Ahead board 
+        Hardware and mechanical design and specifications of BeagleV Ahead board
         for those who want to know their board inside and out.
 
-    .. grid-item-card:: 
+    .. grid-item-card::
         :link: beaglev-ahead-expansion
         :link-type: ref
 
@@ -114,10 +106,10 @@ BeagleV-Ahead
 
         +++
 
-        Connector pinout diagrams with expansion details so that you can 
+        Connector pinout diagrams with expansion details so that you can
         easily debug your connections and create custom expansion hardware.
-        
-    .. grid-item-card:: 
+
+    .. grid-item-card::
         :link: beaglev-ahead-demos
         :link-type: ref
 
@@ -132,7 +124,7 @@ BeagleV-Ahead
 
         Demos and tutorials to quickly learn about BeagleV Ahead capabilities.
 
-    .. grid-item-card:: 
+    .. grid-item-card::
         :link: beaglev-ahead-support
         :link-type: ref
 
diff --git a/boards/capes/index.rst b/boards/capes/index.rst
index d5110cbbbf6d0b69ed77eaa0fca406c607927d60..556ab227fd1508a5a0af1abd0e165b111afa1903 100644
--- a/boards/capes/index.rst
+++ b/boards/capes/index.rst
@@ -6,6 +6,10 @@ Capes
 .. note::
    This page is under development.
 
+.. todo::
+
+   Get OSHWA certification for all of our capes and update the documentation to reflect that
+
 .. admonition:: Contributors
 
     This work is licensed under a `Creative Commons Attribution-ShareAlike