diff --git a/ReleaseNotes b/ReleaseNotes
index 59d4810e3a..4fc04f39a2 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -13146,7 +13146,7 @@ Additional new features and extended functionality:
       - Fonts: Add support for Tom Thumb small mono-space font. From Alan
         Carvalho de Assis.
       - Graphics:  Separated of font cache from graphics/nxterm.  Now in
-        libnx/nxfronts where it can be shared with other grapics
+        libnx/nxfronts where it can be shared with other graphics
         applications.
 
     * Networking/Network Drivers:
diff --git a/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/up_head.S
index 636bcea2e9..7e354f50b5 100644
--- a/arch/arm/src/arm/up_head.S
+++ b/arch/arm/src/arm/up_head.S
@@ -635,7 +635,7 @@ __start:
 	/* Text-section constants:
 	 *
 	 *   _sbss is the start of the BSS region (see ld.script)
-	 *   _ebss is the end of the BSS regsion (see ld.script)
+	 *   _ebss is the end of the BSS region (see ld.script)
 	 *
 	 * The idle task stack starts at the end of BSS and is of size
 	 * CONFIG_IDLETHREAD_STACKSIZE.  The heap continues from there until the
diff --git a/arch/arm/src/arm/up_nommuhead.S b/arch/arm/src/arm/up_nommuhead.S
index b5f7ea65ad..d56e0e16f0 100644
--- a/arch/arm/src/arm/up_nommuhead.S
+++ b/arch/arm/src/arm/up_nommuhead.S
@@ -151,7 +151,7 @@ __start:
 
 	/* Variables:
 	 * _sbss is the start of the BSS region (see ld.script)
-	 * _ebss is the end of the BSS regsion (see ld.script)
+	 * _ebss is the end of the BSS region (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
 	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_idle_topstack
diff --git a/arch/arm/src/armv7-r/arm_head.S b/arch/arm/src/armv7-r/arm_head.S
index 090086ae31..14cda9bac4 100644
--- a/arch/arm/src/armv7-r/arm_head.S
+++ b/arch/arm/src/armv7-r/arm_head.S
@@ -483,7 +483,7 @@ arm_data_initialize:
 	/* .text Data:
 	 *
 	 *   _sbss is the start of the BSS region (see linker script)
-	 *   _ebss is the end of the BSS regsion (see linker script)
+	 *   _ebss is the end of the BSS region (see linker script)
 	 *
 	 * Typical Configuration:
 	 *   The idle task stack starts at the end of BSS and is of size
diff --git a/arch/arm/src/cxd56xx/cxd56_allocateheap.c b/arch/arm/src/cxd56xx/cxd56_allocateheap.c
index 606e2139bc..e68f371a0a 100644
--- a/arch/arm/src/cxd56xx/cxd56_allocateheap.c
+++ b/arch/arm/src/cxd56xx/cxd56_allocateheap.c
@@ -60,7 +60,7 @@
  ****************************************************************************/
 
 /* _sbss is the start of the BSS region (see the linker script) _ebss is the
- * end of the BSS regsion (see the linker script). The idle task stack starts
+ * end of the BSS region (see the linker script). The idle task stack starts
  * at the end of BSS and is of size CONFIG_IDLETHREAD_STACKSIZE.  The IDLE
  * thread is the thread that the system boots on and, eventually, becomes the
  * idle, do nothing task that runs only when there is nothing else to run.
diff --git a/arch/arm/src/cxd56xx/cxd56_pmic.c b/arch/arm/src/cxd56xx/cxd56_pmic.c
index ae6e57430a..a48dc58caf 100644
--- a/arch/arm/src/cxd56xx/cxd56_pmic.c
+++ b/arch/arm/src/cxd56xx/cxd56_pmic.c
@@ -1111,7 +1111,7 @@ int cxd56_pmic_getrechargevol(FAR int *mv)
       return ret;
     }
 
-  /* Convert regsiter value to voltage */
+  /* Convert register value to voltage */
 
   switch (val)
     {
diff --git a/arch/arm/src/cxd56xx/cxd56_usbdev.c b/arch/arm/src/cxd56xx/cxd56_usbdev.c
index 06b9eaec6c..3833758e77 100644
--- a/arch/arm/src/cxd56xx/cxd56_usbdev.c
+++ b/arch/arm/src/cxd56xx/cxd56_usbdev.c
@@ -77,7 +77,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* TOPREG VBUS regsiter */
+/* TOPREG VBUS register */
 
 #define CLR_EDGE (1 << 9)
 #define CLR_EN   (1 << 8)
diff --git a/arch/arm/src/imxrt/imxrt_ehci.c b/arch/arm/src/imxrt/imxrt_ehci.c
index a01444da8f..04015108de 100644
--- a/arch/arm/src/imxrt/imxrt_ehci.c
+++ b/arch/arm/src/imxrt/imxrt_ehci.c
@@ -5202,7 +5202,7 @@ FAR struct usbhost_connection_s *imxrt_ehci_initialize(int controller)
 
   imxrt_putreg(regval, &HCOR->usbcmd);
 
-  /* Start the host controller by setting the RUN bit in the USBCMD regsiter. */
+  /* Start the host controller by setting the RUN bit in the USBCMD register. */
 
   regval = imxrt_getreg(&HCOR->usbcmd);
   regval |= EHCI_USBCMD_RUN;
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index 3693dd8e8d..85bfca16ae 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -338,7 +338,7 @@ void up_irqinitialize(void)
    *
    *  0 -> 32 interrupt lines, 1 enable register,   8 priority registers
    *  1 -> 64 "       " "   ", 2 enable registers, 16 priority registers
-   *  2 -> 96 "       " "   ", 3 enable regsiters, 24 priority registers
+   *  2 -> 96 "       " "   ", 3 enable registers, 24 priority registers
    *  ...
    */
 
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_lcd.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_lcd.h
index 99cb808343..5dba18b259 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_lcd.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_lcd.h
@@ -79,7 +79,7 @@
 #define LPC17_40_LCD_CRSR_PAL1_OFFSET       (0x0c0c) /* Cursor Palette register 1 */
 #define LPC17_40_LCD_CRSR_XY_OFFSET         (0x0c10) /* Cursor XY Position register */
 #define LPC17_40_LCD_CRSR_CLIP_OFFSET       (0x0c14) /* Cursor Clip Position register */
-#define LPC17_40_LCD_CRSR_INTMSK_OFFSET     (0x0c20) /* Cursor Interrupt Mask regsiter */
+#define LPC17_40_LCD_CRSR_INTMSK_OFFSET     (0x0c20) /* Cursor Interrupt Mask register */
 #define LPC17_40_LCD_CRSR_INTCLR_OFFSET     (0x0c24) /* Cursor Interrupt Clear register */
 #define LPC17_40_LCD_CRSR_INTRAW_OFFSET     (0x0c28) /* Cursor Raw Interrupt Status register */
 #define LPC17_40_LCD_CRSR_INTSTAT_OFFSET    (0x0c2c) /* Cursor Masked Interrupt Status register */
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
index 474826de78..3dc9da38e7 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
@@ -307,7 +307,7 @@ void up_irqinitialize(void)
    *
    *  0 -> 32 interrupt lines, 1 enable register,   8 priority registers
    *  1 -> 64 "       " "   ", 2 enable registers, 16 priority registers
-   *  2 -> 96 "       " "   ", 3 enable regsiters, 24 priority registers
+   *  2 -> 96 "       " "   ", 3 enable registers, 24 priority registers
    *  ...
    */
 
diff --git a/arch/arm/src/lpc214x/lpc214x_head.S b/arch/arm/src/lpc214x/lpc214x_head.S
index 6ac253b206..127e5f164a 100644
--- a/arch/arm/src/lpc214x/lpc214x_head.S
+++ b/arch/arm/src/lpc214x/lpc214x_head.S
@@ -601,7 +601,7 @@ __start:
 
 	/* Variables:
 	 * _sbss is the start of the BSS region (see ld.script)
-	 * _ebss is the end of the BSS regsion (see ld.script)
+	 * _ebss is the end of the BSS region (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
 	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_idle_topstack
diff --git a/arch/arm/src/lpc2378/lpc23xx_head.S b/arch/arm/src/lpc2378/lpc23xx_head.S
index d4648acce5..071ed2047f 100644
--- a/arch/arm/src/lpc2378/lpc23xx_head.S
+++ b/arch/arm/src/lpc2378/lpc23xx_head.S
@@ -202,7 +202,7 @@ __start:
 
 	/* Variables:
 	 * _sbss is the start of the BSS region (see ld.script)
-	 * _ebss is the end of the BSS regsion (see ld.script)
+	 * _ebss is the end of the BSS region (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
 	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_idle_topstack
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 1c351b3e1a..cc70adb254 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -5243,7 +5243,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller)
 
   lpc31_putreg(regval, &HCOR->usbcmd);
 
-  /* Start the host controller by setting the RUN bit in the USBCMD regsiter. */
+  /* Start the host controller by setting the RUN bit in the USBCMD register. */
 
   regval  = lpc31_getreg(&HCOR->usbcmd);
   regval |= EHCI_USBCMD_RUN;
diff --git a/arch/arm/src/lpc31xx/lpc31_esrndx.c b/arch/arm/src/lpc31xx/lpc31_esrndx.c
index 55ffd0d4db..7b87ae8d4f 100644
--- a/arch/arm/src/lpc31xx/lpc31_esrndx.c
+++ b/arch/arm/src/lpc31xx/lpc31_esrndx.c
@@ -47,18 +47,6 @@
 #include "up_arch.h"
 #include "lpc31_cgudrvr.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -71,8 +59,7 @@
  *   register (or ESRNDX_INVALID if there is no ESR associated with
  *   this clock ID).  Indexing of ESRs differs slightly from the clock
  *   ID:  There are 92 clock IDs but only 89 ESR regisers. There are no
- *  ESR registers for :
- *
+ *   ESR registers for:
  *
  *  CLKID_I2SRXBCK0         Clock ID 87: I2SRX_BCK0
  *  CLKID_I2SRXBCK1,        Clock ID 88: I2SRX_BCK1
@@ -87,11 +74,10 @@ int lpc31_esrndx(enum lpc31_clockid_e clkid)
 {
   int esrndx = (int)clkid;
 
-  /* There ar 89 Enable Select Registers (ESR).  Indexing for these
+  /* There are 89 Enable Select Registers (ESR).  Indexing for these
    * registers is identical to indexing to other registers (like PCR),
    * except that there are no ESR registers for
    *
-   *
    *  CLKID_I2SRXBCK0         Clock ID 87: I2SRX_BCK0
    *  CLKID_I2SRXBCK1,        Clock ID 88: I2SRX_BCK1
    *
diff --git a/arch/arm/src/lpc31xx/lpc31_ioconfig.h b/arch/arm/src/lpc31xx/lpc31_ioconfig.h
index 2cf5e0c90a..f2154a8794 100644
--- a/arch/arm/src/lpc31xx/lpc31_ioconfig.h
+++ b/arch/arm/src/lpc31xx/lpc31_ioconfig.h
@@ -68,7 +68,7 @@
 #define LPC31_IOCONFIG_PWM_OFFSET           0x2c0 /* PWM function block */
 #define LPC31_IOCONFIG_UART_OFFSET          0x300 /* UART function block */
 
-/* IOCONFIG register offsets (with respect to any funcion block base address) *******************/
+/* IOCONFIG register offsets (with respect to any function block base address) ******************/
 
 #define LPC31_IOCONFIG_PINS_OFFSET          0x000 /* WR:           RD: Input pin state */
                                                     /* 0x004-0x00c: Reserved */
diff --git a/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
index cb0165246d..c8a76af931 100644
--- a/arch/arm/src/lpc43xx/lpc43_allocateheap.c
+++ b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
@@ -325,7 +325,7 @@
  ****************************************************************************/
 
 /* _sbss is the start of the BSS region (see the linker script) _ebss is the
- * end of the BSS regsion (see the linker script). The idle task stack starts
+ * end of the BSS region (see the linker script). The idle task stack starts
  * at the end of BSS and is of size CONFIG_IDLETHREAD_STACKSIZE.  The IDLE
  * thread is the thread that the system boots on and, eventually, becomes the
  * idle, do nothing task that runs only when there is nothing else to run.
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index 3c652e875e..6242759cf5 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -5057,7 +5057,7 @@ FAR struct usbhost_connection_s *lpc43_ehci_initialize(int controller)
 
   lpc43_putreg(regval, &HCOR->usbcmd);
 
-  /* Start the host controller by setting the RUN bit in the USBCMD regsiter. */
+  /* Start the host controller by setting the RUN bit in the USBCMD register. */
 
   regval  = lpc43_getreg(&HCOR->usbcmd);
   regval |= EHCI_USBCMD_RUN;
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index 8344e1a0c3..c00497c525 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -890,7 +890,7 @@ static inline int up_set_rs485_mode(struct up_dev_s *priv,
 #ifdef BOARD_LPC43_UART1_DTRDIR
       if (priv->dtrdir)
         {
-          /* If we ar using DTR for direction then ensure the H/W is
+          /* If we are using DTR for direction then ensure the H/W is
            * configured correctly.
            */
 
diff --git a/arch/arm/src/lpc54xx/hardware/lpc54_lcd.h b/arch/arm/src/lpc54xx/hardware/lpc54_lcd.h
index 952d198df4..a8566da291 100644
--- a/arch/arm/src/lpc54xx/hardware/lpc54_lcd.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_lcd.h
@@ -77,7 +77,7 @@
 #define LPC54_LCD_CRSR_PAL1_OFFSET      0x0c0c  /* Cursor Palette register 1 */
 #define LPC54_LCD_CRSR_XY_OFFSET        0x0c10  /* Cursor XY Position register */
 #define LPC54_LCD_CRSR_CLIP_OFFSET      0x0c14  /* Cursor Clip Position register */
-#define LPC54_LCD_CRSR_INTMSK_OFFSET    0x0c20  /* Cursor Interrupt Mask regsiter */
+#define LPC54_LCD_CRSR_INTMSK_OFFSET    0x0c20  /* Cursor Interrupt Mask register */
 #define LPC54_LCD_CRSR_INTCLR_OFFSET    0x0c24  /* Cursor Interrupt Clear register */
 #define LPC54_LCD_CRSR_INTRAW_OFFSET    0x0c28  /* Cursor Raw Interrupt Status register */
 #define LPC54_LCD_CRSR_INTSTAT_OFFSET   0x0c2c  /* Cursor Masked Interrupt Status register */
diff --git a/arch/arm/src/lpc54xx/lpc54_allocateheap.c b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
index d75660e8d1..069775483b 100644
--- a/arch/arm/src/lpc54xx/lpc54_allocateheap.c
+++ b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
@@ -132,7 +132,7 @@
  ****************************************************************************/
 
 /* _sbss is the start of the BSS region (see the linker script) _ebss is the
- * end of the BSS regsion (see the linker script). The idle task stack starts
+ * end of the BSS region (see the linker script). The idle task stack starts
  * at the end of BSS and is of size CONFIG_IDLETHREAD_STACKSIZE.  The IDLE
  * thread is the thread that the system boots on and, eventually, becomes the
  * idle, do nothing task that runs only when there is nothing else to run.
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 371a998977..bc277cf5a8 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -369,7 +369,7 @@ void up_irqinitialize(void)
    *
    *  0 -> 32 interrupt lines, 1 enable register,   8 priority registers
    *  1 -> 64 "       " "   ", 2 enable registers, 16 priority registers
-   *  2 -> 96 "       " "   ", 3 enable regsiters, 24 priority registers
+   *  2 -> 96 "       " "   ", 3 enable registers, 24 priority registers
    *  ...
    */
 
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index 8f933d1a20..121ae72d33 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -5063,7 +5063,7 @@ FAR struct usbhost_connection_s *sam_ehci_initialize(int controller)
 
   sam_putreg(regval, &HCOR->usbcmd);
 
-  /* Start the host controller by setting the RUN bit in the USBCMD regsiter. */
+  /* Start the host controller by setting the RUN bit in the USBCMD register. */
 
   regval  = sam_getreg(&HCOR->usbcmd);
   regval |= EHCI_USBCMD_RUN;
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index f6da1faa4d..c1eb4e6a06 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -568,7 +568,7 @@ static inline void spi_flush(struct sam_spidev_s *spi)
  *   Map the chip select number to the bit-set PCS field used in the SPI
  *   registers.  A chip select number is used for indexing and identifying
  *   chip selects.  However, the chip select information is represented by
- *   a bit set in the SPI regsisters.  This function maps those chip select
+ *   a bit set in the SPI registers.  This function maps those chip select
  *   numbers to the correct bit set:
  *
  *    CS  Returned   Spec    Effective
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index 0f44420ab8..fa96185d49 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -420,7 +420,7 @@ errout:
  *
  * Input Parameters:
  *   priv - The touchscreen private data structure
- *   tsav - The new (shifted) value of the TSAV field of the ADC TSMR regsiter.
+ *   tsav - The new (shifted) value of the TSAV field of the ADC TSMR register.
  *
  * Returned Value:
  *   None
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index afc0864b79..385a8639a9 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -365,7 +365,7 @@ void up_irqinitialize(void)
    *
    *  0 -> 32 interrupt lines, 1 enable register,   8 priority registers
    *  1 -> 64 "       " "   ", 2 enable registers, 16 priority registers
-   *  2 -> 96 "       " "   ", 3 enable regsiters, 24 priority registers
+   *  2 -> 96 "       " "   ", 3 enable registers, 24 priority registers
    *  ...
    */
 
diff --git a/arch/arm/src/stm32/stm32_hrtim.c b/arch/arm/src/stm32/stm32_hrtim.c
index c5081eb1fa..eea7a781fa 100644
--- a/arch/arm/src/stm32/stm32_hrtim.c
+++ b/arch/arm/src/stm32/stm32_hrtim.c
@@ -4831,7 +4831,7 @@ static void hrtim_mode_config(FAR struct stm32_hrtim_s *priv)
  *
  * Description:
  *   This function returns not significant bits in counter/capture
- *   regsiters for given HRTIM Timer index.
+ *   registers for given HRTIM Timer index.
  *
  * Input Parameters:
  *   priv   - A reference to the HRTIM structure
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index aea4de9aa0..1bcef4e92b 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -398,7 +398,7 @@ void up_irqinitialize(void)
    *
    *  0 -> 32 interrupt lines, 1 enable register,   8 priority registers
    *  1 -> 64 "       " "   ", 2 enable registers, 16 priority registers
-   *  2 -> 96 "       " "   ", 3 enable regsiters, 24 priority registers
+   *  2 -> 96 "       " "   ", 3 enable registers, 24 priority registers
    *  ...
    */
 
diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c
index b050e3c5d4..9e62f0899a 100644
--- a/arch/arm/src/stm32h7/stm32_irq.c
+++ b/arch/arm/src/stm32h7/stm32_irq.c
@@ -423,7 +423,7 @@ void up_irqinitialize(void)
    *
    *  0 -> 32 interrupt lines, 1 enable register,   8 priority registers
    *  1 -> 64 "       " "   ", 2 enable registers, 16 priority registers
-   *  2 -> 96 "       " "   ", 3 enable regsiters, 24 priority registers
+   *  2 -> 96 "       " "   ", 3 enable registers, 24 priority registers
    *  ...
    */
 
diff --git a/arch/arm/src/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S
index afe9466dca..45f8cf34ab 100644
--- a/arch/arm/src/str71x/str71x_head.S
+++ b/arch/arm/src/str71x/str71x_head.S
@@ -598,7 +598,7 @@ dtor_end:
 
 	/* Variables:
 	 * _sbss is the start of the BSS region (see ld.script)
-	 * _ebss is the end of the BSS regsion (see ld.script)
+	 * _ebss is the end of the BSS region (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
 	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_idle_topstack
diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c
index b643604f4a..7cbbe69933 100644
--- a/arch/arm/src/tiva/common/tiva_irq.c
+++ b/arch/arm/src/tiva/common/tiva_irq.c
@@ -399,7 +399,7 @@ void up_irqinitialize(void)
    *
    *  0 -> 32 interrupt lines, 1 enable register,   8 priority registers
    *  1 -> 64 "       " "   ", 2 enable registers, 16 priority registers
-   *  2 -> 96 "       " "   ", 3 enable regsiters, 24 priority registers
+   *  2 -> 96 "       " "   ", 3 enable registers, 24 priority registers
    *  ...
    */
 
diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c
index 2f16a75e04..c3580af038 100644
--- a/arch/arm/src/xmc4/xmc4_irq.c
+++ b/arch/arm/src/xmc4/xmc4_irq.c
@@ -337,7 +337,7 @@ void up_irqinitialize(void)
    *
    *  0 -> 32 interrupt lines, 1 enable register,   8 priority registers
    *  1 -> 64 "       " "   ", 2 enable registers, 16 priority registers
-   *  2 -> 96 "       " "   ", 3 enable regsiters, 24 priority registers
+   *  2 -> 96 "       " "   ", 3 enable registers, 24 priority registers
    *  ...
    */
 
diff --git a/arch/hc/src/m9s12/m9s12_start.S b/arch/hc/src/m9s12/m9s12_start.S
index 7f02996b6b..c6ccf65095 100644
--- a/arch/hc/src/m9s12/m9s12_start.S
+++ b/arch/hc/src/m9s12/m9s12_start.S
@@ -229,7 +229,7 @@ __start:
 
 	/* Variables:
 	 * _sbss is the start of the BSS region (see ld.script)
-	 * _ebss is the end of the BSS regsion (see ld.script)
+	 * _ebss is the end of the BSS region (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
 	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.	See g_idle_topstack
@@ -257,10 +257,10 @@ __start:
 	.section	.rodata, "a"
 
 /* Variables: _sbss is the start of the BSS region (see ld.script) _ebss is the end
- * of the BSS regsion (see ld.script). The idle task stack starts at the end of BSS
+ * of the BSS region (see ld.script). The idle task stack starts at the end of BSS
  * and is of size CONFIG_IDLETHREAD_STACKSIZE.	The IDLE thread is the thread that
  * the system boots on and, eventually, becomes the idle, do nothing task that runs
- * only when there is nothing else to run.	The heap continues from there until the
+ * only when there is nothing else to run.  The heap continues from there until the
  * end of memory.  See g_idle_topstack below.
  */
 
diff --git a/arch/mips/src/mips32/up_swint0.c b/arch/mips/src/mips32/up_swint0.c
index 35e65f63fe..a1e80240af 100644
--- a/arch/mips/src/mips32/up_swint0.c
+++ b/arch/mips/src/mips32/up_swint0.c
@@ -113,7 +113,7 @@ static void dispatch_syscall(void)
     Get the offset of the stub for this syscall
     Load the entry of the stub for this syscall
     Call the stub
-    Restore regsisters
+    Restore registers
     Return from the syscall
   );
 #  endif
diff --git a/arch/misoc/src/lm32/lm32_swint.c b/arch/misoc/src/lm32/lm32_swint.c
index a5970f5b72..28598b3d4e 100644
--- a/arch/misoc/src/lm32/lm32_swint.c
+++ b/arch/misoc/src/lm32/lm32_swint.c
@@ -112,7 +112,7 @@ static void dispatch_syscall(void)
 /*   Get the offset of the stub for this syscall */
 /*   Load the entry of the stub for this syscall */
 /*   Call the stub */
-/*   Restore regsisters */
+/*   Restore registers */
 /*   Return from the syscall */
 /* ); */
 }
diff --git a/arch/misoc/src/minerva/minerva_swint.c b/arch/misoc/src/minerva/minerva_swint.c
index f95fa54311..298bee487c 100644
--- a/arch/misoc/src/minerva/minerva_swint.c
+++ b/arch/misoc/src/minerva/minerva_swint.c
@@ -118,7 +118,7 @@ static void dispatch_syscall(void) naked_function;
 
 /* Call the stub */
 
-/* Restore regsisters */
+/* Restore registers */
 
 /* Return from the syscall */
 }
diff --git a/arch/risc-v/src/rv32im/up_swint.c b/arch/risc-v/src/rv32im/up_swint.c
index 6f6b559fda..fab0d4ba0e 100644
--- a/arch/risc-v/src/rv32im/up_swint.c
+++ b/arch/risc-v/src/rv32im/up_swint.c
@@ -110,7 +110,7 @@ static void dispatch_syscall(void)
 /*   Get the offset of the stub for this syscall */
 /*   Load the entry of the stub for this syscall */
 /*   Call the stub */
-/*   Restore regsisters */
+/*   Restore registers */
 /*   Return from the syscall */
 /* ); */
 }
