You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pr...@apache.org on 2020/08/30 22:16:39 UTC

[incubator-nuttx] 01/02: Docs: Update links to old website and wiki

This is an automated email from the ASF dual-hosted git repository.

protobits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 4cb193d530e9ae2912ed82baa65ec05715d73e86
Author: Brennan Ashton <ba...@brennanashton.com>
AuthorDate: Sun Aug 30 13:12:57 2020 -0700

    Docs: Update links to old website and wiki
    
    Signed-off-by: Brennan Ashton <ba...@brennanashton.com>
---
 Documentation/components/nsh/nsh.rst               |   1 +
 Documentation/components/nxwidgets.rst             |  14 +-
 Documentation/introduction/detailed_support.rst    |  43 ++--
 Documentation/introduction/resources.rst           |   4 +-
 Documentation/reference/os/smp.rst                 |   2 +-
 Documentation/reference/user/01_task_control.rst   |   6 +-
 .../reference/user/05_counting_semaphore.rst       |   2 +-
 Documentation/reference/user/08_pthread.rst        |   4 +-
 README.md                                          |   8 +-
 ReleaseNotes                                       | 260 +++++++++++----------
 TODO                                               |   8 +-
 arch/Kconfig                                       |   3 +-
 arch/arm/src/armv7-m/Kconfig                       |   2 +-
 arch/arm/src/armv8-m/Kconfig                       |   2 +-
 arch/arm/src/kinetis/kinetis_lowputc.c             |   2 +-
 arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_i2s.h  |   4 +-
 arch/arm/src/lpc43xx/lpc43_serial.c                |   2 +-
 boards/README.txt                                  |  24 +-
 .../arm/cxd56xx/spresense/configs/rndis/defconfig  |   1 -
 .../arm/cxd56xx/spresense/configs/wifi/defconfig   |   1 -
 .../lc823450/lc823450-xgevk/configs/bt/defconfig   |   1 -
 .../lc823450-xgevk/configs/krndis/defconfig        |   1 -
 .../lc823450-xgevk/configs/rndis/defconfig         |   1 -
 .../arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt  |  10 +-
 .../lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig |   1 -
 boards/arm/lpc31xx/ea3131/README.txt               |   2 +-
 boards/arm/sam34/flipnclick-sam3x/README.txt       |   2 -
 boards/arm/sama5/sama5d2-xult/README.txt           |   2 +-
 .../arm/sama5/sama5d2-xult/include/board_498mhz.h  |   2 +-
 boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c   |   2 +-
 boards/arm/sama5/sama5d4-ek/README.txt             |  10 +-
 boards/arm/samv7/samv71-xult/README.txt            |   2 +-
 boards/arm/stm32/clicker2-stm32/README.txt         |   2 +-
 boards/arm/stm32/stm32f4discovery/README.txt       |   6 +-
 boards/arm/stm32f7/stm32f746g-disco/README.txt     |   2 +-
 boards/z16/z16f/z16f2800100zcog/README.txt         |   2 +-
 36 files changed, 210 insertions(+), 231 deletions(-)

diff --git a/Documentation/components/nsh/nsh.rst b/Documentation/components/nsh/nsh.rst
index 8984192..317103c 100644
--- a/Documentation/components/nsh/nsh.rst
+++ b/Documentation/components/nsh/nsh.rst
@@ -1,4 +1,5 @@
 .. include:: /substitutions.rst
+.. _nsh:
 
 ********
 Overview
diff --git a/Documentation/components/nxwidgets.rst b/Documentation/components/nxwidgets.rst
index 01cba46..ce88051 100644
--- a/Documentation/components/nxwidgets.rst
+++ b/Documentation/components/nxwidgets.rst
@@ -43,17 +43,11 @@ Note: Many of the fundamental classed in NxWidgets derive from the
 Antony Dzeryn's "Woopsi" project: http://woopsi.org/ which also has a
 BSD style license. See the COPYING file for details.
 
-NXWidgets DOxygen Documentation
+NXWidgets Doxygen Documentation
 ===============================
 
-Release notes, DOxygen documentation, as well as downloads for the
-latest NxWidgets releases are available online:
-
-**NxWidgets-1.19**:
-`Documentation <http://nuttx.org/nxwidgets_v1_19/html/index.html>`__,
-`Release
-notes <http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.19/>`__,
-and
-`Downloads <http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.19/>`__
+.. todo::
+   NXWidgets supports building HTML documentation via Doxygen. We should
+   integrate this into the Sphinx documentation build.
 
 Thanks go to Jose Pablo Carballo for contributing this!
diff --git a/Documentation/introduction/detailed_support.rst b/Documentation/introduction/detailed_support.rst
index 65d06ba..257e7c9 100644
--- a/Documentation/introduction/detailed_support.rst
+++ b/Documentation/introduction/detailed_support.rst
@@ -110,7 +110,7 @@ Moxa NP51x0
 
 A port to the Moxa NP51x0 series of 2-port advanced
 RS-232/422/485 serial device servers was contributed by Anton D.
-Kachalov in NuttX-7.11. This port includes a NuttShell (NSH)
+Kachalov in NuttX-7.11. This port includes :ref:`NSH <nsh>`
 configuration with support for the Faraday FTMAC100 Ethernet MAC Driver.
 
 
@@ -174,9 +174,9 @@ There are ports to two Atmel SAMA5D3 boards:
    configurations that run out of internal SRAM and extended
    configurations that run out of the on-board NOR FLASH:
 
-   -  A barebones NuttShell (`NSH <NuttShell.html>`__) configuration
+   -  A barebones NuttShell (:ref:`NSH <nsh>`) configuration
       that can be used as the basis for further application development.
-   -  A full-loaded NuttShell (`NSH <NuttShell.html>`__) configuration
+   -  A full-loaded NuttShell (:ref:`NSH <nsh>`) configuration
       that demonstrates all of the SAMA5D3x features.
 
    The following support was added in Nuttx 6.30:
@@ -398,7 +398,7 @@ that features the NUC120LE3AN MCU.
 
 **STATUS**. Initial support for the NUC120 was released in NuttX-6.26.
 This initial support is very minimal: There is a NuttShell
-(`NSH <NuttShell.html>`__) configuration that might be the basis for an
+(:ref:`NSH <nsh>`) configuration that might be the basis for an
 application development. As of this writing, more device drivers are
 needed to make this a more complete port. Refer to the NuttX board
 `README <https://bitbucket.org/nuttx/nuttx/src/master/boards/arm/nuc1xx/nutiny-nuc120/README.txt>`__
@@ -511,8 +511,7 @@ TI/Stellaris LM3S6432S2E
 This port uses Serial-to-Ethernet Reference
 Design Kit (`RDK-S2E <http://www.ti.com/tool/rdk-s2e>`__) and has
 similar support as for the other Stellaris family members. A
-configuration is available for the NuttShell (NSH) (see the `NSH User
-Guide <http://www.nuttx.org/Documentation/NuttShell.html>`__). The NSH
+configuration is available for the NuttShell (NSH) (see :ref:`NSH <nsh>`). The NSH
 configuration including networking support with a Telnet NSH console.
 This port was contributed by Mike Smith.
 
@@ -691,7 +690,7 @@ family was added in NuttX-7.21. Support for the Nucleo-L152RE was added
 in NuttX-7.28.
 
 That initial STM32L-Discovery support included a configuration using the
-NuttShell (`NSH <NuttShell.html>`__) that might be the basis for an
+NuttShell (:ref:`NSH <nsh>`) that might be the basis for an
 application development. A driver for the on-board segment LCD is
 included as well as an option to drive the segment LCD from an NSH
 "built-in" command. Refer to the STM32L-Discovery board
@@ -970,7 +969,7 @@ Three configurations are available:
    with the STM32F107 part.
 #. The configuration that was used to verify the Nuttx `high-priority,
    nested interrupt
-   feature <http://www.nuttx.org/doku.php?id=wiki:nxinternal:highperfints>`__.
+   feature <https://cwiki.apache.org/confluence/display/NUTTX/High+Performance%2C+Zero+Latency+Interrupts>`__.
 
 **STATUS:** Networking and touchscreen support are well test. But, at
 present, neither USB nor LCD functionality have been verified. Refer to
@@ -1103,8 +1102,7 @@ boards.
    That initial, 5.6, basic release included *timer* interrupts and a
    *serial console* and was verified using the NuttX OS test
    (``apps/examples/ostest``). Configurations available include include
-   a verified NuttShell (NSH) configuration (see the `NSH User
-   Guide <http://www.nuttx.org/Documentation/NuttShell.html>`__). The
+   a verified NuttShell (NSH) configuration (see :ref:`NSH <nsh>`). The
    NSH configuration supports the Nucleus2G's microSD slot and
    additional configurations are available to exercise the USB serial
    and USB mass storage devices. However, due to some technical reasons,
@@ -1145,8 +1143,7 @@ boards.
       file for further information.
 
    Verified configurations are now available for the NuttShell with
-   networking and microSD support(NSH, see the `NSH User
-   Guide <http://www.nuttx.org/Documentation/NuttShell.html>`__), for
+   networking and microSD support(NSH, see :ref:`NSH <nsh>`), for
    the NuttX network test, for the
    `THTTPD <http://acme.com/software/thttpd>`__ webserver, for USB
    serial deive and USB storage devices examples, and for the USB host
@@ -1570,8 +1567,7 @@ further information about this board.
 
 -  **NuttX-6.12** The basic port is complete and first appeared in
    NuttX-6.12. The initial port passes the NuttX OS test and includes a
-   validated configuration for the NuttShell (NSH, see the `NSH User
-   Guide <http://www.nuttx.org/Documentation/NuttShell.html>`__) as well
+   validated configuration for the NuttShell (NSH, see :ref:`NSH <nsh>`) as well
    as several other configurations.
 -  **NuttX-6.13-6.16** Additional drivers and configurations were added
    in NuttX 6.13-6.16. Drivers include an Ethernet driver, ADC driver,
@@ -2177,7 +2173,7 @@ was contributed in NuttX-8.1 by Nathan Hartman.
    the EK-TM4C123GXL was also included in that release but was not fully
    tested. This basic board support included a configuration for the
    NuttShell
-   `NSH <http://www.nuttx.org/Documentation/NuttShell.html>`__).
+   :ref:`NSH <nsh>`).
 -  **NuttX-7.2**. The fully verified port to the EK-TM4C123GXL was
    provided in NuttX-7.2.
 -  **NuttX-7.7**. An I2C driver was added in NuttX-7.7.
@@ -2195,7 +2191,7 @@ LaunchPad `(EK-TM4C1294XL) <http://www.ti.com/tool/ek-tm4c1294xl>`__.
 -  Support for the EK-TM4C1294XL was contributed by Frank Sautter and
    was released in NuttX 7.9. This basic board support included a
    configuration for the NuttShell
-   `NSH <http://www.nuttx.org/Documentation/NuttShell.html>`__) and a
+   :ref:`NSH <nsh>`) and a
    configuration for testing IPv6. See drivers for the `TI Tiva
    TM4C129X <#titm4c129x>`__.
 -  FLASH and EEPROM drivers from Shirshak Sengupta were included in
@@ -2220,7 +2216,7 @@ Development Kit `(DK-TM4C129X) <http://www.ti.com/tool/dk-tm4c129x>`__.
    Other Tiva/Stellaris drivers should port to the TM4C129X without
    major difficulty.
 -  This board supports included two configurations for the NuttShell
-   (`NSH <http://www.nuttx.org/Documentation/NuttShell.html>`__). Both
+   (:ref:`NSH <nsh>`). Both
    are networked enabled: One configured to support IPv4 and one
    configured to supported IPv6. Instructions are included in the board
    `README <https://bitbucket.org/nuttx/nuttx/src/master/boards/arm/tiva/dk-tm4c129x/README.txt>`__
@@ -2255,7 +2251,7 @@ board. This board features the ATSAM4LC4C MCU running at 48MHz with
 
 **STATUS:** As of this writing, the basic port is code complete and a
 fully verified configuration exists for the NuttShell
