Merge branch 'development' into AnotherButler-patch-3

Author: Amanda Butler

docs.json

@@ -8,7 +8,7 @@
         "branch": "master"
     },
     {
-        "title": "Introduction",
+        "title": "Mbed OS 5",
         "description": "Introducing Mbed OS: the overview, architecture, features and licensing",
         "slug": "introduction",
         "type": "markdown",
@@ -46,7 +46,7 @@
         ]
     },
     {
-        "title": "Mbed OS quick start",
+        "title": "Quick start",
         "description": "",
         "slug": "quick-start",
         "type": "markdown",
@@ -952,10 +952,30 @@
             },
             {
                 "title": "Developing: Mbed Studio",
-                "sources": [{
+                "intro": {
                     "type": "markdown",
-                    "url": "https://github.com/ARMmbed/mbed-os-5-docs/blob/development/docs/tools/Studio/mbed-studio.md"
-                }]
+                    "url": "https://github.com/ARMmbed/mbed-studio-docs/blob/master/Docs/Introduction.md"
+                },
+                "sources": [{
+                        "type": "markdown",
+                        "url": "https://github.com/ARMmbed/mbed-studio-docs/blob/master/Docs/Getting-started.md"
+                    },
+                    {
+                        "type": "markdown",
+                        "url": "https://github.com/ARMmbed/mbed-studio-docs/blob/master/Docs/Including-libraries.md"
+                    },
+                    {
+                        "type": "markdown",
+                        "url": "https://github.com/ARMmbed/mbed-studio-docs/blob/master/Docs/Working-with-source-control.md"
+                    },
+                    {
+                        "type": "markdown",
+                        "url": "https://github.com/ARMmbed/mbed-studio-docs/blob/master/Docs/Getting-your-program-on-an-Mbed-platform.md"
+                    },
+                    {
+                        "type": "markdown",
+                        "url": "https://github.com/ARMmbed/mbed-studio-docs/blob/master/Docs/Debugging.md"
+                    }]
             },
             {
                 "title": "Developing: Mbed CLI",
@@ -1200,6 +1220,14 @@
                     }
                 ]
             },