diff --git a/arch/x86/src/qemu/qemu_head.S b/arch/x86/src/qemu/qemu_head.S
index 4e2d04f737..16894d5263 100644
--- a/arch/x86/src/qemu/qemu_head.S
+++ b/arch/x86/src/qemu/qemu_head.S
@@ -46,7 +46,7 @@
  ****************************************************************************/
 
 /* Memory Map: _sbss is the start of the BSS region (see ld.script) _ebss is
- * the end of the BSS regsion (see ld.script). The idle task stack starts at
+ * the end of the BSS region (see ld.script). The idle task stack starts at
  * the end of BSS and is of size CONFIG_IDLETHREAD_STACKSIZE.  The IDLE thread
  * is the thread that the system boots on and, eventually, becomes the idle,
  * do nothing task that runs only when there is nothing else to run.  The
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index e433c4f7c6..db90f6f474 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -691,7 +691,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
 
       spi_putreg8(priv, data, Z16F_ESPI_DATA);
 
-      /* Wait for the read data to be available in the data regsiter */
+      /* Wait for the read data to be available in the data register. */
 
       while ((spi_getreg8(priv, Z16F_ESPI_STAT) & Z16F_ESPI_STAT_RDRF) == 0);
 
diff --git a/arch/z16/src/z16f/z16f_restoreusercontext.S b/arch/z16/src/z16f/z16f_restoreusercontext.S
index a6a91c2915..a8ed1c6a9f 100644
--- a/arch/z16/src/z16f/z16f_restoreusercontext.S
+++ b/arch/z16/src/z16f/z16f_restoreusercontext.S
@@ -71,8 +71,8 @@
 
 _up_restoreusercontext:
 	/* Disable interrupts while we are accessing the TCB's register
-	 * save structure.  The correct interrupt state will be retored by
-	 * the iret instruction below
+	 * save structure.  The correct interrupt state will be restored
+	 * by the iret instruction below.
 	 */
 
 	di
diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c
index cef2254fc8..d5b71cd8cd 100644
--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_appinit.c
@@ -63,7 +63,7 @@
  *   arg - The boardctl() argument is passed to the board_app_initialize()
  *         implementation without modification.  The argument has no
  *         meaning to NuttX; the meaning of the argument is a contract
- *         between the board-specific initalization logic and the
+ *         between the board-specific initialization logic and the
  *         matching application logic.  The value cold be such things as a
  *         mode enumeration value, a set of DIP switch switch settings, a
  *         pointer to configuration data read from a file or serial FLASH,
diff --git a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
index 9f4388d16a..07474a4d6d 100644
--- a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
+++ b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h
@@ -247,7 +247,7 @@
  *   mikroBUS2 Interrupt: PE14-MB2_INT
  *
  * I assume that the interrupt lines are active low.  No pull-ups are provided on
- * board so pull-ups ar provided in the pin configurations.
+ * board so pull-ups are provided in the pin configurations.
  */
 
 #define GPIO_MB1_INT     (GPIO_INPUT|GPIO_PULLUP|GPIO_EXTI|GPIO_PORTE|GPIO_PIN10)
diff --git a/boards/sim/sim/sim/src/sim.h b/boards/sim/sim/sim/src/sim.h
index 03eadfbbfa..c172f66f6d 100644
--- a/boards/sim/sim/sim/src/sim.h
+++ b/boards/sim/sim/sim/src/sim.h
@@ -92,11 +92,11 @@ int sim_bringup(void);
  *   - First, a ROM disk device must be created.  This is done by calling
  *     the function romdisk_register() as described in
  *     nuttx/include/nuttx/drivers/ramdisk.h.  This is an OS level operation