-`NSH <http://www.nuttx.org/Documentation/NuttShell.html>`__). The first
+:ref:`NSH <nsh>`). The first
 fully functional SAM4L Xplained Pro port was released in NuttX-6.28.
 Support for the SAM4L Xplained modules was added in NuttX-6.29:
 
@@ -2317,8 +2313,7 @@ in part by Mitko.
 
 **Atmel SAM4E-EK**. Board support was added for the SAM4E-EK development
 board in NuttX 7.1. A fully functional NuttShell (NSH) configuration is
-available (see the `NSH User
-Guide <http://www.nuttx.org/Documentation/NuttShell.html>`__). That NSH
+available (see :ref:`NSH <nsh>`). That NSH
 configuration includes networking support and support for an AT25 Serial
 FLASH file system.
 
@@ -2343,8 +2338,7 @@ in part by Mitko.
 
 **Atmel SAM4E-EK**. Board support was added for the SAM4E-EK development
 board in NuttX 7.1. A fully functional NuttShell (NSH) configuration is
-available (see the `NSH User
-Guide <http://www.nuttx.org/Documentation/NuttShell.html>`__). That NSH
+available (see :ref:`NSH <nsh>`). That NSH
 configuration includes networking support and support for an AT25 Serial
 FLASH file system.
 
@@ -2491,7 +2485,7 @@ STM32 F7 Driver Status:
    peripherals are very similar to some members of the STM32 F4 and
    additional drivers can easily be ported the F7 as discussed in this
    Wiki page: `Porting Drivers to the STM32
-   F7 <http://www.nuttx.org/doku.php?id=wiki:howtos:port-drivers_stm32f7>`__
+   F7 <https://cwiki.apache.org/confluence/display/NUTTX/Porting+Drivers+to+the+STM32+F7>`__
 
 -  **NuttX-7.17**. David Sidrane contributed PWR, RTC, BBSRAM, and
    DBGMCU support. Lok Tep contribed SPI, I2c, ADC, SDMMC, and USB
@@ -2757,8 +2751,7 @@ basic RTOS port has solidified:
 
 -  The port successfully passes the NuttX OS test
    (apps/examples/ostest).
--  A NuttShell (NSH) configuration is in place (see the `NSH User
-   Guide <http://www.nuttx.org/Documentation/NuttShell.html>`__).
+-  A NuttShell (NSH) configuration is in place (see :ref:`NSH <nsh>`).
    Testing of that configuration has been postponed (because it got
    bumped by the Olimex LPC1766-STK port). Current Status: I think I
    have a hardware problem with my serial port setup. There is a good
diff --git a/Documentation/introduction/resources.rst b/Documentation/introduction/resources.rst
index 2fcc327..30971f9 100644
--- a/Documentation/introduction/resources.rst
+++ b/Documentation/introduction/resources.rst
@@ -9,9 +9,9 @@ Here's a list of Apache NuttX resources that you might find helpful:
  * Apache NuttX
 
    * `NuttX website <https://nuttx.apache.org>`_
-   * `Apache NuttX website <https://www.nuttx.org>`_
+   * `Apache NuttX website <https://apache.nuttx.org>`_
    * `Apache NuttX online documentation <https://cwiki.apache.org/confluence/display/NUTTX/Nuttx>`_
-   * `Apache NuttX mailing list <https://nuttx.incubator.apache.org/community/>`_ – a very active mailing list, the place to get help with your application or any questions you have about NuttX.
+   * `Apache NuttX mailing list <https://nuttx.apache.org/community/>`_ – a very active mailing list, the place to get help with your application or any questions you have about NuttX.
    * `Apache NuttX YouTube channel <https://www.youtube.com/channel/UC0QciIlcUnjJkL5yJJBmluw/videos>`_ – Alan Carvalho de Assis's YouTube channel on NuttX. It's a source of a lot of great practical information.
    * `Apache NuttX Coding Standard <https://cwiki.apache.org/confluence/display/NUTTX/Coding+Standard>`_ — How code should look when you submit new files or modify existing ones.
    * `Apache NuttX Code Contribution Guidlines <https://cwiki.apache.org/confluence/display/NUTTX/Code+Contribution+Workflow+--+Brennan+Ashton>`_ — The full workflow to follow for submitting code with all the details.
diff --git a/Documentation/reference/os/smp.rst b/Documentation/reference/os/smp.rst
index 3ac45ed..5059231 100644
--- a/Documentation/reference/os/smp.rst
+++ b/Documentation/reference/os/smp.rst
@@ -22,7 +22,7 @@ bus or a crossbar."
 
 For a technical description of the NuttX implementation of SMP,
 see the NuttX `SMP Wiki
-Page <http://www.nuttx.org/doku.php?id=wiki:nxinternal:smp>`__.
+Page <https://cwiki.apache.org/confluence/display/NUTTX/SMP>`__.
 
 .. c:function:: spinlock_t up_testset(volatile FAR spinlock_t *lock)
 
diff --git a/Documentation/reference/user/01_task_control.rst b/Documentation/reference/user/01_task_control.rst
index 35036dc..4ac1c93 100644
--- a/Documentation/reference/user/01_task_control.rst
+++ b/Documentation/reference/user/01_task_control.rst
@@ -48,7 +48,7 @@ Non-standard task control interfaces inspired by VxWorks interfaces:
 
 Non-standard extensions to VxWorks-like interfaces to support POSIX
 `Cancellation
-Points <http://www.nuttx.org/doku.php?id=wiki:nxinternal:cancellation-points>`__.
+Points <https://cwiki.apache.org/confluence/display/NUTTX/Cancellation+Points>`__.
 
   - :c:func:`task_setcancelstate`
   - :c:func:`task_setcanceltype`
@@ -168,7 +168,7 @@ Functions
   This function obeys the semantics of pthread cancellation: task deletion
   is deferred if cancellation is disabled or if deferred cancellation is
   supported (with `Cancellation
-  Points <http://www.nuttx.org/doku.php?id=wiki:nxinternal:cancellation-points>`__
+  Points <https://cwiki.apache.org/confluence/display/NUTTX/Cancellation+Points>`__
   enabled).
 
   :param pid: The task ID of the task to delete. An ID of zero signifies
@@ -297,7 +297,7 @@ Functions
 .. c:function:: void task_testcancel(void)
 
   Creates a `Cancellation
-  Point <http://www.nuttx.org/doku.php?id=wiki:nxinternal:cancellation-points>`__
+  Point <https://cwiki.apache.org/confluence/display/NUTTX/Cancellation+Points>`__
   in the calling task. The ``task_testcancel()`` function has no effect if
   cancellability is disabled.
 
diff --git a/Documentation/reference/user/05_counting_semaphore.rst b/Documentation/reference/user/05_counting_semaphore.rst
index 96d01b7..8be699d 100644
--- a/Documentation/reference/user/05_counting_semaphore.rst
+++ b/Documentation/reference/user/05_counting_semaphore.rst
@@ -132,7 +132,7 @@ the case of pthread mutexes,
 with ``PTHREAD_PRIO_NONE``.
 
 This is discussed in much more detail on this `Wiki
-page <http://www.nuttx.org/doku.php?id=wiki:howtos:signalling-semaphores>`__.
+page <https://cwiki.apache.org/confluence/display/NUTTX/Signaling+Semaphores+and+Priority+Inheritance>`__.
 
 **POSIX semaphore interfaces:**
 
diff --git a/Documentation/reference/user/08_pthread.rst b/Documentation/reference/user/08_pthread.rst
index fe51ab6..ccab1e4 100644
--- a/Documentation/reference/user/08_pthread.rst
+++ b/Documentation/reference/user/08_pthread.rst
@@ -448,7 +448,7 @@ No support for the following pthread interfaces is provided by NuttX:
   When cancellability is deferred, all cancellations are held pending in
   the target thread until the thread changes the cancellability type or a
   `Cancellation
-  Point <http://www.nuttx.org/doku.php?id=wiki:nxinternal:cancellation-points>`__
+  Point <https://cwiki.apache.org/confluence/display/NUTTX/Cancellation+Points>`__
   function such as ```pthread_testcancel()`` <#pthreadtestcancel>`__ is
   entered.
 
@@ -528,7 +528,7 @@ No support for the following pthread interfaces is provided by NuttX:
 .. c:function:: void pthread_testcancel(void);
 
   The ``pthread_testcancel()`` function creates a `Cancellation
-  Point <http://www.nuttx.org/doku.php?id=wiki:nxinternal:cancellation-points>`__
+  Point <https://cwiki.apache.org/confluence/display/NUTTX/Cancellation+Points>`__
   in the calling thread. The ``pthread_testcancel()`` function has no
   effect if cancellability is disabled.
 