+            {
+                "title": "Integrating with Arm Treasure Data",
+                "intro": {
+                    "type": "markdown",
+                    "url": "https://github.com/ARMmbed/mbed-os-5-docs/blob/development/docs/tutorials/treasure_data.md"
+                },
+                "sources": []
+            },
             {
                 "title": "Migrating to Mbed OS 5",
                 "intro": {
@@ -1417,11 +1445,14 @@
                         "type": "markdown",
                         "url": "https://github.com/ARMmbed/mbed-os-5-docs/blob/development/docs/porting/target/Watchdog.md"
                     },
-
                     {
                         "type": "markdown",
                         "url": "https://github.com/ARMmbed/mbed-os-5-docs/blob/development/docs/porting/target/itm.md"
                     },
+                    {
+                        "type": "markdown",
+                        "url": "https://github.com/ARMmbed/mbed-os-5-docs/blob/development/docs/porting/target/mpu.md"
+                    },
                     {
                         "type": "markdown",
                         "url": "https://github.com/ARMmbed/mbed-os-5-docs/blob/development/docs/porting/target/usb.md"
@@ -1540,6 +1571,15 @@
         "source": "https://github.com/ARMmbed/mbed-os",
         "branch": "feature-hal-spec-sai"
     },
+    {
+        "title": "feature-hal-spec-spi doxygen",
+        "description": "The full mbed OS API documentation in doxygen format",
+        "slug": "feature-hal-spec-spi-doxy",
+        "hidden": true,
+        "type": "doxygen",
+        "source": "https://github.com/ARMmbed/mbed-os",
+        "branch": "feature-hal-spec-spi"
+    }, 
     {
         "title": "feature-hal-spec-watchdog doxygen",
         "description": "The full mbed OS API documentation in doxygen format",

docs/api/bluetooth/SecurityManager.md

@@ -38,7 +38,7 @@ The SecurityManager communicates with your application through events. These tri
 
 The most important process is pairing. You may trigger this manually by calling `requestPairing()`. Pairing may also result from the application requiring encryption by calling `setLinkEncryption()` or the application requiring MITM protection through `requestAuthentication()`.
 
-You can call all of these implicitly by using `setLinkSecurity()` to set the required security for the link. The SecurityManager triggers the process required to achieve the set security level. You can only escalate the security level. Asking the SecurityManager for a lower security level than the existing one does not fail but results in a event informing the application through `linkEncryptionResult()` of the current level, (which remains unchanged).
+You can call all of these implicitly by using `setLinkSecurity()` to set the required security for the link. The SecurityManager triggers the process required to achieve the set security level. You can only escalate the security level; asking the SecurityManager for a lower security level than the existing one does not fail, but results in an event informing the application through `linkEncryptionResult()` of the current level (which remains unchanged).
 
 The chosen pairing algorithms depend on the IO capabilities and OOB use settings. They produce appropriate events, which your EventHandler must handle. If your event handler doesn't support all the calls, you must not set IO capabilities or set OOB use in such a way that would trigger them, or else the pairing fails (usually by timing out).
 

docs/api/drivers/Timer.md

@@ -1,6 +1,6 @@
 ## Timer
 
-<span class="images">![](https://os.mbed.com/docs/development/mbed-os-api-doxy/classmbed_1_1_timer.png)<span>Timer class hierarchy</span></span>
+<span class="images">![](https://s3-us-west-2.amazonaws.com/mbed-os-docs-images/classmbed_1_1_timer.png)<span>Timer class hierarchy</span></span>
 
 Use the Timer interface to create, start, stop and read a timer for measuring precise times (better than millisecond precision).
 

docs/api/lorawan/lorawan.md

@@ -1,8 +1,9 @@
 <h2 id="lorawan-api">LoRaWAN network interface</h2>
 
-<span class="images">![](https://os.mbed.com/docs/development/mbed-os-api-doxy/class_lo_ra_w_a_n_interface.png)<span>LoRaWANInterface class hierarchy</span></span>
+<span class="images">![](https://os.mbed.com/docs/development/mbed-os-api-doxy/class_lo_ra_w_a_n_interface.png)<span> 
+LoRaWANInterface class hierarchy</span></span>
 
-The [LoRaWANInterface](https://os.mbed.com/docs/development/mbed-os-api-doxy/class_lo_ra_w_a_n_interface.html) provides a C++ API for connecting to the internet over a LoRa network. This subsection explains the `LoRaWAnInterface` API reference and then presents an example that you can directly import to the Arm Mbed Online Compiler.
+The [LoRaWANInterface](https://os.mbed.com/docs/development/mbed-os-api-doxy/class_lo_ra_w_a_n_interface.html) provides a C++ API for connecting to the internet over a LoRa network. This subsection explains the `LoRaWANInterface` API reference and then presents an example that you can directly import to the Arm Mbed Online Compiler.
 
 To configure this class, please see the [LoRa configuration documentation](../reference/lorawan-configuration.html).
 

docs/api/networkinterfaces/MeshInterface.md

@@ -43,7 +43,7 @@ See the example application [mbed-os-example-mesh-minimal](https://github.com/AR
 
 The application below demonstrates a simple light control application, where devices can control the LED status of all devices in the network. You can build the application for the unsecure 6LoWPAN-ND or Thread network.
 
-[![View code](https://www.mbed.com/embed/?url=https://github.com/ARMmbed/mbed-os-example-mesh-minimal)](https://github.com/ARMmbed/mbed-os-example-mesh-minimal/blob/mbed-os-5.10.0/main.cpp)
+[![View code](https://www.mbed.com/embed/?url=https://github.com/ARMmbed/mbed-os-example-mesh-minimal)](https://github.com/ARMmbed/mbed-os-example-mesh-minimal/blob/mbed-os-5.10.0/mesh_led_control_example.cpp)
 
 ### Related content
 

docs/api/networkinterfaces/WifiInterface.md

@@ -1,10 +1,12 @@
 ## Wi-Fi
 
+<span class="images">![](http://os.mbed.com/docs/development/mbed-os-api-doxy/class_wi_fi_interface.png)<span>WiFiInterface class hierarchy</span></span>
+
 The WifiInterface provides a simple C++ API for connecting to the internet over a Wi-Fi device.
 
 ### Wi-Fi class reference
 
-[![View code](https://www.mbed.com/embed/?type=library)](https://os.mbed.com/docs/development/mbed-os-api-doxy/_wi_fi_interface_8h_source.html)
+[![View code](https://www.mbed.com/embed/?type=library)](http://os.mbed.com/docs/development/mbed-os-api-doxy/class_wi_fi_interface.html)
 
 ### Usage
 
@@ -54,11 +56,11 @@ Please note that settings should match the security mode from the access point.
 
 ### Wi-Fi example
 
-Here is an example of an HTTP client program. The program brings up an ESP8266 as the underlying network interface, and uses it to perform an HTTP transaction over a TCPSocket. There are multiple [Wi-Fi components](https://os.mbed.com/components/cat/wifi/) that implement the WiFiInterface class. The example below uses the [ESP8266Interface](https://github.com/armmbed/esp8266-driver) and [OdinWiFiInterface](https://github.com/u-blox/ublox-odin-w2-drivers-docs-mbed-5).
+This program scans for Wi-Fi access points in the area. There are multiple [Wi-Fi components](https://os.mbed.com/components/cat/wifi/) that implement the WiFiInterface class. The example below uses the [ESP8266Interface](https://github.com/armmbed/esp8266-driver) and [OdinWiFiInterface](https://github.com/u-blox/ublox-odin-w2-drivers-docs-mbed-5).
 
 The ESP8266Interface uses AT commands over serial interface to connect to an external Wi-Fi device. The OdinWiFiInterface provides an Ethernet-like driver to the Mbed OS network stack. The network stack uses the driver to connect to Wi-Fi:
 
-[![View code](https://www.mbed.com/embed/?url=https://github.com/ARMmbed/mbed-os-example-wifi)](https://github.com/ARMmbed/mbed-os-example-wifi/blob/mbed-os-5.10.0/main.cpp)
+[![View code](https://www.mbed.com/embed/?url=https://github.com/ARMmbed/mbed-os-example-wifi)](https://github.com/ARMmbed/mbed-os-example-wifi/blob/master/main.cpp)
 
 ### Related content
 

docs/api/networksocket/DNS.md

@@ -38,7 +38,7 @@ Callback is called from thread context. If the callback takes more than 10ms to
 
 ### DNS resolver class reference
 
-[![View code](https://www.mbed.com/embed/?type=library)](https://os.mbed.com/docs/development/mbed-os-api-doxy/_d_n_s_8h_source.html)
+[![View code](https://www.mbed.com/embed/?type=library)](https://os.mbed.com/docs/development/mbed-os-api-doxy/class_d_n_s.html)
 
 ### DNS resolver example
 

docs/api/networksocket/DTLSSocket.md

@@ -10,7 +10,13 @@ To use secure DTLS connections, application use the `DTLSSocketWrapper` through
 
 [![View code](https://www.mbed.com/embed/?type=library)](https://os.mbed.com/docs/development/mbed-os-api-doxy/class_d_t_l_s_socket.html)
 
+### DTLSSocket example
+
+Please see the TLSSocket example:
+
+[![View code](https://www.mbed.com/embed/?url=https://github.com/ARMmbed/mbed-os-example-tls-socket/blob/master/)](https://github.com/ARMmbed/mbed-os-example-tls-socket/blob/master/main.cpp)
+
 ### Related content
 
-- [Secure Socket](../reference/secure-socket.html)
-- [TLSSocket](tlssocket.html)
+- [Secure Socket](../reference/secure-socket.html).
+- [TLSSocket](tlssocket.html).

docs/api/networksocket/SocketAddress.md

@@ -4,7 +4,7 @@ Use the SocketAddress class to represent the IP address and port pair of a uniqu
 
 ### SocketAddress class reference
 
-[![View code](https://www.mbed.com/embed/?type=library)](https://os.mbed.com/docs/development/mbed-os-api-doxy/_socket_address_8h_source.html)
+[![View code](https://www.mbed.com/embed/?type=library)](https://os.mbed.com/docs/development/mbed-os-api-doxy/class_socket_address.html)
 
 ### SocketAddress example
 

docs/api/platform/Error.md

@@ -104,13 +104,17 @@ Mbed OS provides the necessary functions and macros for implementations to const
 
 If you know the module reporting the error you can use the **MBED_MAKE_ERROR()** macro to construct an error status with the module information. For example, if you want to report an unsupported configuration error from the serial driver, you may construct the error status as follows to capture the module information along with a specific error code. The below example constructs an error status value with the error code set to `MBED_ERROR_CODE_CONFIG_UNSUPPORTED` from the serial driver, indicated by module information set to `MBED_MODULE_DRIVER_SERIAL`.
 
-```mbed_error_status_t error = MBED_MAKE_ERROR(MBED_MODULE_DRIVER_SERIAL, MBED_ERROR_CODE_CONFIG_UNSUPPORTED)```
+```
+mbed_error_status_t error = MBED_MAKE_ERROR(MBED_MODULE_DRIVER_SERIAL, MBED_ERROR_CODE_CONFIG_UNSUPPORTED)
+```
 
 There may be scenarios in which the module might have called an API exported from other modules, such as protocol stacks, but has received an error status in return. In those cases, the calling module doesn't know which of the lower layers raised the error, but you may still want to report the error. In those cases, the module can use the predefined error status, such as `MBED_ERROR_CONFIG_UNSUPPORTED`, with the module value already set to `MBED_MODULE_UNKNOWN`.
 
 This is equivalent to defining an error status with `MODULE_UNKNOWN`. However, using predefined values, such as `MBED_ERROR_CONFIG_UNSUPPORTED`, makes it more convenient and easier to read the implementation.
 
-```mbed_error_status_t error = MBED_MAKE_ERROR(MBED_MODULE_UNKNOWN, MBED_ERROR_CODE_CONFIG_UNSUPPORTED)```
+```
+mbed_error_status_t error = MBED_MAKE_ERROR(MBED_MODULE_UNKNOWN, MBED_ERROR_CODE_CONFIG_UNSUPPORTED)
+```
 
 ### Error history
 
@@ -134,7 +138,9 @@ Some applications may want to do custom error handling when an error is reported
 
 Whenever a fatal error happens in the system, the Mbed OS error handling system collects key information such as error code, error location, register context (in the case of fault exceptions) and so on. The error handing system stores that information in a reserved RAM region called Crash-data-RAM. The error information stored in Crash-data-RAM is in binary format and follows the `mbed_error_ctx` structure defined in `mbed_error.h`. The system then triggers a warm-reset without losing the RAM contents that store the error information. After the system reboots, during Mbed OS initialization, the Crash-data-RAM region is checked to find if there is valid error information captured. This is done by using a CRC value calculated over the stored error information and is appended as part of information stored in Crash-data-RAM. If the system detects that the reboot was triggered by a fatal error, it will invoke a callback function with a pointer to the error context structure stored in Crash-data-RAM. The default callback function is defined with the `WEAK` attribute, which the application can override. Below is the signature for the callback:
 
-```void mbed_error_reboot_callback(mbed_error_ctx *error_context);```
+```
+void mbed_error_reboot_callback(mbed_error_ctx *error_context);
+```
 
 <span class="notes">**Note:** This callback is invoked before the system starts executing the application `main()`. The implementation of callback should be aware any resource limitations or availability. Also, the callback is invoked only when there is a new error.</span>
 
@@ -157,7 +163,7 @@ See `mbed_lib.json` in the platform directory to see which targets are currently
 
 It's important that this region is marked with the appropriate attributes (based on the toolchain) to mark it as an uninitialized region. For example, you can mark the ARM Compiler Crash-data-RAM with the attribute *EMPTY*. The only requirement about the placement of this region is that no other entity can overwrite this region during reboot or at runtime. However, to avoid fragmentation, it's best if you place this region just after the vector table region, or if there is no vector table region, iat the bottom of RAM (lowest address).
 
-See [memory model](memory.html) for more info on the placement of this region.
+See [memory model](../reference/memory.html) for more info on the placement of this region.
 
 #### Configuring crash reporting and autoreboot
 

docs/api/platform/platform.md

@@ -27,7 +27,7 @@ Mbed OS includes a few convenience classes that are tailored for embedded system
 
 - [Callback](callback.html): An API that executes the user’s code in its own context. Many other Mbed OS APIs build on the Callback API by taking a callback to execute.
 - [Time](time.html): A group of functions in the standard library of the C programming language implementing date and time manipulation operations.
-- [Error](error-handling.html): A functions that generates a fatal runtime error.
+- [Error](../apis/error-handling.html): A functions that generates a fatal runtime error.
 - [NonCopyable](noncopyable.html): An API that tags a class as not supporting copy operations. It creates a compile-time error if you copy the object.
 - [Span](span.html): A nonowning view to a sequence of contiguous elements. It can replace the traditional pair of pointer and size arguments passed as array definitions in function calls.
 

docs/api/rtos/rtos.md

@@ -58,4 +58,4 @@ Each `Thread` can wait for signals and be notified of events:
 
 ##### Status and error codes
 
-The Mbed OS error handling system assigns specific error codes for RTOS-related errors. See [the error handling documentation](error-handling.html) for more information on RTOS errors reported.
+The Mbed OS error handling system assigns specific error codes for RTOS-related errors. See [the error handling documentation](../apis/error-handling.html) for more information on RTOS errors reported.