- *     and must be done in the board-level logic before your appliction
+ *     and must be done in the board-level logic before your application
  *     starts.
  *
  *     romdisk_register() will create a block driver at /dev/ramN where N
- *     is the device minor number that was provdied to romdisk_regsiter.
+ *     is the device minor number that was provided to romdisk_register.
  *
  *   - The second step is to mount the file system.  This step can be
  *     performed either in your board configuration logic or by your
diff --git a/boards/sim/sim/sim/src/sim_zoneinfo.c b/boards/sim/sim/sim/src/sim_zoneinfo.c
index ba7ae3a523..bf5f2bd8a0 100644
--- a/boards/sim/sim/sim/src/sim_zoneinfo.c
+++ b/boards/sim/sim/sim/src/sim_zoneinfo.c
@@ -98,11 +98,11 @@
  *   - First, a ROM disk device must be created.  This is done by calling
  *     the function romdisk_register() as described in
  *     nuttx/include/nuttx/drivers/ramdisk.h.  This is an OS level operation
- *     and must be done in the board-level logic before your appliction
+ *     and must be done in the board-level logic before your application
  *     starts.
  *
  *     romdisk_register() will create a block driver at /dev/ramN where N
- *     is the device minor number that was provdied to romdisk_regsiter.
+ *     is the device minor number that was provided to romdisk_register.
  *
  *   - The second step is to mount the file system.  This step can be
  *     performed either in your board configuration logic or by your