diff --git a/README.md b/README.md
index 5042f4a..92cab4c 100644
--- a/README.md
+++ b/README.md
@@ -963,7 +963,7 @@ This make target will bring up NuttX configuration menus.
 **WARNING**:  Never do `make menuconfig` on a configuration that has
 not been converted to use the kconfig-frontends tools!  This will
 damage your configuration (see
-<http://www.nuttx.org/doku.php?id=wiki:howtos:convertconfig>).
+<https://cwiki.apache.org/confluence/display/NUTTX/Converting+Legacy+Configurations+to+Use+kconfig-mconf>).
 
 How do we tell a new configuration from an old one? See "Incompatibilities
 with Older Configurations" below.
@@ -1278,7 +1278,7 @@ configuration will probably not be functional.
   > Q: How can I convert a older, manual configuration into a new,
   >    kconfig-frontends toolchain.
   >
-  > A: Refer to <http://www.nuttx.org/doku.php?id=wiki:howtos:convertconfig>
+  > A: Refer to <https://cwiki.apache.org/confluence/display/NUTTX/Converting+Legacy+Configurations+to+Use+kconfig-mconf>
 
 **WARNING**
 
@@ -1304,7 +1304,7 @@ file, regenerating the `.config` and making it usable for NuttX builds.
 Never do `make oldconfig` (OR `make menuconfig`) on a  configuration that
 has not been converted to use the kconfig-frontends tools!  This will
 damage your configuration (see
-<http://www.nuttx.org/doku.php?id=wiki:howtos:convertconfig>).
+<https://cwiki.apache.org/confluence/display/NUTTX/Converting+Legacy+Configurations+to+Use+kconfig-mconf>).
 
 ## NuttX Configuration Tool under DOS
 
@@ -1876,7 +1876,7 @@ into your Web browser:
 
     Documentation/index.html
 
-NuttX documentation is also available online at <http://www.nuttx.org>.
+NuttX documentation is also available online at <https://apache.nuttx.org>.
 
 Below is a guide to the available README files in the NuttX source tree:
 
diff --git a/ReleaseNotes b/ReleaseNotes
index 776dcde..3b4c6ab 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -869,7 +869,7 @@ OS feature and corrects and extends the eZ80 port:
   * Priority Inheritance.  The basic NuttX waiting logic was extended
     to support priority inheritance. See the NuttX User Manual for
     further information:
-    http://www.nuttx.org/NuttxUserGuide.html#priorityinheritance.
+    http://nuttx.apache.org/docs/latest/reference/user/05_counting_semaphore.html.
 
   * ez80Acclaim! Corrected several critical, show-stopping bugs on that
     platform including:
@@ -994,7 +994,7 @@ This is the 41st release of NuttX.  This release adds:
 
   * Support for a new binary format call NXFLAT that can be used to
     execute separately linked programs in place in a file system.
-    See http://www.nuttx.org/NuttXNxFlat.html.
+    See https://nuttx.apache.org/docs/latest/components/nxflat.html.
 
   * Several important bugs were files related to networking and ROMFS.
     See the ChangeLog for a complete list.
@@ -1034,7 +1034,7 @@ THTTPD have been tested on the Micromint Eagle-100 development board
   * Serving of files from any file system
   * Execution of CGI executable.  This release supports execution
     of NXFLAT executables on a ROMFS file system
-    (http://www.nuttx.org/NuttXNxFlat.html)
+    (https://nuttx.apache.org/docs/latest/components/nxflat.html)
 
 A standard CGI interface is used:  Information is pasted to the CGI
 program via POST commands and via environment variables.  CGI socket
@@ -1294,7 +1294,7 @@ NuttX-5.4
 
 This is the 51st release of NuttX.  This release includes one new,
 important extension to th NX graphics system (See
-http://www.nuttx.org/NXGraphicsSubsystem.html).
+https://nuttx.apache.org/docs/latest/components/nxgraphics/index.html).
 
 NX was develop a couple years back on hardware that supported only
 framebuffer devices, that is, video hardware with video memory
@@ -1389,7 +1389,7 @@ for one new ARM Cortex-M3 architecture:
   * That initial basic release included timer interrupts and a
     serial console and was verified using the NuttX OS test.
   * That release includes a verified NuttShell (NSH) configuration
-    (see the http://www.nuttx.org/NuttShell.html).
+    (see the https://nuttx.apache.org/docs/latest/components/nsh/index.html).
   * Also included are unverified SPI and USB device drivers.
 
 Further efforts include:
@@ -1448,7 +1448,8 @@ implementations, and a couple of important bugfixes.
     of on-demand paging support.  This feature will allow you to
     execute large programs on a mass storage device (such as SPI
     FLASH) in a small RAM.  All of the core on-demand paging logic
-    was completed (see http://www.nuttx.org/NuttXDemandPaging.html)
+    was completed
+    (see https://nuttx.apache.org/docs/latest/components/paging.html)
     and support was implemented for the ARM-9 family.  A test
     configuration is in place for the NXP LPC3131.  It has been
     verified that this new logic does not interfere with normal
@@ -1492,9 +1493,9 @@ include:
   * On-Demand Paging Support:
     The basic logic for the On-Demand Paging feature is complete,
     implemented for the NXP LPC3131, and partially tested.  See
-    http://www.nuttx.org/NuttXDemandPaging.html.  Some additional
-    test infrastructure will be needed in order to complete the
-    verification.  See configs/ea3131/README.txt for details.
+    https://nuttx.apache.org/docs/latest/components/paging.html.
+    Some additional test infrastructure will be needed in order to complete
+    the verification.  See configs/ea3131/README.txt for details.
   * Two Pass Build Support:
     The make system now supports a two pass build where a relocatable,
     partially linked object is created on the first pass and that
@@ -1586,9 +1587,9 @@ include:
     Atmel AT32UC3B0256 MCU was (almost) fully integrated. The port
     now successfully passes the NuttX OS test (examples/ostest).
     A NuttShell (NSH) configuration is in place (see the NSH User
-    Guide at http://www.nuttx.org/NuttShell.html). Testing of that
-    NSH configuration, however, has been postponed (because it got
-    bumped by the Olimex LPC1766-STK port -- see below)
+    Guide at https://nuttx.apache.org/docs/latest/components/nsh/index.html).
+    Testing of that NSH configuration, however, has been postponed
+    (because it got bumped by the Olimex LPC1766-STK port -- see below)
 
     Current Status: I think I have a hardware problem with my serial
     port setup. There is a good chance that the NSH port is complete
@@ -1606,7 +1607,8 @@ include:
     Support for the Olimex-LPC1766 is newly added to NuttX and is
     still undergoing development, test, and integration. Verified
     configurations for the NuttX OS test and for the NuttShell (NSH,
-    see the NSH User Guide at http://www.nuttx.org/NuttShell.html.
+    see the NSH User Guide at
+    https://nuttx.apache.org/docs/latest/components/nsh/index.html .
     Additional USB configurations are in the release as well, but
     they have not yet been verified.  Goals for NuttX-5.14 include:
     (1) An Ethernet driver, (2) Verified USB support, and (3) SD
@@ -1654,11 +1656,11 @@ Additional support has been included for the Olimex-LPC1766.  Support
 for that board was added to NuttX 5.13.  This release extends that
 support with an Ethernet driver.  Verified configurations are now
 available for the NuttX OS test, for the NuttShell (NSH, see
-http://www.nuttx.org/NuttShell.html), for the NuttX network test,
-and for the THTTPD webserver. (Additional USB configurations are
-in the release as well, but those have not yet been verified.  Goals
-for NuttX-5.15 (and beyond) include: (1) Verified USB support, (2)
-SD card support, and (3) LCD support.
+https://nuttx.apache.org/docs/latest/components/nsh/index.html),
+for the NuttX network test, and for the THTTPD webserver.
+(Additional USB configurations are in the release as well, but those
+have not yet been verified.  Goals for NuttX-5.15 (and beyond) include:
+(1) Verified USB support, (2) SD card support, and (3) LCD support.
 
 NuttX-5.15
 ----------
@@ -2111,7 +2113,7 @@ they are, ordered from the least to the most complete:
     STATUS:  The basic port was released in NuttX-6.5.  This basic
     port consists of a "Hello, World!!" example and also slightly
     simplified NuttShell (NSH) configuration (see the NSH User Guide
-    at http://www.nuttx.org/NuttShell.html).
+    at https://nuttx.apache.org/docs/latest/components/nsh/index.html).
 
     An SPI driver and a USB device driver exist for the AT90USB as
     well as a USB mass storage configuration.  However, this
@@ -2905,7 +2907,7 @@ That command will mount the remote NFS server directory <remote-path> at
 the remote server.
 
 The NFS development was the graduation project of Jose Pablo Rojas V. who
-is a student at the Instituto Tecnol�gico de Costa Rica (ITCR, or TEC).
+is a student at the Instituto Tecnológico de Costa Rica (ITCR, or TEC).
 A lot of effort went into understanding what a tiny, embedded NFS client should
 do and getting the target resource usage to a bare minimum.  Only around a
 kilobyte or so of memory is required to run the NFS client (and most of that
@@ -5595,7 +5597,7 @@ Additional new features and extended functionality:
       - Add support for high priority, nested interrupts. This change
         effects not only core ARMv-7M logic, but all ARMv7-M MCU logic:
         LM3S, LM4F,  LPC17xx, LPC43xx, SAM3, SAM4, and STM32. See
-        http://www.nuttx.org/doku.php?id=wiki:nxinternal:highperfints
+        https://cwiki.apache.org/confluence/display/NUTTX/High+Performance%2C+Zero+Latency+Interrupts
 
     * STMicro STM32
 
@@ -5774,7 +5776,7 @@ Bugfixes (see the ChangeLog for details).  Some of these are very important:
         doing nothing!  It turns out that that is not really important
         because up_disable_irq() is not really used for that purpose.  But
         some spurions STM32 ADC interrupts have been reported to me and this
-        turned out to be the cause in that case.  Thanks to Manuel St�hn for
+        turned out to be the cause in that case.  Thanks to Manuel Stühn for
         the tip.
 
     * STMicro STM32
@@ -5850,8 +5852,8 @@ file for build information).
   use the newer configuration, but if you have some older style configurations
   for you board, you will need to convert those configurations to use the
   kconfig-frontends tools before taking any new code from the repository. See
-  http://www.nuttx.org/doku.php?id=wiki:howtos:convertconfig for some
-  guidelines.
+  https://cwiki.apache.org/confluence/display/NUTTX/Converting+Legacy+Configurations+to+Use+kconfig-mconf
+  for some guidelines.
 
 Additional new features and extended functionality:
 
@@ -5951,7 +5953,7 @@ Additional new features and extended functionality:
     * Documentation:
 
       - Added a coding standards document.  See
-        http://www.nuttx.org/doku.php?id=documentation:codingstandard
+        https://nuttx.apache.org/docs/latest/contributing/coding_style.html
 
     * Configuration/Build System:
 
@@ -5970,8 +5972,8 @@ Additional new features and extended functionality:
         have been converted to use the newer configuration, but if you have
         some older style configurations for you board, you will need to
         convert those configurations to use the kconfig-frontends tools. See
-        http://www.nuttx.org/doku.php?id=wiki:howtos:convertconfig for some
-        guidelines.
+        https://cwiki.apache.org/confluence/display/NUTTX/Converting+Legacy+Configurations+to+Use+kconfig-mconf
+        for some guidelines.
 
     * Applications:
 
@@ -6165,7 +6167,7 @@ Additional new features and extended functionality:
 
     * STMicro STM32 Drivers:
 
-      - Add STM32 Ethernet IGMP hashing support.  From Manuel St�hn.
+      - Add STM32 Ethernet IGMP hashing support.  From Manuel Stühn.
       - OTG FS Host:  USB host tracing added by Leo.
 
     * Freescale Kinetis
@@ -6211,7 +6213,7 @@ Additional new features and extended functionality:
 
       - IGMP Example:  Fill out Kconfig file; update makefile so that the
         IGMP example can be used as an NSH built-in application. From Manuel
-        St�hn.
+        Stühn.
       - lcdrw Example:  Fill out empty Kconfig file.
       - touchscreen Example:  Add a configuration option to indicate if
         architecture-specific initialized is required, yes or no.
@@ -6232,7 +6234,7 @@ Bugfixes (see the ChangeLog for details).  Some of these are very important:
 
     * Networking:
 
-      - IGMP-related bug fixes from Manuel St�hn.
+      - IGMP-related bug fixes from Manuel Stühn.
       - In netdev_findbyaddr(), skip network devices that are in the "down"
         state.  It does not make sense to consider an address match with a
         "down" device.  From Brennan Ashton.
@@ -6489,7 +6491,7 @@ Bugfixes.  Only the most critical bugfixes are listed here (see the ChangeLog fo
         function could not have been working correctly before???  From
         eero.nurkkala.
       - Fix typo in conditional compilation:  CONFIG_CLOCK_MONOTONIC vs.
-        CLOCK_MONOTONIC.  From Manuel St�hn.
+        CLOCK_MONOTONIC.  From Manuel Stühn.
 
     * Graphics
 
@@ -7232,7 +7234,7 @@ completed soon.
     * Processes.  Much of the work in this release is focused on the
       realization of Unix-style user processes in NuttX.  There is more to
       be done, however.  The full roadmap and status is available at:
-      http://www.nuttx.org/doku.php?id=wiki:nxinternal:memconfigs#the_roadmap_toward_processes
+      https://cwiki.apache.org/confluence/display/NUTTX/Memory+Configurations
 
     * XMega:  There are some fragments in place for an XMega port.  That
       port has not really started, however.
@@ -7416,12 +7418,12 @@ Additional new features and extended functionality:
 
     * File Systems/Block Drivers/MTD:
 
-      - Extend MTD support to the M25P16. From S�bastien Lorquet.
+      - Extend MTD support to the M25P16. From Sébastien Lorquet.
 
     * Drivers:
 
       - BCH (Block-to-Character): Add support for seeking in BCH.  From
-        S�bastien Lorquet.
+        Sébastien Lorquet.
 
     * Graphics Support/Graphics-Related Drivers:
 
@@ -7566,7 +7568,7 @@ completed soon.
     * Processes.  Much of the work in this release is focused on the
       realization of Unix-style user processes in NuttX.  There is more to
       be done, however.  The full roadmap and status is available at:
-      http://www.nuttx.org/doku.php?id=wiki:nxinternal:memconfigs#the_roadmap_toward_processes
+      https://cwiki.apache.org/confluence/display/NUTTX/Memory+Configurations
 
     * XMega:  There are some fragments in place for an XMega port.  That
       port has not really started, however.
@@ -7697,7 +7699,7 @@ operation.  My thanks to the developers of cppcheck!  I am impressed!
       - The implementation of access() as vararg macro has the issue that
         any function call with the same name (even in a C++ class) will
         match with it and result in a compile error.  Replaced with a small
-        function. This resolves the compile issue, and shouldn�t have
+        function. This resolves the compile issue, and shouldn't have
         negative side effects for users of the function. From Lorenz Meier.
       - The definition of strncpy() is that empty space should be zero-
         filled, the change adds the zero filling (See the POSIX spec here:
@@ -7789,7 +7791,7 @@ Additional new features and extended functionality:
     * Drivers:
 
       - Add support for a generic EEPROM driver that accesses EEPROM as a
-        character driver (vs. an MTD driver).  From S�bastien Lorquet.
+        character driver (vs. an MTD driver).  From Sébastien Lorquet.
 
     * Graphics Support:
 
@@ -7808,7 +7810,7 @@ Additional new features and extended functionality:
       - All Ethernet drivers:  Modified to support.  Most, however, are
         still missing address filtering logic required for ICMPv6 Neighbor
         Discovery Protocol.  See
-        http://www.nuttx.org/doku.php?id=wiki:howtos:ipv6#ethernet_driver_requirements
+        https://cwiki.apache.org/confluence/display/NUTTX/IPv6
       - Also added missing raw/packet socket support to all Ethernet drivers.
 
     * Host Simulation:
@@ -7970,7 +7972,7 @@ completed soon.
     * Processes.  Much of the work in this release is focused on the
       realization of Unix-style user processes in NuttX.  There is more to
       be done, however.  The full roadmap and status is available at:
-      http://www.nuttx.org/doku.php?id=wiki:nxinternal:memconfigs#the_roadmap_toward_processes
+      https://cwiki.apache.org/confluence/display/NUTTX/Memory+Configurations
 
     * XMega:  There are some fragments in place for an XMega port.  That
       port has not really started, however.
@@ -8084,7 +8086,7 @@ detailed bugfix information):
       - strncpy():  Would trash a lot of memory if n == 0.  From Yasuhiro
         Osaki.
       - sscanf().  Accept %X and %F as well as %x %f as a format specifiers.
-        From S�bastien Lorquet
+        From Sébastien Lorquet
 
     * Applications:
 
@@ -8297,7 +8299,7 @@ completed soon.
     * Processes.  Much of the work in this release is focused on the
       realization of Unix-style user processes in NuttX.  There is more to
       be done, however.  The full roadmap and status is available at:
-      http://www.nuttx.org/doku.php?id=wiki:nxinternal:memconfigs#the_roadmap_toward_processes
+      https://cwiki.apache.org/confluence/display/NUTTX/Memory+Configurations
 
     * XMega:  There are some fragments in place for an XMega port.  That
       port has not really started, however.
@@ -8618,7 +8620,7 @@ completed soon.
     * Processes.  Much of the work in this release is focused on the
       realization of Unix-style user processes in NuttX.  There is more to
       be done, however.  The full roadmap and status is available at:
-      http://www.nuttx.org/doku.php?id=wiki:nxinternal:memconfigs#the_roadmap_toward_processes
+      https://cwiki.apache.org/confluence/display/NUTTX/Memory+Configurations
 
     * XMega:  There are some fragments in place for an XMega port.  That
       port has not really started, however.
@@ -9032,7 +9034,7 @@ completed soon.
     * Processes.  Much of the work in this release is focused on the
       realization of Unix-style user processes in NuttX.  There is more to
       be done, however.  The full roadmap and status is available at:
-      http://www.nuttx.org/doku.php?id=wiki:nxinternal:memconfigs#the_roadmap_toward_processes
+      https://cwiki.apache.org/confluence/display/NUTTX/Memory+Configurations
 
     * XMega:  There are some fragments in place for an XMega port.  That
       port has not really started, however.
@@ -9361,7 +9363,7 @@ Additional new features and extended functionality:
     * Atmel SAM3/4 Drivers:
 
       - SAM4E: Add default loop optimization if EEFC_FMR is available in the
-        configuration (i.e., for SAM4S and 4E). From Marco Aur�lio da Cruz.
+        configuration (i.e., for SAM4S and 4E). From Marco Aurélio da Cruz.
       - crypto/ and SAM4CM: Add CFB and MAC AES modes.  From Max Neklyudov.
       - SAM3/4:  Add a TWI driver for the SAM4CM.  From  Max Neklyudov.
 
@@ -10479,9 +10481,9 @@ Additional new features and extended functionality:
         interfaces to support CPU initialization and inter-actions, and
         new application interfaces to manage CPU affinity.  The changes
         are too extensive to summarize here; see the SMP Wiki page at
-        http://www.nuttx.org/doku.php?id=wiki:nxinternal:smp.  The
+        https://cwiki.apache.org/confluence/display/NUTTX/SMP.  The
         new platform interfaces are also described in the NuttX porting
-        guide: http://www.nuttx.org/doku.php?id=documentation:portingguide.
+        guide: https://nuttx.apache.org/docs/latest/quickstart/organization.html.
         Only partially verified; awaiting hardware for the complete
         verification.
       - TLS:  Basic definitions needed to support thread local storage
@@ -10923,7 +10925,7 @@ Additional new features and extended functionality:
         (NUCLEO-F746ZG).  From Mark Olsson.
       - apps/examples/media:  You can now override the default device driver
         path by providing an alternal path on the command line.  From
-        S�bastien Lorquet.
+        Sébastien Lorquet.
 
 Works-In-Progress:
 
@@ -10975,7 +10977,7 @@ detailed bugfix information):
       - SAMV7 Tickless Mode: This is a fix to a problem in the handling of
         the oneshot timer. Due to a wrong assumption concerning the behavior
         directly after the start of the timer/counter the function
-        sam_oneshot_cancel(�) calculates the wrong remaining time. The code
+        sam_oneshot_cancel calculates the wrong remaining time. The code
         assumes that the counter register is zero directly after the start
         of the timer, but this is not true. To start the time/counter a
         software trigger is invoked, this trigger starts the timer/count and
@@ -10988,7 +10990,7 @@ detailed bugfix information):
         In my fix I use the freerun count value to determine if at least one
         tick passed since the start of the timer and thus if the value of
         the oneshot counter is correct. I also tried to use the function
-        up_timer_gettime(�) to achieve this but, at least if compiled with
+        up_timer_gettime to achieve this but, at least if compiled with
         no optimization the problem vanishes without using the value of the
         function, the function call takes too long.
         Another problem treated in the fix is that if the oneshot timer/counter
@@ -11229,7 +11231,7 @@ Additional new features and extended functionality:
             also do an automatic recovery if a slave got stuck (SDA stays
             low).
 
-        With the above changes I�C-Bus reliability in harsh environments (eg.
+        With the above changes I2C-Bus reliability in harsh environments (eg.
         EMC) is greatly improved. The small change in the GPIO-Driver was
         necessary because otherwise you cannot read back the correct line
         status of Open-Drain Outputs and this is needed by the twi_reset
@@ -11381,13 +11383,13 @@ Additional new features and extended functionality:
         make.defs, Add empty preconfig rules to 'leaf' makefiles, Use
         directory.mk for recursive dir makefiles, Individual app kconfig
         fixes, Recursive Kconfig autogeneration, Add kconfig files for
-        pcode and tiff, and fix a gitignore rule,  From S�bastien Lorquet.
+        pcode and tiff, and fix a gitignore rule,  From Sébastien Lorquet.
       - apps/include directory structure reorganized.  There are no longer
         any header files in the apps/include/. directory.  Rather, sub-
         directories were added to match the partitioning of apps/ sub-
         directories and the header files were moved into the appropriate
         sub-directory.  This change is intended to help with some changes
-        being considered by S�bastien Lorquet.
+        being considered by Sébastien Lorquet.
       - Call all includes from <apps/bla/bla.h> to "bla/bla.h". From Sebastien
         Lorquet.
       - Add apps/include to include path in top-level Make.defs file.
@@ -11753,7 +11755,7 @@ detailed bugfix information):
 
       - apps/nshilib: PS Command: When Priority Inheritance is enabled, the
         format of /proc/<PID>/status changes to show both the current
-        priority and the thread�s base priority.  This messes up the format
+        priority and the thread's base priority.  This messes up the format
         of cmd_ps. From David Alessio.
 
     * apps/netutils:
@@ -11802,7 +11804,7 @@ Additional new features and extended functionality:
 
     * File System and Block and MTD Drivers:
 
-      - Add Fujistu MB85RS256B ramtron support.  From Beat K�ng.
+      - Add Fujistu MB85RS256B ramtron support.  From Beat Küng.
       - SPI-based MTD driver for Macronix MX25L3233F or MX25L6433F.  From
         Aleksandr Vyhovanec.
 
@@ -12059,7 +12061,7 @@ detailed bugfix information):
         space.  Rather, FIONSPACE should return the free space in the send
         queue.
       - Add missing prototype for btn_lower_initialize().
-      - Make DAC sample structure packed.  From Marc Recht�.
+      - Make DAC sample structure packed.  From Marc Rechté.
 
     * Networking:
 
@@ -12087,7 +12089,7 @@ detailed bugfix information):
         Likewise, enabling the pull-up resistor while the pull-down resistor
         is still enabled is not possible. In this case, the write of
         PIO_PUER for the relevant I/O line is discarded.  From Wolfgang
-        Rei�negger.
+        Reißnegger.
 
     * Atmel SAMV7 Drivers:
 
@@ -12191,7 +12193,7 @@ detailed bugfix information):
         DMA is enabled.
       - STM32 DMA2D: fix an error in up_dma2dcreatelayer where an invalid
         pointer was returned when a certain underlying function failed.
-        From Jens Gr�f.
+        From Jens Gräf.
 
     * TI Tiva Drivers:
 
@@ -12205,17 +12207,17 @@ detailed bugfix information):
         problems when the syslog output is prefixed with time.  From
         Pierre-noel Bouteville.
       - libc/math: This fixes the following libc/math issues: (1) asin[f l]()
-        use Newton�s method to converge on a solution. But Newton�s method
+        use Newton's method to converge on a solution. But Newton's method
         converges very slowly (> 500,000 iterations) for values of x close to
         1.0; and, in the case of asinl(), sometimes fails to converge (loops
         forever). The attached patch uses an trig identity for values of
         x > sqrt(2). The resultant functions converge in no more than 5
         iterations, 6 for asinl().  (2) The NuttX erf[f l]() functions are
-        based on Chebyshev fitting to a good guess. The problem there�s a
+        based on Chebyshev fitting to a good guess. The problem there's a
         bug in the implementation that causes the functions to blow up with
         x near -3.0. This patch fixes that problem. It should be noted that
         this method returns the error function erf(x) with fractional error
-        less than 1.2E-07 and that�s fine for the float version erff(), but
+        less than 1.2E-07 and that's fine for the float version erff(), but
         the same method is used for double and long double version which
         will yield only slightly better precision. This patch doesn't
         address the issue of lower precision for erf() and erfl(). (3) a
@@ -12254,7 +12256,7 @@ detailed bugfix information):
         to run all of the context setup; the compiler is never invoked; no
         code is autogenerated and things work.
       - CXXFLAGS:  Add -fcheck-new whenever -fno-exceptions is used. From
-        Beat K�ng.
+        Beat Küng.
 
     * Tools
 
@@ -12482,10 +12484,10 @@ Additional new features and extended functionality:
       - STM32 F3:  Implementation of the STM32 F37xx SDADC module. There are
         also changes to ADC, DAC modules. SDADC has only been tested in DMA
         mode and does not support external TIMER triggers. This is a work in
-        progress.  From  Marc Recht�.
+        progress.  From  Marc Rechté.
       - STM32 F3:  Add PWM driver support for STMF37xx.  The changes have been
         tested successfully for TIM4 and TIM17 (different IPs).  From  Marc
-        Recht�.
+        Rechté.
       - STM32 F4:  Support oversampling by 8 for the STM32 F4. From David
         Sidrane.
       - STM32 F4:  Added Timers 2-5 and control of SAI and I2S PLLs.  Added
@@ -12512,13 +12514,13 @@ Additional new features and extended functionality:
       - STM32F103 Minimum:  Add Vishay VEML6070 driver support to the
         STM32F103-Minimum board.  From Alan Carvalho de Assis.
       - Nucleo-F303RE:  Add STM32 F303RE hello configuration.   From Marc
-        Recht�.
+        Rechté.
       - Nucleo-L476:  Support PWM testing on board Nucleo L476.  From
         Sebastien Lorquet.
       - Nucleo L476:  Add support for timers to Nucleo L476.  From Sebastien
         Lorquet.
       - Hymini STM32v:  Enable CONFIG_RTC in the hymini-stm32v/nsh2
-        (kitchensink) config. From Maciej W�jcik.
+        (kitchensink) config. From Maciej Wójcik.
       - Olimex STM32-p407:  Add support for the Olimex STM32 P407 board.
 
     * TI Tiva Drivers:
@@ -12766,7 +12768,7 @@ detailed bugfix information):
       - All timer lower half drivers.  Port Sebastien's changes to all other
         implementations of the timer lower half.
       - USB MSC Device:  Fix length of mode6 sense reply packet.  From
-        Wolfgang Rei�negger.
+        Wolfgang Reißnegger.
       - USB Composite Host:  Fix end offset in usbhost_copyinterface().  From
         Janne Rosberg.
       - USB CDC/ACM Host:   Add CDC_SUBCLASS_ACM and CDC_PROTO_ATM to
@@ -12831,12 +12833,12 @@ detailed bugfix information):
         be cleared which will cause the next transaction to fail if DTGLE is
         1. If that happens the host will time-out and reset the bus.  Adding
         this delay may also fix the USBMSC_STALL_RACEWAR in usbmsc_scsi.c,
-        however this has not been verified yet.  From Wolfgang Rei�negger.
+        however this has not been verified yet.  From Wolfgang Reißnegger.
       - SAM3/4: Remove unused 'halted' flag from UDP driver.  From Wolfgang
-        Rei�negger.
+        Reißnegger.
       - SAM3/4: Remove 'stalled' flag from the UDP driver.  This flag is not
         necessary because the state of the endpoint can be determined using
-        'epstate' instead. From Wolfgang Rei�negger.
+        'epstate' instead. From Wolfgang Reißnegger.
 
     * Atmel SAM3/4 Boards:
 
@@ -12910,9 +12912,9 @@ detailed bugfix information):
 
       - STM32 CHxN channels are always outputs.  From Sebastien Lorquet.
       - STM32 DAC:  Fix shift value whenever there are is a DAC2 and, hence,
-        up to three interfaces.  From Marc Recht�.
-      - STM32 F1:  Add TIM8 to STM32F103V pinmap.  From Maciej W�jcik.
-      - STM32 F1: Fix for F1 RTC Clock, tested on F103.  From Maciej W�jcik.
+        up to three interfaces.  From Marc Rechté.
+      - STM32 F1:  Add TIM8 to STM32F103V pinmap.  From Maciej Wójcik.
+      - STM32 F1: Fix for F1 RTC Clock, tested on F103.  From Maciej Wójcik.
       - STM32 F3:  STM32F303xB and STM32F303xC chips have 4 ADCs.  From Paul
         A. Patience.
       - STM32 F4:  A new implementation of the STM32 F4 I2C bottom half.  The
@@ -12957,14 +12959,14 @@ detailed bugfix information):
       - STM32F103 Minimum: Fix Timers 2 to 7 clock frequencies. From Alan
         Carvalho de Assis.
       - Nucleo-F303RE:  Remove duplicate setting from board.h.   From  Marc
-        Recht�.
+        Rechté.
       - Nucleo F303RE: Various fixes to get the ADC configuration building
         again after PR.  Refresh all configurations.
       - Nucleo L476RG: Add better selection of timer.
 
     * TI Tiva Boards:
 
-      - DK-TM4C129x: Typo fix.  From Wolfgang Rei�negger.
+      - DK-TM4C129x: Typo fix.  From Wolfgang Reißnegger.
 
     * Xtensa ESP32:
 
@@ -13129,8 +13131,8 @@ Additional new features and extended functionality:
         kinetis_pinirq(), stm32_gpiosetevent(), and others.
       - IRQ subsystem:  Add support for smaller interrupt tables as
         described at
-        http://www.nuttx.org/doku.php?id=wiki:howtos:smallvectors .  This
-        is partially the work of Mark Schulte.
+        https://cwiki.apache.org/confluence/display/NUTTX/Smaller+Vector+Tables.
+        This is partially the work of Mark Schulte.
 
     * File Systems/Block and MTD Drivers
 
@@ -13167,7 +13169,7 @@ Additional new features and extended functionality:
 
     * Atmel SAM3/4:
 
-      - SAM3/4: Add support for ATSAM4S4C.  From Wolfgang Rei�negger.
+      - SAM3/4: Add support for ATSAM4S4C.  From Wolfgang Reißnegger.
 
     * NXP Freescale i.MX6 Boards:
 
@@ -13209,7 +13211,7 @@ Additional new features and extended functionality:
       - Add support for NXP Freedom-k66f development board.  From David
         Sidrane.
       - Kinetis Freedom K66F:  Add Ethernet support.  From David Sidrane.
-      - Add twr-k64f120m config.  From Marc Recht�.
+      - Add twr-k64f120m config.  From Marc Rechté.
 
     * NXP Freescale LPC43xx Boards:
 
@@ -13386,7 +13388,7 @@ detailed bugfix information):
       - File System: Don't build block driver proxy if PSEUDOFS_OPERATIONS
         are disabled.
       - sendfile():  Fix error introduced with commit
-        ff73be870e38959b0aaee5961dc47b4b58dc2d86.  Noted by Maciej W�jcik.
+        ff73be870e38959b0aaee5961dc47b4b58dc2d86.  Noted by Maciej Wójcik.
 
     * Graphics/Graphic Drivers:
 
@@ -13403,7 +13405,7 @@ detailed bugfix information):
       - Typos withim mtd/ with Macronix MX25L.  In
         NuttX/drivers/mtd/Make.defs letters X between M and 25 are
         missing.  Noted by Oleg Evseev.
-      - USBMSC: Always set LUN readonly flag.  From Wolfgang Rei�negger.
+      - USBMSC: Always set LUN readonly flag.  From Wolfgang Reißnegger.
       - drivers/lcd:  ssd1306_configspi() must have global scope.
       - MMC/SD SDIO:  Some drivers need to start DMA before sending CMD24
         and some AFTER.  From Alan Carvalho de Assis.
@@ -13413,9 +13415,9 @@ detailed bugfix information):
       - drivers/tone.c:  50% duty needs to be expressed a a fixed precision
         number.
       - drivers/spi/Kconfig:  There is too much SPI in the configuration
-        menu; SPI Driver Support menu is empty.  From Maciej W�jcik.
+        menu; SPI Driver Support menu is empty.  From Maciej Wójcik.
       - option to enable Memory Card debug output was hidden with SD cards
-        connected through SPI.   From Maciej W�jcik.
+        connected through SPI.   From Maciej Wójcik.
       - usbhost_cdcacm: fix tx outbuffer overflow and remove now invalid
         assert.  From Janne Rosberg.
 
@@ -13438,7 +13440,7 @@ detailed bugfix information):
 
     * Atmel SAM3/4 Drivers:
 
-      - SAM3/4: GPIO bit numbering typo fixes.  From Wolfgang Rei�negger.
+      - SAM3/4: GPIO bit numbering typo fixes.  From Wolfgang Reißnegger.
 
     * Atmel SAM3/4 Boards:
 
@@ -13460,7 +13462,7 @@ detailed bugfix information):
       - Kinetis:  Correct some SPI and I2C configuration issues.  From
         David Sidrane.
       - Kinetis Ethernet:  Add #define for number of loops for auto
