Merge branch 'master' into snekboard

3 files changed, 23 insertions, 57 deletions

diff --git a/shared-bindings/bleio/Peripheral.c b/shared-bindings/bleio/Peripheral.c
index 1302c9652..570896d27 100644
--- a/shared-bindings/bleio/Peripheral.c
+++ b/shared-bindings/bleio/Peripheral.c
@@ -72,7 +72,7 @@ static const char default_name[] = "CIRCUITPY";
 //|    serv = bleio.Service(bleio.UUID(0x180f), [chara])
 //|
 //|    # Create a peripheral and start it up.
-//|    periph = bleio.Peripheral([service])
+//|    periph = bleio.Peripheral([serv])
 //|    adv = ServerAdvertisement(periph)
 //|    periph.start_advertising(adv.advertising_data_bytes, adv.scan_response_bytes)
 //|
diff --git a/shared-bindings/index.rst b/shared-bindings/index.rst
index b7690d292..cbffdb614 100644
--- a/shared-bindings/index.rst
+++ b/shared-bindings/index.rst
@@ -1,11 +1,11 @@
 Core Modules
 ========================================
 
-These core modules are intended on being consistent across ports. Currently
-they are only implemented in the SAMD21 and ESP8266 ports. A module may not exist
-in a port if no underlying hardware support is present or if flash space is
-limited. For example, a microcontroller without analog features will not have
-`analogio`.
+These core modules are intended on being consistent across ports and boards.
+A module may not exist on a port/board if no underlying hardware support is
+present or if flash space is limited. For example, a microcontroller without
+analog features will not have `analogio`. See the `support_matrix` page for
+a list of modules supported on each board.
 
 Modules
 ---------
@@ -14,56 +14,6 @@ Modules
     :glob:
     :maxdepth: 3
 
+    support_matrix
     */__init__
     help
-
-.. _module-support-matrix:
-
-Support Matrix
----------------
-NOTE 1: **All Supported** means the following ports are supported: SAMD21, SAMD21 Express,
-SAMD51, SAMD51 Express, and ESP8266.
-
-NOTE 2: **SAMD** and/or **SAMD Express** without additional numbers, means both SAMD21 & SAMD51 versions
-are supported.
-
-NOTE 3: The `pIRkey SAMD21 board <https://www.adafruit.com/product/3364>`_ is specialized and may not
-have modules as listed below.
-
-=================  ==============================
-Module             Supported Ports
-=================  ==============================
-`analogio`         **All Supported**
-`audiobusio`       **SAMD/SAMD Express**
-`audioio`          **SAMD Express**
-`audiocore`        **All with audioio**
-`binascii`         **ESP8266**
-`bitbangio`        **SAMD Express, ESP8266**
-`board`            **All Supported**
-`bleio`            **nRF**
-`busio`            **All Supported**
-`digitalio`        **All Supported**
-`frequencyio`      **SAMD51**
-`gamepad`          **SAMD Express, nRF**
-`hashlib`          **ESP8266**
-`i2cslave`         **SAMD Express**
-`math`             **All Supported**
-`microcontroller`  **All Supported**
-`multiterminal`    **ESP8266**
-`neopixel_write`   **All Supported**
-`nvm`              **SAMD Express**
-`os`               **All Supported**
-`pulseio`          **SAMD/SAMD Express**
-`ps2io`            **SAMD/SAMD Express**
-`random`           **All Supported**
-`rotaryio`         **SAMD51, SAMD Express**
-`storage`          **All Supported**
-`struct`           **All Supported**
-`supervisor`       **SAMD/SAMD Express**
-`time`             **All Supported**
-`touchio`          **SAMD/SAMD Express**
-`uheap`            **Debug (All)**
-`usb_hid`          **SAMD/SAMD Express**
-`_pixelbuf`        **SAMD Express**
-`_stage`           **SAMD/SAMD Express**
-=================  ==============================
diff --git a/shared-bindings/support_matrix.rst b/shared-bindings/support_matrix.rst
new file mode 100644
index 000000000..124f3a810
--- /dev/null
+++ b/shared-bindings/support_matrix.rst
@@ -0,0 +1,16 @@
+.. _module-support-matrix:
+
+Support Matrix
+===============
+
+The following table lists the available built-in modules for each CircuitPython
+capable board.
+
+.. csv-table::
+   :header-rows: 1
+   :widths: 7, 50
+
+   "Board", "Modules Available"
+   {% for key, value in support_matrix|dictsort -%}
+   "{{ key }}", "{{ '`' ~ value|join("`, `") ~ '`' }}"
+   {% endfor -%}