diff --git a/drivers/lcd/ili9340.c b/drivers/lcd/ili9340.c
index 1926f36209..b7cf32885a 100644
--- a/drivers/lcd/ili9340.c
+++ b/drivers/lcd/ili9340.c
@@ -65,7 +65,7 @@
 /* This is the generic lcd driver interface for the ili9340 Single Chip LCD
  * driver. The driver supports multiple displays, each connected with an own
  * ili9340 Single Chip LCD driver. The communication with the LCD single chip
- * driver must be provide by a subdriver accessable trough the ili9340_dev_s
+ * driver must be provide by a subdriver accessable through the ili9340_dev_s
  * structure which is platform and MCU interface specific.
  *
  * Supported MCU interfaces (planed to support)
@@ -89,7 +89,7 @@
  * 4-wire 8-bit data serial Interface
  *
  * Note! RGB interface will not supported by the lcd driver.
- * It should be use with the platform specific RGB grapic controller and the
+ * It should be use with the platform specific RGB graphic controller and the
  * nuttx framebuffer interface.
  *
  */
diff --git a/drivers/lcd/ili9341.c b/drivers/lcd/ili9341.c
index 858afbceed..f46aee0256 100644
--- a/drivers/lcd/ili9341.c
+++ b/drivers/lcd/ili9341.c
@@ -65,7 +65,7 @@
 /* This is the generic lcd driver interface for the ili9341 Single Chip LCD
  * driver. The driver supports multiple displays, each connected with an own
  * ili9341 Single Chip LCD driver. The communication with the LCD single chip
- * driver must be provide by a subdriver accessable trough the ili9341_dev_s
+ * driver must be provide by a subdriver accessable through the ili9341_dev_s
  * structure which is platform and MCU interface specific.
  *
  * Supported MCU interfaces (planed to support)
@@ -89,7 +89,7 @@
  * 4-wire 8-bit data serial Interface
  *
  * Note! RGB interface will not supported by the lcd driver.
- * It should be use with the platform specific RGB grapic controller and the
+ * It should be use with the platform specific RGB graphic controller and the
  * nuttx framebuffer interface.
  *
  */