-        negotiation to complete.  From Marc Recht�.
+        negotiation to complete.  From Marc Rechté.
       - Kinetis Werial:  Fixed up_rxint - did not disable the RX
         interuppts. There was an OR where and AND NOT was needed.  From
         David Sidrane.
@@ -13536,7 +13538,7 @@ detailed bugfix information):
 
       - The CONFIG_NETUTILS_HTTPD_PATH constant is used by httpd_mmap.c and
         httpd_sendfile.c but It was not present in Kconfig menu.  From
-        Maciej W�jcik.
+        Maciej Wójcik.
 
     * apps/examples:
 
@@ -14066,16 +14068,16 @@ detailed bugfix information):
         elf_sectname().  From Masayuki Ishikawa.
       - There can be a failure in IOB allocation to some asynchronous
         behavior caused by the use of sem_post().  Consider this scenario:
-        (1) Task A holds an IOB.� There are no further IOBs.� The value of
-        semcount is zero. Task B calls iob_alloc().� Since there are not
-        IOBs, it calls sem_wait().� The value of semcount is now -1.  (2)
-        Task A frees the IOB.� iob_free() adds the IOB to the free list and
+        (1) Task A holds an IOB. There are no further IOBs. The value of
+        semcount is zero. Task B calls iob_alloc(). Since there are not
+        IOBs, it calls sem_wait(). The value of semcount is now -1.  (2)
+        Task A frees the IOB. iob_free() adds the IOB to the free list and
         calls sem_post() this makes Task B ready to run and sets semcount to
