diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-03 17:22:38 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-03 17:22:38 -0600 |
| commit | e3744bf55eca655566a8f9304e25a3591acd13a5 (patch) | |
| tree | 859f74925711262342cedff19fd8f118da0aa55d /nuttx/Documentation | |
| parent | 8c68010a7bf2d234e985d90cd0f68b63983763e5 (diff) | |
| parent | 66439e77dcf8da9a8482f643632f1be8ed02d94b (diff) | |
| download | nuttx-e3744bf55eca655566a8f9304e25a3591acd13a5.tar.gz nuttx-e3744bf55eca655566a8f9304e25a3591acd13a5.tar.bz2 nuttx-e3744bf55eca655566a8f9304e25a3591acd13a5.zip | |
Merge remote-tracking branch 'origin/master' into bas24
Diffstat (limited to 'nuttx/Documentation')
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 39777f9ab..ca4ebcdac 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -1391,7 +1391,7 @@ <li><a href="#m16c">Renesas M16C/26</a></li> </ul> </li> - <li>Silicon Laboratories + <li>Silicon Laboratories, Inc. <ul> <li><a href="#efm32g">EFM32 Gecko</a> <small>(ARM Cortex-M3)</small></li> <li><a href="#emf32gg">EFM32 Giant Gecko</a> <small>(ARM Cortex-M3)</small></li> @@ -2283,7 +2283,7 @@ nsh> <td> <p> <a name="efm32g"><b>SiLabs EFM32 Gecko</b>.</a> - This is a port for the Silicon Laboraties EFM32 <i>Gecko</i> family. + This is a port for the Silicon Laboratories' EFM32 <i>Gecko</i> family. Board support is available for the following: </p> <ol> @@ -2352,7 +2352,7 @@ nsh> <td> <p> <a name="efm32gg"><b>SiLabs EFM32 Giant Gecko</b>.</a> - This is a port for the Silicon Laboraties EFM32 <i>Giant Gecko</i> family. + This is a port for the Silicon Laboratories' EFM32 <i>Giant Gecko</i> family. </p> <ul> <p> @@ -4672,11 +4672,12 @@ if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi </table> <ul> - <li>ARM, ARM7 ARM7TDMI, ARM9, ARM920T, ARM926EJS Cortex-M3 are trademarks of Advanced RISC Machines, Limited.</li> + <li>ARM, ARM7 ARM7TDMI, ARM9, ARM920T, ARM926EJS, Cortex-M3 are trademarks of Advanced RISC Machines, Limited.</li> <li>Cygwin is a trademark of Red Hat, Incorporated.</li> <li>Linux is a registered trademark of Linus Torvalds.</li> <li>Eagle-100 is a trademark of <a href=" http://www.micromint.com/">Micromint USA, LLC</a>. <li>EnergyLite is a trademark of STMicroelectronics.</li> + <li>EFM32 is a trademark of Silicon Laboratories, Inc.</li> <li>LPC2148 is a trademark of NXP Semiconductors.</li> <li>TI is a tradename of Texas Instruments Incorporated.</li> <li>UNIX is a registered trademark of The Open Group.</li> |