diff --git a/drivers/modem/altair/altmdm_spi.c b/drivers/modem/altair/altmdm_spi.c
index df3a72d63b..11b1cf0b08 100644
--- a/drivers/modem/altair/altmdm_spi.c
+++ b/drivers/modem/altair/altmdm_spi.c
@@ -1964,7 +1964,7 @@ int altmdm_spi_uninit(FAR struct altmdm_dev_s *priv)
 
   destroy_rxbufffifo(priv);
 
-  /* Uninitalize modem power management driver */
+  /* Uninitialize modem power management driver */
 
   altmdm_pm_uninit(priv);
 
diff --git a/drivers/timers/pcf85263.h b/drivers/timers/pcf85263.h
index 344a3f2873..a598997bd5 100644
--- a/drivers/timers/pcf85263.h
+++ b/drivers/timers/pcf85263.h
@@ -335,7 +335,7 @@
 
 /* Offset register */
 
-#define PCF85263_CTL_OFFSET                0x24      /* Offset regsiter */
+#define PCF85263_CTL_OFFSET                0x24      /* Offset register */
                                                      /* Bits 0-7: Offset value */
 
 /* Control registers */
diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index 3b68f314f1..33443001ac 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -587,7 +587,7 @@ void timer_unregister(FAR void *handle)
  * Description:
  *   This function can be called to add a callback into driver-related code
  *   to handle timer expirations.  This is a strictly OS internal interface