-        zero NOT 1.� There is one IOB in the free list and semcount is zero.
+        zero NOT 1. There is one IOB in the free list and semcount is zero.
         When Task B wakes up it would increment the sem_count back to the
         correct value.  (3) But an interrupt or another task runs occurs
-        before Task B executes.� The interrupt or other tak takes the IOB off
-        of the free list and decrements the semcount.� But since semcount is
+        before Task B executes. The interrupt or other tak takes the IOB off
+        of the free list and decrements the semcount. But since semcount is
         then < 0, this causes the assertion because that is an invalid state
         in the interrupt handler. So I think that the root cause is that
         there the asynchrony between incrementing the semcount.  This change
@@ -14197,10 +14199,10 @@ detailed bugfix information):
       - drivers/i2c:  Fix compile issues if CONFIG_DISABLE_PSEUDOFS_OPERATIONS
         is enabled.
       - drivers/serial: I discovered a problem in the file
-        drivers/serial/serial.c concerning the function uart_close(�). In the
+        drivers/serial/serial.c concerning the function uart_close. In the
         case that a serial device is opened with the flag O_NONBLOCK the
-        function uart_close(�) blocks until all data in the buffer is
-        transmitted. The function close(�) called on an handle opened with
+        function uart_close blocks until all data in the buffer is
+        transmitted. The function close called on an handle opened with
         O_NONBLOCK should not block. The problem occurred with a CDC/ACM
         device.  From Stefan Kolb.
       - drivers:  Fix some bad NULL checks.  From Juha Niskanen.
@@ -14320,7 +14322,7 @@ detailed bugfix information):
       - STM32:  Fix erase sector number for microcontrolers with more than 11
         sectors.  Erase a sector from the second bank cause the bit 4 of SNB
         being set but never unused, so trying to erase a sector from the first
-        bank was actually eraseing a sector from the second bank.  From Jos�
+        bank was actually eraseing a sector from the second bank.  From José
         Roberto de Souza.
       - STM32:  Make up_progmem thread safe.  Writing to a flash sector while
         starting the erase of other sector have a undefined behavior so lets
@@ -14329,16 +14331,16 @@ detailed bugfix information):
         call stm32_flash_initialize() on initialization, so to avoid runtime
         problems it is only using semaphore and making it thread safe if
         initialized, after all boards starts to call stm32_flash_initialize()
-        we can remove the boolean and the check.  From Jos� Roberto de Souza.
+        we can remove the boolean and the check.  From José Roberto de Souza.
       - STM32:  Add workaround for flash data cache corruption on
         read-while-write.  This is a known hardware issue on some STM32 see
         the errata of your model and if you make use of both memory banks you
-        should enable it.  From Jos� Roberto de Souza.
-      - STM32 Flash fixes.  From Jos� Roberto de Souza.
+        should enable it.  From José Roberto de Souza.
+      - STM32 Flash fixes.  From José Roberto de Souza.
       - STM32 Flash:  Missing unlock on F1 HSI off path.  From David Sidrane.
