Skip to content

Commit 8df1c50

Browse files
authored
Getting around some merge issues (#1356)
* User feedback * CLI reqs
1 parent 35f5041 commit 8df1c50

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

docs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
"path": "docs/api/platform/platform_list.md"
393393
},
394394
"sub_chapters": [{
395-
"title": "Platform Concepts",
395+
"title": "Platform concepts",
396396
"sources": [{
397397
"path": "docs/api/platform/platform.md"
398398
},

docs/bare_metal/using_bare_metal.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ To create the application using Mbed CLI:
4848
4949
Your application is set to use the bare metal profile with the default APIs. However, this example uses APIs that are not part of the default bare metal profile. You need to manually add support for those APIs to the application (for a list of default and supported APIs, [please see our full API list](../apis/index.html)).
5050
51-
This example depends on the `EventQueue` class, so you need to add the library that contains that class to the `mbed_app.json` file:
51+
To add API support, add the library name to the same `requires` array you used to set the bare metal profile. The following example shows how to find the library name, and how to add it to the array.
52+
53+
This example depends on the `EventQueue` class, and adds the library that contains that class to the `mbed_app.json` file:
5254
5355
1. In `mbed-os/`, locate the API and the library in which it is declared.
5456
@@ -68,7 +70,7 @@ This example depends on the `EventQueue` class, so you need to add the library t
6870
6971
1. Go back to the application's root directory.
7072
71-
1. Open `mbed_app.json` again, and add the library to the `"requires"` field:
73+
1. Open `mbed_app.json` again, and add the library to the `"requires"` array:
7274
7375
```json
7476
{

docs/quick-start/further_reading.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- Tutorials:
1616
- [Debugging](../debug-test/index.html).
1717
- [Serial communications](../program-setup/serial-communication.html).
18-
- [Optimizing binary size](../apis/platform-tutorials.html).
18+
- [Optimizing memory and power](../apis/platform-tutorials.html).
1919

2020
- Other resources:
2121
- [Components database](https://os.mbed.com/components/): libraries and example code for various hardware and software components.

0 commit comments

Comments
 (0)