- *   and may NOT be used by appliction code.
+ *   and may NOT be used by application code.
  *
  * Input Parameters:
  *   handle   - This is the handle that was returned by timer_register()
@@ -595,7 +595,8 @@ void timer_unregister(FAR void *handle)
  *   arg      - Argument to be provided with the callback
  *
  * Returned Value:
- *   None
+ *   Zero (OK), if the callback was successfully set, or -ENOSYS if the lower
+ *   half driver does not support the operation.
  *
  ****************************************************************************/
 
diff --git a/include/nuttx/nx/nxtypes.h b/include/nuttx/nx/nxtypes.h
index 86a63e82a6..8d112e2d2e 100644
--- a/include/nuttx/nx/nxtypes.h
+++ b/include/nuttx/nx/nxtypes.h
@@ -98,7 +98,7 @@ struct nxgl_rect_s
   struct nxgl_point_s pt2; /* Lower, right-hand corner */
 };
 
-/* Describes a vector starting at pt1 and extending throug pt2 */
+/* Describes a vector starting at pt1 and extending through pt2 */
 
 struct nxgl_vector_s
 {
@@ -108,7 +108,7 @@ struct nxgl_vector_s
 
 /* Describes a run, i.e., a horizontal line.  Note that the start/end positions
  * have fractional precision.  This is necessary for good joining of trapezoids
- * when a more complex shape is decomposed into trapezoids
+ * when a more complex shape is decomposed into trapezoids.
  */
 
 struct nxgl_run_s
@@ -119,7 +119,7 @@ struct nxgl_run_s
 };
 
 /* Describes a horizontal trapezoid on the display in terms the run at the
- * top of the trapezoid and the run at the bottom
+ * top of the trapezoid and the run at the bottom.
  */
 
 struct nxgl_trapezoid_s
diff --git a/include/nuttx/timers/oneshot.h b/include/nuttx/timers/oneshot.h
index 6b69a80162..4662fbf232 100644
--- a/include/nuttx/timers/oneshot.h
+++ b/include/nuttx/timers/oneshot.h
@@ -74,7 +74,7 @@
  *                    Argument: A reference to a struct timespec in which
  *                    the current time will be returned.
  *
- * NOTE: _TCIOC(0x0020) througn _TCIOC(0x003f) are reserved for use by the
+ * NOTE: _TCIOC(0x0020) through _TCIOC(0x003f) are reserved for use by the
  * oneshot driver to assure that the values are unique.  Other timer drivers
  * must not use IOCTL commands in this numeric range.
  */
diff --git a/include/nuttx/timers/timer.h b/include/nuttx/timers/timer.h
index 052bcad330..62a9ea1259 100644
--- a/include/nuttx/timers/timer.h
+++ b/include/nuttx/timers/timer.h
@@ -81,11 +81,7 @@
  * WARNING: May change TCIOC_SETTIMEOUT to pass pointer to 64bit nanoseconds
  * or timespec structure.
  *
- * NOTE: The TCIOC_SETHANDLER ioctl cannot be supported in the kernel build
- * mode. In that case direct callbacks from kernel space into user space is
- * forbidden.
- *
- * NOTE: _TCIOC(0x0001) througn _TCIOC(0x001f) are reserved for use by the
+ * NOTE: _TCIOC(0x0001) through _TCIOC(0x001f) are reserved for use by the
  * timer driver to assure that the values are unique.  Other timer drivers,
  * such as the oneshot timer, must not use IOCTL commands in this numeric
  * range.
@@ -278,7 +274,7 @@ void timer_unregister(FAR void *handle);
  * Description:
  *   This function can be called to add a callback into driver-related code
  *   to handle timer expirations.  This is a strictly OS internal interface
- *   and may NOT be used by appliction code.
+ *   and may NOT be used by application code.
  *
  * Input Parameters:
  *   handle   - This is the handle that was returned by timer_register()
@@ -286,7 +282,8 @@ void timer_unregister(FAR void *handle);
  *   arg      - Argument provided when the callback is called.
  *
  * Returned Value:
- *   None
+ *   Zero (OK), if the callback was successfully set, or -ENOSYS if the lower
+ *   half driver does not support the operation.
  *
  ****************************************************************************/
 