-      - STM32 F4 I2C: I needed to use DS3231,�I remember�that�in past it
+      - STM32 F4 I2C: I needed to use DS3231, I remember that in past it
         worked ok, but now for stm32f4xx is used another driver (chip
-        specific,�stm32f40xxx_i2c.c) and DS3231 driver doesn't work.  After
+        specific, stm32f40xxx_i2c.c) and DS3231 driver doesn't work.  After
         investigating a problem I found that I2C driver (isr routine) has a
         few places there it sends stop bit even if not all messages are
         managed. So, e.g., removing stm32_i2c_sendstop (#1744) and adding
@@ -14686,7 +14688,7 @@ Additional new features and extended functionality:
       - LED Driver:  Add support for inverted LEDS.  From Jeff.
       - LED Driver:  Add lightness correction for RGB LED driver.  From Jeff.
       - LTC4151 Driver:  Add driver for LTC4151 current and voltage monitor.
-        From Giorgio Gro�.
+        From Giorgio Groß.
       - Serial TERMIOS:  tcdrain() implementation based on a new term ioctl.
         From Sebastien Lorquet.
       - Serial TERMIOS:  Add support for TCFLUSH.  From Sebastien Lorquet.
@@ -14816,12 +14818,12 @@ Additional new features and extended functionality:
         STM32_RCC_CR_HSEBYP in their board.h file if they want this
         configuration.  From Jeff.
       - STM32 F4 USB:  I'm working on bringing up USB full-speed support on
-        STM32F405.� My board does not include a USB power switch, VBus
+        STM32F405. My board does not include a USB power switch, VBus
         sensing, over current detection, or ID pin.  This commit add a
-        config�STM32_OTGFS_VBUS_ CONTROL which lets us selectively disable
-        VBus sensing and control.� I also sneaked in a change to disable the
+        config STM32_OTGFS_VBUS_ CONTROL which lets us selectively disable
+        VBus sensing and control.  I also sneaked in a change to disable the
         configgpio call for the ID pin, which is only used in OTG mode which
-        isn't supported yet.� The only pins that need to be initialized should
+        isn't supported yet.  The only pins that need to be initialized should
         be OTGFS_DP and OTGFS_DM.  From Jeff.
       - STM32 FLASH:  Add CONFIG_STM32_STM32F469 support. From David Sidrane.
       - STM32 COMP:  Add default INM configuration and some missing COMP
@@ -15020,7 +15022,7 @@ Additional new features and extended functionality:
       - examples/ipforward: Add an IP forwarding example using only TUN
         devices.  Test extended to test forwarding of ICMPv6 multicast messages.
       - Implement powermonitor example for ltc4151 current and voltage
-        monitor.  From Giorgio Gro�.
+        monitor.  From Giorgio Groß.
       - examples/pf_ieee802154:  Add for testing PF_IEEE802154 sockets.  Add
         PANID to command line options; Cannot bind to address zero... There is
         no counterpart to INADDR_ANY for these radios (not now at least).
@@ -15326,7 +15328,7 @@ detailed bugfix information):
         of the other CAN nodes to 500000. The device is restarted and sends a
         CANopen "bootup message" to the CAN network. This results in huge
         amount of errors messages on the CAN bus, probably because of the CAN
-        feature for acknowledging error messages. The error messages can�t be
+        feature for acknowledging error messages. The error messages can't be
         read by the device because of the misconfigured CAN speed, instead the
         CAN chip reports lots of errors, which are reported to the application
         which uses the CAN driver (CONFIG_CAN_ERRORS is enabled).  The CAN
@@ -16029,7 +16031,7 @@ Additional new features and extended functionality:
         Merlino.
       - Olimex STM32-H407:  Add serial support on the on-board UEXT
         connector.  Add USART6 for UEXT connector.   Add nsh_uext
-        configuration and README update.  From Jan Pobr�slo.
+        configuration and README update.  From Jan Pobříslo.
       - Nucleo-F410RB:  Add support for the nucleo-F410RB board.  From
         Gwenhael Goavec-Merou.
       - STM32F429i-DISCO:  Add framebuffer driver initialization.  Add a
@@ -16587,9 +16589,9 @@ detailed bugfix information):
       - Nucleo-F334R8:  Add Missing ADC trigger configuration tot he highpri
         configuration.  From Mateusz Szafoni.
       - STM3240G-EVAL:  The timer frequencies (BOARD_TIMx_FREQUENCY) are
-        incorrectly defined in�board.h.  Since the APB prescalers are set to
+        incorrectly defined in board.h.  Since the APB prescalers are set to
         divide by 4 and 2 respectively, the frequencies should be "2xAPBx"
-        as said in the comment.� The correct frequencies are already defined
+        as said in the comment. The correct frequencies are already defined
         but as STM32_APBx_TIMx_CLKIN.  From Mattias Edlund.
       - STM32F429i-DISCO:  The ltdc configuration has been deleted because
         it violated the portable POSIX OS interface.  It used
@@ -17535,7 +17537,7 @@ Additional new features and extended functionality:
         allow any I2C operations after unlink, making it possible to
         deallocate the I2C bus.  From Juha Niskanen.
       - drivers/i2c:  Added support for the pca9540bdp i2cmultiplexer.  From
-        Giorgio Gro�.
+        Giorgio Groß.
       - drivers/power:  Added pm_unregister  From Juha Niskanen.
       - drivers/power:  Added generic upper-half motor driver  From Mateusz
         Szafoni.
@@ -18958,9 +18960,9 @@ Additional new features and extended functionality:
       - apps/nshlib:  Add parsing support for back-slash quoted
         characters. Currently only implemented properly if
         CONFIG_NSH_ARGCAT is also selected.  This commit is in response to
-        Bitbucket Issue 11 opened by Maciej W�jcik  From Gregory Nutt.
+        Bitbucket Issue 11 opened by Maciej Wójcik  From Gregory Nutt.
       - apps/nshlib:  Add inverted logic support in the form of 'if !
-        <cmd>'  From  Beat K�ng.
+        <cmd>'  From  Beat Küng.
       - apps/nshlib:  Expand reboot and poweroff commands to include a
         second, optional mode argument  From ligd.
       - apps/nshlib:  Add a force flag (-f) to mksmartfs command.  SmartFS
@@ -19595,7 +19597,7 @@ detailed bugfix information):
         would exit immediately, while using 'until' would stay in the
         loop.  This is the opposite of how it is supposed to work.  The
         reason is that 'state' was set wrong because 'whilematch' is a
-        bool.  From Beat K�ng.
+        bool.  From Beat Küng.
       - apps/nshlib:  I was able to cause an assertion with some typos in
         testing the 'fi' command.  Not an important thing, but this will
         protect against the assertion.  From Gregory Nutt.
@@ -21579,7 +21581,7 @@ detailed bugfix information):
         code if it's divided into smaller functions  From Mateusz Szafoni
       - STM32 F0 Clocking:  Fixes the problem in GPIO port clocks. Only port
         A clock was enabled although the comment states otherwise.  From Juha
-        Paalij�rvi
+        Paalijärvi
       - STM32 F7 I2C:  I2C out of bounds access on priv->msgv.  Error in if
         statement. It was checking for msgc > 0.  If message count is 1, only
         index 0 is valid on priv->msgv.  Therefore random values in memory
@@ -22415,9 +22417,9 @@ detailed bugfix information):
         and (2) once via sched_releasetcb().  this was corrected by adding
         logic to free/unload the memory once and nullify the pointer so
         that cannot be freed a second time.  This commit resolves Bitbucket
-        issue #145.  From Valmantas Palik�a.
+        issue #145.  From Valmantas Palikša.
       - NxFLAT:  File descriptor leaks when nxflat loading fails.  From
-        Valmantas Palik�a.
+        Valmantas Palikša.
       - ProcFS:  Fix typo in procfs uptime logic.  From Sebastien Lorquet.
 
     * Networking/Network Drivers:
@@ -22708,7 +22710,7 @@ detailed bugfix information):
         Szafoni.
       - STM32F429I-DISCO:  Handle multiple calls to the LCD
         up_fbinitialize() function.  From Gregory Nutt.
-      - STM32F769I-DISCO:  Florian R. H�lzlwimmer reports that
+      - STM32F769I-DISCO:  Florian R. Hölzlwimmer reports that
         stm32_appinitialize.c often has missing OK and NULL definitions.
         This should be fixed by including sys/types.h where they are
         defined.  From GregoryN.
@@ -22818,7 +22820,7 @@ detailed bugfix information):
       - NSH Console:  Fix copy paste errors. Some Kconfig configuration
         names needed CONFIG_ prefix.  From David Sidrane.
       - nshlib/nsh_timcmds.c:  Uninitialized struct tm caused 'date -s' to
-        fail.  From Valmantas Palik�a.
+        fail.  From Valmantas Palikša.
 
     * Examples: apps/examples:
 
@@ -23529,7 +23531,7 @@ Additional new features and extended functionality:
       - Telnet Driver:  Handle ctrl events (SIGINT, SIGSTP).  From
         Valmantas Paliksa.
       - Telnet Driver:  I/O thread now offloads reading from socket
-        from client thread to the I/O thread.  From Valmantas Palik�a.
+        from client thread to the I/O thread.  From Valmantas Palikša.
 
     * Wireless/Wireless Drivers:
 
@@ -23599,7 +23601,7 @@ Additional new features and extended functionality:
         only one port is active (either 1 or 2) it will always be numbered
         as 0, if both are active then USDHC1 will be number 0, USDHC2 will
         be 1.  From Dave Marples.
-      - i.MXRT Serial:  Add TIOCSINVERT ioctls.  From Beat K�ng.
+      - i.MXRT Serial:  Add TIOCSINVERT ioctls.  From Beat Küng.
       - i.MXRT Serial:  Implemented RS485 RX/TX switching and RTS/CTS flow
         control for the IMXRT family.  It has been tested on 1020 but I
         don't see any reason for issues on any other family member.  From
@@ -23607,7 +23609,7 @@ Additional new features and extended functionality:
 
     * NXP/Freescale Kinetis Drivers:
 
-      - Kinetis Serial:  Add UART signal inversion support  From Beat K�ng.
+      - Kinetis Serial:  Add UART signal inversion support  From Beat Küng.
 
     * NXP LPC11xx:
 
@@ -23815,7 +23817,7 @@ Additional new features and extended functionality:
       - STM32F7 Serial:  This adds the ability to invert and swap RX/TX on
         STM32F7 UARTs.  I added the TIOCGINVERT as well to reserve the IOCTL
         number, but did not implement it. This is the same as for
-        TIOCGSINGLEWIRE.  From Beat K�ng.
+        TIOCGSINGLEWIRE.  From Beat Küng.
       - STM32L4 CRS:  Make STM32L4 CRS synchronization source board
         configurable.  From Juha Niskanen.
       - STM32L4 HSI48:  Enable CRS_CR_CEN with CRS_CR_AUTOTRIMEN.  From
@@ -23827,14 +23829,14 @@ Additional new features and extended functionality:
       - STM32L4 RCC:  Use Range 1 Boost mode if SYSCLK is higher than 80
         MHz.  From Juha Niskanen.
       - STM32L4 Serial:  Add TIOCSINVERT and TIOCSSWAP ioctls.  From Beat
-        K�ng.
+        Küng.
       - STM32H7 ADC:  Added ADC Driver, ADC clocking.  From David Sidrane.
       - STM32H7 Ethernet: Fix typo in define.  From Pierre-Olivier Vauboin.
       - STM32H7 PWM:  Port PWM from STM32  From Mateusz Szafoni.
       - STM32H7 QEncoder:  Ported the QEncoder from F7 to H7.  From Eduard
         Niesner.
       - STM32H7 Serial:  Add TIOCSINVERT and TIOCSSWAP ioctls.  Ensure
-        TIOCSSINGLEWIRE is atomic and UE disabled.  From Beat K�ng.
+        TIOCSSINGLEWIRE is atomic and UE disabled.  From Beat Küng.
 
     * STMicro STM32 Boards:
 
