Refining OTA documentation

Author: arun-silabs

sld407-matter-ota/02-ota-software-update.md

@@ -2,7 +2,7 @@
 
 This page outlines the steps for a scenario that demonstrates the Over The Air (OTA) Software Update functionality in Matter.
 
-The Over The Air (OTA) Software Update functionality is enabled by default for all Silicon Labs example applications. Its inclusion in an application is controlled by the OTA Requestor component in a Matter project in Simplicity Studio.
+The Over The Air (OTA) Software Update functionality is enabled by default for all Silicon Labs example applications. It's inclusion in an application is controlled by the OTA Requestor component in a Matter project in Simplicity Studio.
 
 ## Overview
 
@@ -174,17 +174,18 @@ For more information, see the documentation for the ota-provider-app example in
 
 ## Multi-Chip OTA Images
 
-Multi-Chip OTA is implemented for EFR32 and SiWx917 NCP/SoC devices. Multi-chip OTA uses an enhanced script, ota_multi_image_tool.py, which creates .ota files that contain additional TLV headers. These TLV headers describe the binaries to be sent over the air. The enhanced script is located here. It is a wrapper to the original src/app/ota_image_tool.py. Multiple binaries can be packaged in the .ota file. Some tags are reserved for specific Silicon Labs binaries, and other tags are available to be used for arbitrary TLVs. The payloads can be encrypted.
+Multi-Chip OTA is implemented for EFR32 and SiWx917 NCP/SoC devices. Multi-Chip OTA uses an enhanced script, ota_multi_image_tool.py, which creates .ota files that contain additional TLV headers. These TLV headers describe the binaries to be sent over the air. The enhanced script is located here. It is a wrapper to the original src/app/ota_image_tool.py. Multiple binaries can be packaged in the .ota file. Some tags are reserved for specific Silicon Labs binaries, and other tags are available to be used for arbitrary TLVs. The payloads can be encrypted.
 
 The script can be obtained from the Matter Extension github repository.
 
 For more information on creating a Multi-Chip .ota file, see the [README.md](https://github.com/project-chip/connectedhomeip/blob/master/scripts/tools/silabs/ota/README.md).
 
-Applications must be built with the OTA Multi Image Requestor component added to the project in Simplicity Studio to enable them to process the TLVs.
+Applications must be built with the Multi-Chip OTA Image Requestor component added to the project in Simplicity Studio to enable them to process the TLVs.
 
-The OTA Multi Image Requestor Encryption component should be added to the project if the requestor is meant to process encrypted payloads.
+The Multi-Chip OTA Image Requestor Encryption component should be added to the project if the requestor is meant to process encrypted payloads.
 
-**Combined OTA images are also supported:**
+**Combined OTA Images in Regular and Multi-Chip OTA Implementations:**
+Combined OTA images are supported in both regular OTA and Multi-Chip OTA implementations. These images can contain the bootloader, application, or both, depending on your upgrade scenario.
 
 1. Bootloader + application upgrade. This requires a combined image.
 
@@ -237,7 +238,7 @@ BootloaderInformation_t info
 Then, in the beginning of [OTAImageProcessorImpl::IsFirstImageRun](https://github.com/SiliconLabsSoftware/matter_sdk/blob/01a2d4aafaa0b124123caac067831809a1a86720/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp#L115), add:
 
 ```c++
-bootloader_getInfo(&info); // LINE ADDED: for Multi-OTA test
+bootloader_getInfo(&info); // LINE ADDED: for Multi-Chip OTA test
 ChipLogProgress(SoftwareUpdate, "Bootloader version: 0x%lx\n", info.version);
 ChipLogProgress(SoftwareUpdate, "Bootloader type: %d\n", info.type);
 ```

sld407-matter-ota/03-firmware-upgrades.md

@@ -143,15 +143,15 @@ Before running **ota-requestor** app, flash the **OTA-A** application(M4) and Wi
     ./chip-tool basicinformation read software-version 1 0
     ```
 
-### Multi-OTA images for SiWx917 NCP/SoC
+### Multi-Chip OTA images for SiWx917 NCP/SoC
 
-Multi-OTA images can be created using `ota_multi_image_tool.py` which creates .ota files that contain additional TLV headers.
+Multi-Chip OTA images can be created using `ota_multi_image_tool.py` which creates .ota files that contain additional TLV headers.
 
 >**Note**: SiWN917 NCP uses TLV tag 4 for Wi-Fi(TA) image upgrade.
 
-#### Multi-OTA image creation on SiWN917 NCP
+#### Multi-Chip OTA image creation on SiWN917 NCP
 
-Multi-OTA on SiWN917 NCP supports application image upgrade, Wi-Fi(TA) image upgrade and combined image upgrade.
+Multi-Chip OTA on SiWN917 NCP supports application image upgrade, Wi-Fi(TA) image upgrade and combined image upgrade.
 
 **Application Image Upgrade**
 
@@ -177,7 +177,7 @@ commander gbl create SiWx917-lock-example.gbl --app SiWx917-lock-example.s37 --c
 ./scripts/tools/silabs/ota/ota_multi_image_tool.py create -v 0xFFF1 -p 0x8005 -vn 2 -vs "2.0" -da sha256 --app-input-file SiWx917-lock-example.gbl --wifi_ta_input_file SiWG917-B.2.14.5.0.0.10.rps combined_image.ota
 ```
 
-#### Multi-OTA image creation on SiWG917 SoC
+#### Multi-Chip OTA image creation on SiWG917 SoC
 
 >**Note**: SiWG917 SoC uses TLV tag 1 for all image upgrades M4 alone, TA alone and combined image upgrade.
 

sld407-matter-ota/04-ota-software-update-soc.md renamed to sld407-matter-ota/03-ota-software-update-soc.md

@@ -1,4 +1,4 @@
-# Building Matter applications for OTA Software Update
+# Getting Started with OTA Updates in Matter Applications Using Simplicity Studio
 
 In the Matter OTA Software Update scenario, the running image (OTA-A) and the update image (OTA-B) are regular Matter application images and are built using the standard procedure. The only additional configuration required is the use of a higher software version in the update image. This page provides information about creation of OTA-A and OTA-B application for EFR32 and SiWx917 SOC Boards.
 

sld407-matter-ota/05-build-ota-application-using-studio.md renamed to sld407-matter-ota/04-build-ota-application-using-studio.md

@@ -4,5 +4,5 @@ The Over The Air (OTA) Software Update functionality is enabled by default for a
 
 - [**Matter OTA Bootloader**](./01-ota-bootloader.md)
 - [**Matter OTA Software Update**](./02-ota-software-update.md)
-- [**Matter 917 SOC OTA Software Update**](./04-ota-software-update-soc.md)
-- [**Matter OTA WiFi Project**](./05-build-ota-application-using-studio.md)
+- [**Matter 917 SOC OTA Software Update**](./03-ota-software-update-soc.md)
+- [**Wi-Fi-Based Matter OTA Project in Simplicity Studio**](./04-build-ota-application-using-studio.md)