diff --git a/libs/libc/unistd/lib_getopt.c b/libs/libc/unistd/lib_getopt.c
index e52bfd28d7..08140209b9 100644
--- a/libs/libc/unistd/lib_getopt.c
+++ b/libs/libc/unistd/lib_getopt.c
@@ -118,7 +118,7 @@ static bool             g_binitialized = false;
 int getopt(int argc, FAR char *const argv[], FAR const char *optstring)
 {
   /* Were new argc or argv passed in?  This detects misuse of getopt() by
-   * applictions that break out of the getopt() loop before getop() returns
+   * applications that break out of the getopt() loop before getop() returns
    * -1.
    */
 
diff --git a/libs/libc/zoneinfo/README.txt b/libs/libc/zoneinfo/README.txt
index 7e0d547928..5c7b3bfe56 100644
--- a/libs/libc/zoneinfo/README.txt
+++ b/libs/libc/zoneinfo/README.txt
@@ -28,7 +28,7 @@ doing this:
     starts.
 
     romdisk_register() will create a block driver at /dev/ramN where N
-    is the device minor number that was provided to romdisk_regsiter.
+    is the device minor number that was provided to romdisk_register.
 
   - The second step is to mount the file system.  This step can be
     performed either in your board configuration logic or by your
diff --git a/net/bluetooth/bluetooth.h b/net/bluetooth/bluetooth.h
index f947c5c351..29de921182 100644
--- a/net/bluetooth/bluetooth.h
+++ b/net/bluetooth/bluetooth.h
@@ -417,7 +417,7 @@ void bluetooth_container_initialize(void);
  * Name: bluetooth_container_allocate
  *
  * Description:
- *   The bluetooth_container_allocate function will get a free continer
+ *   The bluetooth_container_allocate function will get a free container
  *   for use by the recvfrom() logic.
  *
  *   This function will first attempt to allocate from the g_free_container
diff --git a/net/bluetooth/bluetooth_container.c b/net/bluetooth/bluetooth_container.c
index a4a81f11ad..4c44515922 100644
--- a/net/bluetooth/bluetooth_container.c
+++ b/net/bluetooth/bluetooth_container.c
@@ -119,7 +119,7 @@ void bluetooth_container_initialize(void)
  * Name: bluetooth_container_allocate
  *
  * Description:
- *   The bluetooth_container_allocate function will get a free continer
+ *   The bluetooth_container_allocate function will get a free container
  *   for use by the recvfrom() logic.
  *
  *   This function will first attempt to allocate from the g_free_container
diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h
index b0fec37aa2..f1128630af 100644
--- a/net/ieee802154/ieee802154.h
+++ b/net/ieee802154/ieee802154.h
@@ -434,7 +434,7 @@ void ieee802154_container_initialize(void);
  * Name: ieee802154_container_allocate
  *
  * Description:
- *   The ieee802154_container_allocate function will get a free continer
+ *   The ieee802154_container_allocate function will get a free container
  *   for use by the recvfrom() logic.
  *
  *   This function will first attempt to allocate from the g_free_container
diff --git a/net/ieee802154/ieee802154_container.c b/net/ieee802154/ieee802154_container.c
index ad8b9b83fd..2f16b99258 100644
--- a/net/ieee802154/ieee802154_container.c
+++ b/net/ieee802154/ieee802154_container.c
@@ -119,7 +119,7 @@ void ieee802154_container_initialize(void)
  * Name: ieee802154_container_allocate
  *
  * Description:
- *   The ieee802154_container_allocate function will get a free continer
+ *   The ieee802154_container_allocate function will get a free container
  *   for use by the recvfrom() logic.
  *
  *   This function will first attempt to allocate from the g_free_container
diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h
index 58751e7871..39727f8342 100644
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
@@ -442,7 +442,7 @@ int tcp_local_ipv4_device(FAR struct tcp_conn_s *conn);
  *   on the remotely connected IPv4 address
  *
  * Input Parameters:
- *   conn - TCP connection structure.  The remotely conected address, raddr,
+ *   conn - TCP connection structure.  The remotely connected address, raddr,
  *     should be set to a non-zero value in this structure.
  *
  * Returned Value:
diff --git a/net/tcp/tcp_finddev.c b/net/tcp/tcp_finddev.c
index 581ac72b3f..8c6713d324 100644
--- a/net/tcp/tcp_finddev.c
+++ b/net/tcp/tcp_finddev.c
@@ -163,7 +163,7 @@ static int tcp_find_ipv6_device(FAR struct tcp_conn_s *conn,
  *
  * Description:
  *   Select the network driver to use with the IPv4 TCP transaction based
- *   on the locally bound IPv4 address
+ *   on the locally bound IPv4 address.
  *
  * Input Parameters:
  *   conn - TCP connection structure.  The locally bound address, laddr,
@@ -187,10 +187,10 @@ int tcp_local_ipv4_device(FAR struct tcp_conn_s *conn)
  *
  * Description:
  *   Select the network driver to use with the IPv4 TCP transaction based
- *   on the remotely connected IPv4 address
+ *   on the remotely connected IPv4 address.
  *
  * Input Parameters:
- *   conn - TCP connection structure.  The remotely conected address, raddr,
+ *   conn - TCP connection structure.  The remotely connected address, raddr,
  *     should be set to a non-zero value in this structure.
  *
  * Returned Value:
@@ -234,7 +234,7 @@ int tcp_local_ipv6_device(FAR struct tcp_conn_s *conn)
  *
  * Description:
  *   Select the network driver to use with the IPv6 TCP transaction based
- *   on the remotely conected IPv6 address
+ *   on the remotely connected IPv6 address.
  *
  * Input Parameters:
  *   conn - TCP connection structure.  The remotely connected address, raddr,
diff --git a/sched/clock/clock_abstime2ticks.c b/sched/clock/clock_abstime2ticks.c
index 18bc3ef3d5..3f812c7e0f 100644
--- a/sched/clock/clock_abstime2ticks.c
+++ b/sched/clock/clock_abstime2ticks.c
@@ -86,11 +86,11 @@ static long compare_timespec(FAR const struct timespec *a,
  *
  * Input Parameters:
  *   clockid - The timing source to use in the conversion
- *   reltime - Convert this absolue time to system clock ticks.
+ *   reltime - Convert this absolute time to system clock ticks.
  *   ticks - Return the converted number of ticks here.
  *
  * Returned Value:
- *   OK on success; A non-zero error number on failure;
+ *   OK on success; A non-zero error number on failure
  *
  * Assumptions:
  *   Interrupts should be disabled so that the time is not changing during
@@ -131,9 +131,7 @@ int clock_abstime2ticks(clockid_t clockid, FAR const struct timespec *abstime,
   reltime.tv_nsec = (abstime->tv_nsec - currtime.tv_nsec);
   reltime.tv_sec  = (abstime->tv_sec  - currtime.tv_sec);
 
-  /* Check if we were supposed to borrow from the seconds to borrow from the
-   * seconds
-   */
+  /* Check if we were supposed to borrow from the seconds. */
 
   if (reltime.tv_nsec < 0)
     {