@@ -24745,7 +24747,7 @@ Additional new features and extended functionality:
     * NXP/Freescale Kinetis Drivers:
 
       - Kinetis Serial:  Add possibility to specify pull-up instead of
-        open drain for serial single-wire mode.  From Beat K�ng.
+        open drain for serial single-wire mode.  From Beat Küng.
 
     * NXP LPC17xx/40xx:
 
@@ -25595,7 +25597,7 @@ information):
     * Tools:
 
       - tools/:  Change all occurrences of /bin/(ba)sh in shell scripts to
-        /usr/bin/env bash which appears more portable  From Manuel St�hn.
+        /usr/bin/env bash which appears more portable  From Manuel Stühn.
 
     * NSH Library: apps/nshlib:
 
@@ -26113,7 +26115,7 @@ information):
         options and SDCC no longer needs the work-around.  From Gregory
         Nutt.
       - clock_systimespec():  Fix early timespec overflow if using 32 bit
-        system timer.  From Jens Gr�f.
+        system timer.  From Jens Gräf.
       - Spinlocks:  spin_trylock handle memory barrier and instrumentation
         correctly.  From Xiang Xiao.
       - Power Management:  Fix a problem where a timer cannot start when it
diff --git a/TODO b/TODO
index a5c92dd..8fd88f0 100644
--- a/TODO
+++ b/TODO
@@ -77,7 +77,7 @@ o Task/Scheduler (sched/)
   Title:       ON-DEMAND PAGING INCOMPLETE
   Description: On-demand paging has recently been incorporated into the RTOS.
                The design of this feature is described here:
-               http://www.nuttx.org/NuttXDemandPaging.html.
+               https://nuttx.apache.org/docs/latest/components/paging.html.
                As of this writing, the basic feature implementation is
                complete and much of the logic has been verified.  The test
                harness for the feature exists only for the NXP LPC3131 (see
@@ -862,7 +862,7 @@ o pthreads (sched/pthreads libs/libc/pthread)
                Excerpted from my post in a Linked-In discussion:
 
                "I started to implement this HLS/"PCP" semaphore in an RTOS that I
-                work with (http://www.nuttx.org) and I discovered after doing the
+                work with (https://apache.nuttx.org) and I discovered after doing the
                 analysis and basic code framework that a complete solution for the
                 case of a counting semaphore is still quite complex -- essentially
                 as complex as is priority inheritance.
@@ -1195,7 +1195,7 @@ o C++ Support
                   processes).]
 
                   NuttX does not have processes, but it does have "task groups".
-                  See http://www.nuttx.org/doku.php?id=wiki:nxinternal:tasksnthreads.
+                  See https://cwiki.apache.org/confluence/display/NUTTX/Tasks+vs.+Threads+FAQ.
                   A task group is the task plus all of the pthreads created by
                   the task via pthread_create().  Resources like FILE streams
                   are shared within a task group. Task groups are like a poor
@@ -2504,7 +2504,7 @@ o Linux/Cygwin simulation (arch/sim)
   Priority:    Low, unless there is a need for developing a higher fidelity simulation
                I have been thinking about how to implement simulated interrupts in
                the simulation.  I think a solution would work like this:
-               http://www.nuttx.org/doku.php?id=wiki:nxinternal:simulator
+               https://cwiki.apache.org/confluence/display/NUTTX/NuttX+Simulation
 
   Title:       ROUND-ROBIN SCHEDULING IN THE SIMULATOR
   Description: Since the simulation is not pre-emptible, you can't use round-robin
diff --git a/arch/Kconfig b/arch/Kconfig
index d49d844..840453c 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -537,7 +537,8 @@ menuconfig PAGING
 	depends on ARCH_USE_MMU && !ARCH_ROMPGTABLE
 	---help---
 		If set =y in your configation file, this setting will enable the on-demand
-		paging feature as described in http://www.nuttx.org/NuttXDemandPaging.html.
+		paging feature as described in
+		https://nuttx.apache.org/docs/latest/components/paging.html.
 
 if PAGING
 
diff --git a/arch/arm/src/armv7-m/Kconfig b/arch/arm/src/armv7-m/Kconfig
index 6c30814..45e51c0 100644
--- a/arch/arm/src/armv7-m/Kconfig
+++ b/arch/arm/src/armv7-m/Kconfig
@@ -58,7 +58,7 @@ config ARMV7M_USEBASEPRI
 		Though, these hardfaults are properly handled by the RTOS, the
 		hardfaults can confuse some debuggers. With the BASEPRI
 		register, these hardfaults, will be avoided. For more details see
-		http://www.nuttx.org/doku.php?id=wiki:nxinternal:svcall
+		https://cwiki.apache.org/confluence/display/NUTTX/ARMv7-M+Hardfaults%2C+SVCALL%2C+and+Debuggers
 
 		WARNING:  If CONFIG_ARCH_HIPRI_INTERRUPT is selected, then you
 		MUST select CONFIG_ARMV7M_USEBASEPRI.  The Kconfig dependencies
diff --git a/arch/arm/src/armv8-m/Kconfig b/arch/arm/src/armv8-m/Kconfig
index dfe745b..8627da1 100644
--- a/arch/arm/src/armv8-m/Kconfig
+++ b/arch/arm/src/armv8-m/Kconfig
@@ -57,7 +57,7 @@ config ARMV8M_USEBASEPRI
 		Though, these hardfaults are properly handled by the RTOS, the
 		hardfaults can confuse some debuggers. With the BASEPRI
 		register, these hardfaults, will be avoided. For more details see
-		http://www.nuttx.org/doku.php?id=wiki:nxinternal:svcall
+		https://cwiki.apache.org/confluence/display/NUTTX/ARMv7-M+Hardfaults%2C+SVCALL%2C+and+Debuggers
 
 		WARNING:  If CONFIG_ARCH_HIPRI_INTERRUPT is selected, then you
 		MUST select CONFIG_ARMV8M_USEBASEPRI.  The Kconfig dependencies
diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c
index f0aaba1..2f9f96c 100644
--- a/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -692,7 +692,7 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud,
    * The fractional divider, BRFA, is a 5 bit fractional value that is
    * logically added to the SBR:
    *
-   *   UART baud rate = clock / (16 � (SBR + BRFD))
+   *   UART baud rate = clock / (16 * (SBR + BRFD))
    *
    * The BRFA the remainder.  This will be a non-negative value since the SBR
    * was calculated by truncation.
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_i2s.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_i2s.h
index 0cd43c2..92ab076 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_i2s.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_i2s.h
@@ -114,8 +114,8 @@
 #define I2S_DAI_WSHALFPER_SHIFT         (6)       /* Bits 6-14: Word select half period minus 1 */
 #define I2S_DAI_WSHALFPER_MASK          (0x01ff << I2S_DAI_WSHALFPER_SHIFT)
                                                   /* Bits 15-31: Reserved */
-/* Transmit FIFO: 8 � 32-bit transmit FIFO */
-/* Receive FIFO: 8 � 32-bit receive FIFO */
+/* Transmit FIFO: 8 - 32-bit transmit FIFO */
+/* Receive FIFO: 8 - 32-bit receive FIFO */
 
 /* Status Feedback Register */
 
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index 3249a5f..049f287 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -812,7 +812,7 @@ static int up_interrupt(int irq, void *context, void *arg)
  *     RS-485/EIA-485 Auto Address Detection (AAD) mode -- NOT supported
  *
  *       In this mode, the receiver will compare any address byte received
- *       (parity = �1�) to the 8-bit value programmed into the RS485ADRMATCH
+ *       (parity = 1) to the 8-bit value programmed into the RS485ADRMATCH
  *       register.  When a matching address character is detected it will be
  *       pushed onto the RXFIFO along with the parity bit, and the receiver
  *       will be automatically enabled.
diff --git a/boards/README.txt b/boards/README.txt
index 719f7db..671b4cf 100644
--- a/boards/README.txt
+++ b/boards/README.txt
@@ -160,10 +160,6 @@ any time using that tool or, more appropriately, the wrapper script at
 nuttx/tools/mkconfigvars.sh.  That script will generate the file
 nuttx/Documentation/NuttXConfigVariables.html.
 
-The version of NuttXConfigVariables.html for the last released version of
-NuttX can also be found online at:
-http://nuttx.org/Documentation/NuttXConfigVariables.html.
-
 Supported Boards
 ^^^^^^^^^^^^^^^^
 
@@ -228,8 +224,8 @@ boards/hc/m9s12/demo9s12ne64
   is code complete but has not yet been verified.
 
 boards/arm/tiva/dk-tm4c129x
-  This is the port of NuttX to the Tiva� DK-TM4C129x Connected Development Kit.  The
-  Tiva� DK-TM4C129x features the TM4C129XNCZAD MCU.
+  This is the port of NuttX to the Tiva DK-TM4C129x Connected Development Kit.  The
+  Tiva DK-TM4C129x features the TM4C129XNCZAD MCU.
 
 boards/arm/lpc31xx/ea3131
   Embedded Artists EA3131 Development board.  This board is based on the
@@ -338,8 +334,8 @@ boards/arm/tiva/lm3s8962-ek
 
 boards/arm/tiva/lm4f120-launchpad
   This is the port of NuttX to the Stellaris LM4F120 LaunchPad.  The
-  Stellaris� LM4F120 LaunchPad Evaluation Board is a low-cost evaluation
-  platform for ARM� Cortex�-M4F-based microcontrollers from Texas
+  Stellaris LM4F120 LaunchPad Evaluation Board is a low-cost evaluation
+  platform for ARM Cortex-M4F-based microcontrollers from Texas
   Instruments.
 
 boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768
@@ -826,15 +822,15 @@ boards/arm/kl/teensy-lc
   based bootloader.
 
 boards/arm/tiva/tm4c123g-launchpad
-  This is the port of NuttX to the Tiva� TM4C123G LaunchPad.  The
-  Tiva� TM4C123G LaunchPad Evaluation Board is a low-cost evaluation
-  platform for ARM� Cortex�-M4F-based microcontrollers from Texas
+  This is the port of NuttX to the Tiva TM4C123G LaunchPad.  The
+  Tiva TM4C123G LaunchPad Evaluation Board is a low-cost evaluation
+  platform for ARM Cortex-M4F-based microcontrollers from Texas
   Instruments.
 
 boards/arm/tiva/tm4c1294-launchpad
-  This is the port of NuttX to the Tiva� TM4C1294 LaunchPad.  The
-  Tiva� TM4C123G LaunchPad Evaluation Board is a low-cost evaluation
-  platform for ARM� Cortex�-M4F-based microcontrollers from Texas
+  This is the port of NuttX to the Tiva TM4C1294 LaunchPad.  The
+  Tiva TM4C123G LaunchPad Evaluation Board is a low-cost evaluation
+  platform for ARM Cortex-M4F-based microcontrollers from Texas
   Instruments.
 
 boards/arm/tmx570/tms570ls31x-usb-kit
diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
index 87367ee..c2e468c 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
@@ -100,7 +100,6 @@ CONFIG_NSH_DISABLE_TELNETD=y
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
 CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072
-CONFIG_NSH_WGET_USERAGENT="NuttX/7.2x.x (; http://www.nuttx.org/)"
 CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y
 CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072
 CONFIG_PATH_INITIAL="/mnt/sd0/bin"
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
index dc1f819..6f824ae 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
@@ -103,7 +103,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_DISABLE_NSLOOKUP=y
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_WGET_USERAGENT="NuttX/7.2x.x (; http://www.nuttx.org/)"
 CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y
 CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072
 CONFIG_PATH_INITIAL="/mnt/sd0/bin"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
index 4ad86a0..7aa6eda 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
@@ -124,7 +124,6 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=128
 CONFIG_NSH_MAXARGUMENTS=10
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_WGET_USERAGENT="NuttX/7.2x.x (; http://www.nuttx.org/)"
 CONFIG_NX=y
 CONFIG_NXFONT_MONO5X8=y
 CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sd1"
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
index dc6c523..9a09a07 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
@@ -128,7 +128,6 @@ CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_LINELEN=128
 CONFIG_NSH_MAXARGUMENTS=10
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_WGET_USERAGENT="NuttX/7.2x.x (; http://www.nuttx.org/)"
 CONFIG_NUTTX_USERSPACE=0x05020000
 CONFIG_NX=y
 CONFIG_NXFONT_MONO5X8=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
index 1ff3134..4887b02 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
@@ -129,7 +129,6 @@ CONFIG_NSH_LINELEN=128
 CONFIG_NSH_MAXARGUMENTS=10
 CONFIG_NSH_READLINE=y
 CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072
-CONFIG_NSH_WGET_USERAGENT="NuttX/7.2x.x (; http://www.nuttx.org/)"
 CONFIG_NX=y
 CONFIG_NXFONT_MONO5X8=y
 CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sd1"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt
index 53e5b8d..e94101b 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt
@@ -135,11 +135,11 @@ Olimex LPC1766-STK development board
    LDS176 controller but it is 100% compatible with the Philips PCF8833).
    So how do you tell which controller you have? Some message boards have
    suggested that the LCD display be disassembled and the controller chip
