diff --git a/ChangeLog b/ChangeLog
index 991873f17b..bd1e20ba37 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7917,7 +7917,7 @@
 	  command line NxPlayer (2014-7-31).
 	* audio/audio.c: More debug output (2014-7-31).
 	* configs/sama5d3x-ek/README.txt: REAME update (2014-7-31).
-	* drivers/audio/wm8904.c: Was not saving i2s interface instance
+	* drivers/audio/wm8904.c:  Was not saving I2S interface instance
 	  (2014-7-31).
 	* sched/sem_wait.c: Use set_errno() and get_errno().  Direct access
 	  inside the OS may not be supported in the future (2014-7-31).
@@ -15307,7 +15307,7 @@
 	  change the link state.  From Sebastien Lorquet (2017-05-19).
 	* drivers/wireless/ieee80211: Add support for AP scanning.  From Simon
 	  Piriou (2017-05-21).
-	* drivers/audio:  Add cs43l22 audio driver  STM32F4: Add i2s driver.
+	* drivers/audio:  Add cs43l22 audio driver  STM32F4: Add I2S driver.
 	  From Taras Drozdovsky (2017-05-21).
 	* This is based on a patch by Taras Drozdovsky.  Basically, the delay
 	  that was added during the integration of the CDC/ACM host driver was
diff --git a/Documentation/acronyms.txt b/Documentation/acronyms.txt
index bb6b153990..aab1760a2b 100644
--- a/Documentation/acronyms.txt
+++ b/Documentation/acronyms.txt
@@ -5,6 +5,7 @@ AIC    Advanced Interrupt Controller (Atmel SAM)
 ARP    Address Resolution Protocol (networking)
 BCH    Block to Character
 BINFMT Binary Format (Dynamic Loader)
+BPP    Bits Per Pixel
 CAN    Controller Area Network
 CDC    Communication Device Class (USB)
 CP15   Coprocessor 15 (ARM)
@@ -19,10 +20,15 @@ DHCPC  DHCP Client
 DHCPD  DHCP Daemon (server)
 DMA    Direct Memory Access (hardware)
 DMAC   DMA Controller (hardware)
+DNS    Domain Name Service (or System or Server) (networking)
 DRAM   Dynamic RAM
 EABI   Embedded-Application Binary Interface
+EEPROM Electrically Erasable Programmable Read-Only Memory
 EMAC   Ethernet Media Access Controller (networking)
+EPROM  Erasable Programmable Read-Only Memory
 FAT    File Allocation Table (file systems)
+FB     Frame Buffer (video interface)
+FSMC   Flexible Static Memory Controller (STM32)
 FTL    FLASH Translation Layer (MTD)
 GPIO   General Purpose Input/Output
 GMAC   Gigabit Media Access Controller (networking)
@@ -30,16 +36,21 @@ HCD    Host Controller Driver (USB)
 HSMCI  High Speed Memory Card Interface (Atmel)
 I/O    Input/Output
 IOCTL  Input/Output Control
-IoT    Internet of Things
+IoT    Internet of Things (marketing BS)
 IP     Internet Protocol (version 4?) (networking)
+IPv4   Internet Protocol Version 4 (networking)
 IPv6   Internet Protocol Version 6 (networking)
-IRQ    Interrupt Request
-I2C    Inter-Integrated Circuit
-I2S    Inter IC Sound
+IRQ    Interrupt Request (hardware)
+I2C    Inter-Integrated Circuit (serial interface)
+I2S    Inter IC Sound (serial interface)
 ICMP   Internet Control Message Protocol (networking)
+ICMPv6 Internet Control Message Protocol for IPv6 (networking)
+IGMP   Internet Group Multicast Protocol (networking)
 IOB    I/O Buffer (networking)
 LAN    Local Area Network (networking)
+LCD    Liquid Crystal Display
 LIBC   The "C" Library
+LIBM   The "C" Math Library
 MAC    Media Access Control (networking, OSI model)
 MCI    Memory Card Interface
 MCU    Microcontroller Unit
@@ -54,39 +65,48 @@ NFS    Network File System
 NETDB  Network Data Base (networking)
 NETDEV Network Device (networking)
 NSH    NuttShell
+NVM    Non-Volatile Memory
+NTP    Network Time Protocol (networking)
 NX     NuttX, the NuttX Graphics server (graphics)
 NXFFS  NuttX Flash File System
 NXWM   The NuttX Window Manager (graphics)
-PID    Peripheral ID (Atmel SAM)
+PID    Process ID (operating systems)
+       Peripheral ID (Atmel SAM)
+PROM   Programmable Read-Only Memory
 OS     Operating System
 OTG    On-The-Go (USB)
+OTP    One-Time Programmable
 PWM    Pulse Width Modulation
 PKT    "Raw" Packet socket (networking)
 PRNG   Pseudo-Random Number Generator
 RAM    Random Access Memory
 RNG    Random Number Generator
+ROM    Read-Only Memory
 RTC    Real Time Clock
 RTCC   Real Time Clock/Calendar
 RTOS   Real Time Operating System
 SAIC   Secure Advanced Interrupt Controller (Atmel SAM)
-SD     Secure Digital
+SD     Secure Digital (flash memory)
 SDHC   Secure Digital High Capacity (flash memory),
-       Secure Digital Host Controller
+       Secure Digital Host Controller (hardware)
 SDIO   Secure Digital I/O
+SDRAM  Synchronous Dynamic Random Access Memory
+SLCD   Segment Liquid Crystal Display
 SMC    Static Memory Controller (hardware)
 SPI    Serial Periperhal Interface
 SPRNG  Scalable Parallel Random Number Generator
+SRAM   Static RAM
 SYSLOG System Log
 TCP    Transmission Control Protocol (networking)
 TSC    Touchscreen Controller
 TUN    network TUNnel
-TWI    Two-Wire Interface
+TWI    Two-Wire Interface (serial interface)
 UDP    User Datagram Protocol (networking)
 UART   Universal Asynchronous Receiver/Transmitter
-USB    Universal Serial Bus
+USB    Universal Serial Bus (serial interface)
 USART  Universal Synchronous/Asynchronous Receiver/Transmitter
 WAN    Wide Area Network (networking)
 WLAN   Wireless Local Area Network (networking)
 WPAN   Wireless Personal Area Network (networking)
-WDT    Watchdog Timer
+WDT    Watchdog Timer (hardware)
 XDMAC  Extended DMA Controller (Atmel)
diff --git a/ReleaseNotes b/ReleaseNotes
index ee3b1e2418..92be9fef5f 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -13839,7 +13839,7 @@ Additional new features and extended functionality:
         Juha Niskanen.
       - STM32 Ethernet:  Add support for KSZ8081 PHY interrupts.  From
         Sebastien Lorquet.
-      - STM32 F4:  Add i2s driver.  From Taras Drozdovsky.
+      - STM32 F4:  Add I2S driver.  From Taras Drozdovsky.
       - STM32 L4:  Add IWDG peripheral.  This is the same as for STM32
         except that prescale and reload can be changed after watchdog has
         been started, as this seems to work on L4.  From Juha Niskanen.