diff --git a/content/hardware/01.mkr/01.boards/mkr-1000-wifi/product.md b/content/hardware/01.mkr/01.boards/mkr-1000-wifi/product.md
index aaf123c8b8..1337c1e594 100644
--- a/content/hardware/01.mkr/01.boards/mkr-1000-wifi/product.md
+++ b/content/hardware/01.mkr/01.boards/mkr-1000-wifi/product.md
@@ -4,6 +4,7 @@ url_shop: https://store.arduino.cc/arduino-mkr1000-wifi
 url_guide: /software/ide-v1/installing-samd21-core
 core: arduino:samd
 forumCategorySlug: '/hardware/mkr-boards/mkr1000/137'
+status: end-of-life
 ---
 
 The Arduino MKR 1000 WiFi is the easiest point of entry to basic IoT and pico-network application design. Whether you are looking at setting up a sensor network for your office or building a smart home, the MKR 1000 WiFi will make that journey easy.
\ No newline at end of file
diff --git a/content/hardware/01.mkr/01.boards/mkr-fox-1200/product.md b/content/hardware/01.mkr/01.boards/mkr-fox-1200/product.md
index a99eef2213..2f05800120 100644
--- a/content/hardware/01.mkr/01.boards/mkr-fox-1200/product.md
+++ b/content/hardware/01.mkr/01.boards/mkr-fox-1200/product.md
@@ -3,6 +3,7 @@ title: MKR FOX 1200
 url_guide: /software/ide-v1/installing-samd21-core
 core: arduino:samd
 forumCategorySlug: '/mkr-boards/mkrfox1200/142'
+status: end-of-life
 ---
 
 The MKR FOX 1200 is your entry point to start working with the European Sigfox networks. The board can easily be added to the Sigfox infrastructure. It also features very low power consumption, and is designed to run on batteries for a longer period of time.
\ No newline at end of file
diff --git a/content/hardware/01.mkr/01.boards/mkr-gsm-1400/product.md b/content/hardware/01.mkr/01.boards/mkr-gsm-1400/product.md
index d5fd790a8a..cbe8dda23f 100644
--- a/content/hardware/01.mkr/01.boards/mkr-gsm-1400/product.md
+++ b/content/hardware/01.mkr/01.boards/mkr-gsm-1400/product.md
@@ -3,6 +3,7 @@ title: MKR GSM 1400
 url_guide: /software/ide-v1/installing-samd21-core
 core: arduino:samd
 forumCategorySlug: '/hardware/mkr-boards/mkrgsm1400/146'
+status: end-of-life
 ---
 
 The Arduino MKR GSM 1400 is a great starting point for building IoT projects connected to GSM / 3G network. Whether you are looking at building a sensor network for agricultural projects, or for urban data collection, the MKR GSM 1400 is your go-to board for IoT projects when Wi-Fi is not available.
\ No newline at end of file
diff --git a/content/hardware/01.mkr/01.boards/mkr-wan-1310/tutorials/mkr-wan-library-examples/mkr-wan-library-examples.md b/content/hardware/01.mkr/01.boards/mkr-wan-1310/tutorials/mkr-wan-library-examples/mkr-wan-library-examples.md
index 0e4f4c4f50..c7c9c0e6b3 100644
--- a/content/hardware/01.mkr/01.boards/mkr-wan-1310/tutorials/mkr-wan-library-examples/mkr-wan-library-examples.md
+++ b/content/hardware/01.mkr/01.boards/mkr-wan-1310/tutorials/mkr-wan-library-examples/mkr-wan-library-examples.md
@@ -5,7 +5,7 @@ tags: [LoRa, WAN]
 author: Arduino
 ---
 
-These examples will show you how to set up your board to use the LoRa network and how to send and receive data from the LoRa network.
+These examples will show you how to set up your board to use the LoRa® network and how to send and receive data from the LoRa® network.
 
 ## Hardware Required
 
diff --git a/content/hardware/02.hero/boards/yun-rev2/tutorials/ShellCommands/ShellCommands.md b/content/hardware/02.hero/boards/yun-rev2/tutorials/ShellCommands/ShellCommands.md
index 92046fe2d6..328288b859 100644
--- a/content/hardware/02.hero/boards/yun-rev2/tutorials/ShellCommands/ShellCommands.md
+++ b/content/hardware/02.hero/boards/yun-rev2/tutorials/ShellCommands/ShellCommands.md
@@ -65,7 +65,7 @@ void loop() {
   Process p;
 ```
 
-Pass `runShellCommand()` the path of the script you wish to run, along with any additional commands. In this case, you'll call "grep Signal" to pull out just the signal strength of the WiFi connection.
+Pass `runShellCommand()` the path of the script you wish to run, along with any additional commands. In this case, you'll call "grep Signal" to pull out just the signal strength of the Wi-Fi connection.
 
 `p.runShellCommand("/usr/bin/pretty-wifi-info.lua | grep Signal");`
 
@@ -92,7 +92,7 @@ while (p.available()) {
 }
 ```
 
-The LED should change its brightness as the WiFi signal strength fluctuates.
+The LED should change its brightness as the Wi-Fi signal strength fluctuates.
 
 ## Complete Sketch
 
diff --git a/content/hardware/02.hero/boards/yun-rev2/tutorials/WiFiStatus/WiFiStatus.md b/content/hardware/02.hero/boards/yun-rev2/tutorials/WiFiStatus/WiFiStatus.md
index 28217858c3..deb8cc81c2 100644
--- a/content/hardware/02.hero/boards/yun-rev2/tutorials/WiFiStatus/WiFiStatus.md
+++ b/content/hardware/02.hero/boards/yun-rev2/tutorials/WiFiStatus/WiFiStatus.md
@@ -1,7 +1,7 @@
 ---
 tags: [Yún]
 author: Arduino
-title: 'Arduino Yún Yún WiFi Status'
+title: 'Arduino Yún WiFi Status'
 description: 'Runs a pre-configured script that reports back the strength of the current WiFi network.'
 ---
 
diff --git a/package.json b/package.json
index e40d38c6b3..7780f0cf21 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/arduino/docs-content#readme",
   "dependencies": {
-    "@arduino/docs-arduino-cc": "^1.0.14",
+    "@arduino/docs-arduino-cc": "^1.0.17",
     "gatsby": "^4.3.0"
   },
   "volta": {