-   measured with a digital caliper � well that�s getting a bit extreme.
+   measured with a digital caliper well that's getting a bit extreme.
 
-  "Here�s what I know. The Olimex boards have both display controllers
-   possible; if the LCD has a GE-12 sticker on it, it�s a Philips PCF8833.
-   If it has a GE-8 sticker, it�s an Epson controller. The older Sparkfun
+  "Here's what I know. The Olimex boards have both display controllers
+   possible; if the LCD has a GE-12 sticker on it, it's a Philips PCF8833.
+   If it has a GE-8 sticker, it's an Epson controller. The older Sparkfun
    6100 displays were Epson, their web site indicates that the newer ones
    are an Epson clone. Sparkfun software examples sometimes refer to the
    Philips controller so the whole issue has become a bit murky. The
@@ -927,7 +927,7 @@ Configuration Sub-Directories
     2015-06-02.  Do to issues introduced by recent versions of GCC, NXFLAT
       is not often usable.
 
-      See http://www.nuttx.org/doku.php?id=wiki:vfs:nxflat#toolchain_compatibility_problem
+      See https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=139630111
 
   usbserial:
     This configuration directory exercises the USB serial class
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
index 16d0d74..d99eac2 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
@@ -88,7 +88,6 @@ CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NSH_STRERROR=y
 CONFIG_NSH_TELNET_LOGIN=y
-CONFIG_NSH_WGET_USERAGENT="NuttX/7.xx.x (; http://www.nuttx.org/)"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x10000000
diff --git a/boards/arm/lpc31xx/ea3131/README.txt b/boards/arm/lpc31xx/ea3131/README.txt
index ccfd1e2..7764c9d 100644
--- a/boards/arm/lpc31xx/ea3131/README.txt
+++ b/boards/arm/lpc31xx/ea3131/README.txt
@@ -584,7 +584,7 @@ Configuration Sub-Directories
   pgnsh
 
     This is the same configuration as nsh, but with On-Demand
-    paging enabled.  See http://www.nuttx.org/Documentation/NuttXDemandPaging.html.
+    paging enabled.  See https://nuttx.apache.org/docs/latest/components/paging.html.
     This configuration is an experiment for the purposes of test
     and debug.  At present, this does not produce functioning,
     usable system
diff --git a/boards/arm/sam34/flipnclick-sam3x/README.txt b/boards/arm/sam34/flipnclick-sam3x/README.txt
index fa80083..03871c3a 100644
--- a/boards/arm/sam34/flipnclick-sam3x/README.txt
+++ b/boards/arm/sam34/flipnclick-sam3x/README.txt
@@ -441,8 +441,6 @@ Loading Code
    https://www.olimex.com/Products/ARM/JTAG/ARM-JTAG-20-10/ .  I have been
    loading code and debugging with no problems using JTAG.
 
-   You can find photos my setup here: http://www.nuttx.org/doku.php?id=wiki:howtos:flipnclick-sam3x
-
 Flip&Click SAM3X-specific Configuration Options
 ===============================================
 
diff --git a/boards/arm/sama5/sama5d2-xult/README.txt b/boards/arm/sama5/sama5d2-xult/README.txt
index d293bdd..d5b2755 100644
--- a/boards/arm/sama5/sama5d2-xult/README.txt
+++ b/boards/arm/sama5/sama5d2-xult/README.txt
@@ -817,7 +817,7 @@ Configurations
 
     4. This configuration supports logging of debug output to a circular
        buffer in RAM.  This feature is discussed fully in this Wiki page:
-       http://nuttx.org/doku.php?id=wiki:howtos:syslog . Relevant
+       https://cwiki.apache.org/confluence/display/NUTTX/SYSLOG . Relevant
        configuration settings are summarized below:
 
        File System:
diff --git a/boards/arm/sama5/sama5d2-xult/include/board_498mhz.h b/boards/arm/sama5/sama5d2-xult/include/board_498mhz.h
index 010687b..de15eb4 100644
--- a/boards/arm/sama5/sama5d2-xult/include/board_498mhz.h
+++ b/boards/arm/sama5/sama5d2-xult/include/board_498mhz.h
@@ -97,7 +97,7 @@
 
 #define BOARD_ADC_PRESCAL          (7)
 #define BOARD_TSD_STARTUP          (40)        /* 40 nanoseconds */
-#define BOARD_TSD_TRACKTIM         (2000)      /* Min 1�s at 8MHz */
+#define BOARD_TSD_TRACKTIM         (2000)      /* Min 1us at 8MHz */
 #define BOARD_TSD_DEBOUNCE         (10000000)  /* 10 milliseconds (units nanoseconds) */
 
 /* Resulting frequencies */
diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c b/boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c
index 6452440..989014c 100644
--- a/boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c
+++ b/boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c
@@ -166,7 +166,7 @@ void weak_function sam_netinitialize(void)
    * (MICREL KSZ9021/31) operating at 10/100/1000 Mbps.
    * The board supports RGMII interface mode.
    * The Ethernet interface consists of 4 pairs of low voltage differential
-   * pair signals designated from GRX� and GTx� plus control signals for
+   * pair signals designated from GRX and GTx plus control signals for
    * link activity indicators. These signals can be used to connect to a
    * 10/100/1000 BaseT RJ45 connector integrated on the main board.
    *
diff --git a/boards/arm/sama5/sama5d4-ek/README.txt b/boards/arm/sama5/sama5d4-ek/README.txt
index ee4bed8..3f143a7 100644
--- a/boards/arm/sama5/sama5d4-ek/README.txt
+++ b/boards/arm/sama5/sama5d4-ek/README.txt
@@ -3032,9 +3032,9 @@ TM7000 LCD/Touchscreen
 
     - 7 inch LCD at 800x480 18-bit RGB resolution and white backlight
     - Projected Capacitive Multi-Touch Controller based on the Atmel
-      MXT768E maXTouch� IC
-    - 4 Capacitive �Navigation� Keys available via an Atmel AT42QT1070
-      QTouch� Button Sensor IC
+      MXT768E maXTouch IC
+    - 4 Capacitive Navigation Keys available via an Atmel AT42QT1070
+      QTouch Button Sensor IC
     - 200 bytes of non-volatile serial EEPROM
 
   NOTE: It appears that my TM7000 differs slightly from the version
@@ -3873,7 +3873,7 @@ Configurations
                  task_create() as it is used in the ELF test, but the code
                  seems to survive it. See:
 
-                 http://www.nuttx.org/doku.php?id=wiki:nxinternal:memconfigs#task_create
+                 https://cwiki.apache.org/confluence/display/NUTTX/Memory+Configurations
 
       2014-8-29: System call interface verified.
       2014-9-16: Reverified after fixing changes for the knsh configuration
@@ -4243,7 +4243,7 @@ Configurations
 
     4. This configuration supports logging of debug output to a circular
        buffer in RAM.  This feature is discussed fully in this Wiki page:
-       http://nuttx.org/doku.php?id=wiki:howtos:syslog . Relevant
+       https://cwiki.apache.org/confluence/display/NUTTX/SYSLOG . Relevant
        configuration settings are summarized below:
 
        Device Drivers:
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index 5c6d62c..3b2fe89 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -1873,7 +1873,7 @@ Configuration sub-directories
 
     6. This configuration supports logging of debug output to a circular
        buffer in RAM.  This feature is discussed fully in this Wiki page:
-       http://nuttx.org/doku.php?id=wiki:howtos:syslog . Relevant
+       https://cwiki.apache.org/confluence/display/NUTTX/SYSLOG . Relevant
        configuration settings are summarized below:
 
        Device Drivers:
diff --git a/boards/arm/stm32/clicker2-stm32/README.txt b/boards/arm/stm32/clicker2-stm32/README.txt
index 13c9f02..8ce3d3c 100644
--- a/boards/arm/stm32/clicker2-stm32/README.txt
+++ b/boards/arm/stm32/clicker2-stm32/README.txt
@@ -401,7 +401,7 @@ Configurations
     4. This configuration does NOT have USART3 output enabled.  This
        configuration supports logging of debug output to a circular
        buffer in RAM.  This feature is discussed fully in this Wiki page:
-       http://nuttx.org/doku.php?id=wiki:howtos:syslog . Relevant
+       https://cwiki.apache.org/confluence/display/NUTTX/SYSLOG . Relevant
        configuration settings are summarized below:
 
        Device Drivers:
diff --git a/boards/arm/stm32/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt
index 37b07a8..469b9b9 100644
--- a/boards/arm/stm32/stm32f4discovery/README.txt
+++ b/boards/arm/stm32/stm32f4discovery/README.txt
@@ -1760,7 +1760,7 @@ Configuration Sub-directories
             not be possible.
          b) Develop a strategy to manage CCM memory and DMA memory.  Look
             at this discussion on the NuttX Wiki:
-            http://www.nuttx.org/doku.php?id=wiki:howtos:stm32-ccm-alloc
+            https://cwiki.apache.org/confluence/display/NUTTX/STM32+CCM+Allocator
 
        To put the CCM memory back into the heap you would need to change
        the following in the NuttX configuration:
@@ -2142,8 +2142,8 @@ Configuration Sub-directories
      There are some issues with the presentation... some tuning of the
      configuration could fix that.  Lower resolution displays are also more
      subject to the "fat, flat line bug" that I need to fix someday.  See
-     http://www.nuttx.org/doku.php?id=wiki:graphics:nxgraphics for a description
-     of the fat, flat line bug.
+     https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=139629474
+     for a description of the fat, flat line bug.
 
   pm:
   --
diff --git a/boards/arm/stm32f7/stm32f746g-disco/README.txt b/boards/arm/stm32f7/stm32f746g-disco/README.txt
index eeefe8d..51f1c89 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/README.txt
+++ b/boards/arm/stm32f7/stm32f746g-disco/README.txt
@@ -140,7 +140,7 @@ Porting STM32 F4 Drivers
   and, as a result, we need to exercise much more care to maintain cache
   coherency.  There is a Wiki page discussing the issues of porting
   drivers from the stm32/ to the stm32f7/ directories here:
-  http://www.nuttx.org/doku.php?id=wiki:howtos:port-drivers_stm32f7
+  https://cwiki.apache.org/confluence/display/NUTTX/Porting+Drivers+to+the+STM32+F7
 
 FPU
 ===
diff --git a/boards/z16/z16f/z16f2800100zcog/README.txt b/boards/z16/z16f/z16f2800100zcog/README.txt
index 9f7be4e..bd8aea3 100644
--- a/boards/z16/z16f/z16f2800100zcog/README.txt
+++ b/boards/z16/z16f/z16f2800100zcog/README.txt
@@ -186,7 +186,7 @@ nsh
 ---
   nsh:
     This configuration directory will built the NuttShell (NSH).  See
-    the NSH user manual in the documents directory (or online at nuttx.org).
+    the NSH user manual in the documents directory (or online at apache.nuttx.org).
     See also the README.txt file in the nsh sub-directory for information
     about using ZDS-II.