NuttX graduated the Incubator; update repository links

2022-11-22 13:59:48 -05:00 · 2022-11-22 13:59:48 -05:00 · 03802dad13
commit 03802dad13
parent 83a4b45dd4
36 changed files with 3447 additions and 3447 deletions
--- a/.github/actions/ci-container/action.yaml
+++ b/.github/actions/ci-container/action.yaml
@ -18,7 +18,7 @@ inputs:
    required: true
 runs:
  using: 'docker'
-  image: 'ghcr.io/apache/incubator-nuttx/apache-nuttx-ci-linux'
+  image: 'ghcr.io/apache/nuttx/apache-nuttx-ci-linux'
  args:
    - "/bin/bash"
    - "-ce"
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -66,13 +66,13 @@ jobs:
            # Determine the repo and leave that unset to use the normal checkout behavior
            # of using the merge commit instead of HEAD
            case $GITHUB_REPOSITORY in
-              "apache/incubator-nuttx")
+              "apache/nuttx")
                # OS
                echo "Triggered by change in OS"
                APPS_REF=$REF_NAME
                ;;

-              "apache/incubator-nuttx-apps" )
+              "apache/nuttx-apps" )
                # APPS
                OS_REF=$REF_NAME
                echo "Triggered by change in APPS"
@ -90,7 +90,7 @@ jobs:
      - name: Checkout nuttx repo
        uses: actions/checkout@v3
        with:
-          repository: apache/incubator-nuttx
+          repository: apache/nuttx
          ref: ${{ steps.gittargets.outputs.os_ref }}
          path: sources/nuttx
          fetch-depth: 1
@ -100,7 +100,7 @@ jobs:
      - name: Checkout apps repo
        uses: actions/checkout@v3
        with:
-          repository: apache/incubator-nuttx-apps
+          repository: apache/nuttx-apps
          ref: ${{ steps.gittargets.outputs.apps_ref }}
          path: sources/apps
          fetch-depth: 1
@ -142,7 +142,7 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Docker Pull
-        run: docker pull ghcr.io/apache/incubator-nuttx/apache-nuttx-ci-linux
+        run: docker pull ghcr.io/apache/nuttx/apache-nuttx-ci-linux

      - name: Export NuttX Repo SHA
        run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@ -32,7 +32,7 @@ jobs:
      - name: Checkout nuttx repo
        uses: actions/checkout@v3
        with:
-          repository: apache/incubator-nuttx
+          repository: apache/nuttx
          path: nuttx
          fetch-depth: 0

--- a/Documentation/applications/index.rst
+++ b/Documentation/applications/index.rst
@ -5,7 +5,7 @@
 Applications
 ============

-NuttX ships a large number of applications covering a wide spectrum of functionality. These can be found in the `apps <https://github.com/apache/incubator-nuttx-apps>`_ repository. At the moment, these are documented in their individual README files so you can find more information at the repository.
+NuttX ships a large number of applications covering a wide spectrum of functionality. These can be found in the `apps <https://github.com/apache/nuttx-apps>`_ repository. At the moment, these are documented in their individual README files so you can find more information at the repository.

 .. toctree::
   :maxdepth: 2
--- a/Documentation/applications/nsh/login.rst
+++ b/Documentation/applications/nsh/login.rst
@ -254,10 +254,10 @@ Then create/re-create the ``nsh_romfsimg.h`` file as described below.

 There is a good example of how to do this in the NSH simulation
 configuration at
-`boards/sim/sim/sim/configs/nsh <https://github.com/apache/incubator-nuttx/blob/master/boards/sim/sim/sim/configs/nsh/>`__.
+`boards/sim/sim/sim/configs/nsh <https://github.com/apache/nuttx/blob/master/boards/sim/sim/sim/configs/nsh/>`__.
 The ROMFS support files are provided at
-`boards/sim/include <https://github.com/apache/incubator-nuttx/blob/master/boards/sim/sim/sim/include/>`__
+`boards/sim/include <https://github.com/apache/nuttx/blob/master/boards/sim/sim/sim/include/>`__
 and the
-`README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/sim/sim/sim/README.txt>`__
+`README.txt <https://github.com/apache/nuttx/blob/master/boards/sim/sim/sim/README.txt>`__
 file at the location provides detailed information about creating and
 modifying the ROMFS file system.
--- a/Documentation/components/drivers/character/timer.rst
+++ b/Documentation/components/drivers/character/timer.rst
@ -56,7 +56,7 @@ Timer Example

 The previously selected example will basically consult the timer status, set a timer alarm interval, set a timer signal handler function to be notified at the alarm, which only increments a variable, and then it will start the timer. The application will periodically consult the timer status at the sample rate previously configured through the ``menuconfig`` to follow the time left until the timer expires. After the samples have been read, the application stops de timer.

-The `example code <https://github.com/apache/incubator-nuttx-apps/blob/master/examples/timer/timer_main.c>`_  may be explored, its path is at ``/examples/timer/timer_main.c`` in the apps' repository.
+The `example code <https://github.com/apache/nuttx-apps/blob/master/examples/timer/timer_main.c>`_  may be explored, its path is at ``/examples/timer/timer_main.c`` in the apps' repository.

 In NuttX, the timer driver is a character driver and when a chip supports multiple timers, each one is accessible through its respective file in ``/dev`` directory. Each timer is registered using a unique numeric identifier (i.e. ``/dev/timer0``, ``/dev/timer1``, ...).

--- a/Documentation/components/drivers/character/watchdog.rst
+++ b/Documentation/components/drivers/character/watchdog.rst
@ -82,7 +82,7 @@ The previously selected example will basically do the following:
 * Ping (feed the dog) during the ``pingtime`` with a delay of ``pingdelay`` and print out the wdt status in case debug was enabled.
 * Enter into an endless loop without pinging. It will cause the watchdog timer to reset the chip on timeout, i.e., after timer expiration.

-The `example code <https://github.com/apache/incubator-nuttx-apps/blob/master/examples/watchdog/watchdog_main.c>`_  may be explored, its path is at ``/examples/watchdog/watchdog_main.c`` in the apps' repository.
+The `example code <https://github.com/apache/nuttx-apps/blob/master/examples/watchdog/watchdog_main.c>`_  may be explored, its path is at ``/examples/watchdog/watchdog_main.c`` in the apps' repository.

 In NuttX, the watchdog timer driver is a character driver and when a chip supports multiple watchdog timers, each one is accessible through its respective special file in ``/dev`` directory. Each watchdog timer is registered using a unique numeric identifier (i.e. ``/dev/watchdog0``, ``/dev/watchdog1``, ...).

--- a/Documentation/components/nxflat.rst
+++ b/Documentation/components/nxflat.rst
@ -32,7 +32,7 @@ support execution NXFLAT binaries from an SRAM copy as well.
 This NuttX feature includes:

  - A dynamic loader that is built into the NuttX core (See
-    `GIT <https://github.com/apache/incubator-nuttx/blob/master/binfmt/>`__).
+    `GIT <https://github.com/apache/nuttx/blob/master/binfmt/>`__).
  - Minor changes to RTOS to support position independent code, and
  - A linker to bind ELF binaries to produce the NXFLAT binary format
    (See GIT).
@ -126,7 +126,7 @@ Development Status
 The initial release of NXFLAT was made in NuttX version 0.4.9. Testing
 is limited to the tests found under ``apps/examples/nxflat`` in the
 source tree. Some known problems exist (see the
-`TODO <https://github.com/apache/incubator-nuttx/blob/master/TODO>`__ list). As
+`TODO <https://github.com/apache/nuttx/blob/master/TODO>`__ list). As
 such, NXFLAT is currently in an early alpha phase.

 NXFLAT Toolchain
@ -243,7 +243,7 @@ Making an NXFLAT module

 Below is a snippet from an NXFLAT make file (simplified from NuttX
 `Hello,
-World! <https://github.com/apache/incubator-nuttx-apps/blob/master/examples/nxflat/tests/hello/Makefile>`__
+World! <https://github.com/apache/nuttx-apps/blob/master/examples/nxflat/tests/hello/Makefile>`__
 example).

 * Target 1:
--- a/Documentation/components/nxgraphics/appendix.rst
+++ b/Documentation/components/nxgraphics/appendix.rst
@ -488,7 +488,7 @@ configurations for building the simulation:
      install an X11 development package.

   -  Refer to the readme file in sim configuration
-      `README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/sim/sim/sim/README.txt>`__
+      `README.txt <https://github.com/apache/nuttx/blob/master/boards/sim/sim/sim/README.txt>`__
      file for additional information.

 **Test Coverage**. At present, ``apps/examples/nx``\ t only exercises a
--- a/Documentation/contributing/making-changes.rst
+++ b/Documentation/contributing/making-changes.rst
@ -32,28 +32,28 @@ Here's how to do it:

   Visit both these links and hit the Fork button in the upper right of the page:

-   * `NuttX <https://github.com/apache/incubator-nuttx/>`_
-   * `NuttX Apps <https://github.com/apache/incubator-nuttx-apps/>`_
+   * `NuttX <https://github.com/apache/nuttx/>`_
+   * `NuttX Apps <https://github.com/apache/nuttx-apps/>`_

 #. Clone the Repositories

-   On the GitHub web page for your forked ``incubator-nuttx`` project, copy the clone url – get it by hitting the
+   On the GitHub web page for your forked ``nuttx`` project, copy the clone url – get it by hitting the
   green ``Clone or Download`` button in the upper right. Then do this:

    .. code-block:: bash

-       $ git clone <your forked incubator-nuttx project clone url> nuttx
+       $ git clone <your forked nuttx project clone url> nuttx
       $ cd nuttx
-       $ git remote add upstream https://github.com/apache/incubator-nuttx.git
+       $ git remote add upstream https://github.com/apache/nuttx.git

-   Do the same for your forked ``incubator-nuttx-apps`` project:
+   Do the same for your forked ``nuttx-apps`` project:

    .. code-block:: bash

       $ cd ..
-       $ git clone <your forked incubator-nuttx-apps project clone url> apps
+       $ git clone <your forked nuttx-apps project clone url> apps
       $ cd apps
-       $ git remote add upstream https://github.com/apache/incubator-nuttx-apps.git
+       $ git remote add upstream https://github.com/apache/nuttx-apps.git

 #. Create a Local Git Branch

@ -147,7 +147,7 @@ maybe doing that several times. Then when everything works, I get my branch read
   Note that there are some bugs in the ``nxstyle`` program that ``checkpatch.sh`` uses, so
   it may report a few errors that are not actually errors. The committers will help you
   find these. (Or view the
-   `nxstyle Issues <https://github.com/apache/incubator-nuttx/issues?q=is%3Aissue+is%3Aopen+nxstyle>`_.)
+   `nxstyle Issues <https://github.com/apache/nuttx/issues?q=is%3Aissue+is%3Aopen+nxstyle>`_.)
   |br|
   |br|

--- a/Documentation/introduction/detailed_support.rst
+++ b/Documentation/introduction/detailed_support.rst
@ -229,7 +229,7 @@ There are ports to two Microchip SAMA5D3 boards:
   *Tickless* operation.

   Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/sama5/sama5d3x-ek/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/sama5/sama5d3x-ek/README.txt>`__
   file for further information.

 **Microchip SAMA5D3 Xplained development board** This is the port of NuttX
@ -251,7 +251,7 @@ does not have NOR FLASH and, as a consequence NuttX must boot into SDRAM
 with the help of U-Boot.

 Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/sama5/sama5d3-xplained/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/sama5/sama5d3-xplained/README.txt>`__
 file for further information.

 Microchip SAMA5D4
@ -276,7 +276,7 @@ There is a port in progress on one Microchip SAMA5D4 board:
   that larger display. Support for a graphics media player is included
   (although there were issues with the WM8904 audio CODEC on my board).
   An SRAM bootloader was also included. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/sama5/sama5d4-ek/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/sama5/sama5d4-ek/README.txt>`__
   file for current status.

 **Development Environments:** 1) Linux with native Linux GNU toolchain,
@ -301,7 +301,7 @@ have are supported by NuttX:
   board, but the others may be compatible:

   Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/a1x/pcduino-a10/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/a1x/pcduino-a10/README.txt>`__
   file for further information.

   **STATUS**. This port was an experiment was was not completely
@ -332,7 +332,7 @@ AM335x are supported by NuttX:
   -  **NuttX-7.31**. An LCD driver was added in NuttX-7.31.

   Refer to the Beaglebone Black board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/am335x/beaglebone-black/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/am335x/beaglebone-black/README.txt>`__
   file for further, up-to-date information.

 ARM Cortex-A53
@ -355,7 +355,7 @@ The basic port has been completed for the following i.MX6 board:

 -  **Sabre-6Quad**. This is a port to the NXP/Freescale Sabre-6Quad
   board. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/imx6/sabre-6quad/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/imx6/sabre-6quad/README.txt>`__
   file for further information.

   **STATUS:** The basic, minimal port is code complete and introduced
@ -367,7 +367,7 @@ The basic port has been completed for the following i.MX6 board:
   Basic support of NuttX running in SMP mode on the i.MX6Q was also
   accomplished in NuttX-7.16. However, there are still known issues
   with SMP support on this platform as described in the
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/imx6/sabre-6quad/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/imx6/sabre-6quad/README.txt>`__
   file for the board.

 ARM Cortex-R4
@ -401,7 +401,7 @@ This initial support is very minimal: There is a NuttShell
 (: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://github.com/apache/incubator-nuttx/blob/master/boards/arm/nuc1xx/nutiny-nuc120/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/nuc1xx/nutiny-nuc120/README.txt>`__
 file for further information.

 **Memory Usage**. For a full-featured RTOS such as NuttX, providing
@ -559,7 +559,7 @@ Header file support was contributed by Tiago
 Maluta for this part. Jose Pablo Rojas V. is used those header file
 changes to port NuttX to the TI/Stellaris EKK-LM3S9B96. That port was
 available in the NuttX-6.20 release. Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/tiva/ekk-lm3s9b96/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/tiva/ekk-lm3s9b96/README.txt>`__
 file for further information.

 TI/SimpleLink CC13x0
@ -596,7 +596,7 @@ This is a port for the Silicon Laboratories' EFM32
   supported are included, but not fully tested.

   Refer to the EFM32 Gecko Starter Kit
-   `README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/efm32/efm32-g8xx-stk/README.txt>`__
+   `README.txt <https://github.com/apache/nuttx/blob/master/boards/arm/efm32/efm32-g8xx-stk/README.txt>`__
   file for further information.

 #. **Olimex EFM32G880F120-STK**. This board features:
@ -617,7 +617,7 @@ This is a port for the Silicon Laboratories' EFM32
   required to make further progress in testing.

   Refer to the Olimex EFM32G880F120-STK
-   `README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/efm32/olimex-efm32g880f128-stk/README.txt>`__
+   `README.txt <https://github.com/apache/nuttx/blob/master/boards/arm/efm32/olimex-efm32g880f128-stk/README.txt>`__
   for further information.

 SiLabs EFM32 Giant Gecko
@ -694,7 +694,7 @@ 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
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/stm32ldiscovery/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/stm32ldiscovery/README.txt>`__
 file for further information.

 **Memory Usage**.
@ -764,11 +764,11 @@ to two different STM32 L0 boards in the repository:

 -  **Nucleo-G071RB** Initial support for Nucleo-G071RB was contributed
   by Mateusz Szafoni in NuttX-7.31. Refer to the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32f0l0g0/nucleo-g071rb/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32f0l0g0/nucleo-g071rb/README.txt>`__
   file for further information.
 -  **Nucleo-G070RB** Contributed by Daniel Pereira Volpato. in
   NuttX-8.2. Refer to the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32f0l0g0/nucleo-g070rb/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32f0l0g0/nucleo-g070rb/README.txt>`__
   file for further information.

 **STATUS:** Status for the STM32F0xx, STM32L0xx, and STM32G0xx is shown
@ -806,7 +806,7 @@ STMicro STM32 F100x
   STM32VL-Discovery board was contributed by Alan Carvalho de Assis.
   The STM32VL-Discovery board features an STM32F100RB MCU. Refer to the
   NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/stm32vldiscovery/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/stm32vldiscovery/README.txt>`__
   file for further information.

 STMicro STM32 F102x
@ -846,18 +846,18 @@ include:
 #. **STM3210E-EVAL**. A port for the `STMicro <http://www.st.com/>`__
   STM3210E-EVAL development board that features the STM32F103ZET6 MCU.
   Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/stm3210e-eval/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/stm3210e-eval/README.txt>`__
   file for further information.

 #. **HY-Mini STM32v board**. This board is based on the STM32F103VCT
   chip. Port contributed by Laurent Latil. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/hymini-stm32v/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/hymini-stm32v/README.txt>`__
   file.

 #. **The M3 Wildfire development board (STM32F103VET6), version 2**. See
   http://firestm32.taobao.com (the current board is version 3). Refer
   to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/fire-stm32v2/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/fire-stm32v2/README.txt>`__
   file for further information.

 #. **LeafLab's Maple and Maple Mini boards**. These boards are based on
@ -865,7 +865,7 @@ include:
   STM32F103CBT6 for the mini version. See the
   `LeafLabs <http://leaflabs.com/docs/hardware/maple.html>`__ web site
   for hardware information; see the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/maple/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/maple/README.txt>`__
   file for further information about the NuttX port.

 #. **Olimexino-STM32**. This port uses the Olimexino STM32 board
@ -952,7 +952,7 @@ STMicro STM32F107VCT MCU was added in NuttX-6.22.
 **STATUS:** In progress. The following have been verified: (1) Basic
 Cortex-M3 port, (2) Ethernet, (3) On-board LEDs. Refer to the NuttX
 board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/shenzhou/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/shenzhou/README.txt>`__
 file for further information.

 **ViewTool STM32F103/F107** Support for the Viewtool
@ -973,7 +973,7 @@ Three configurations are available:
 **STATUS:** Networking and touchscreen support are well test. But, at
 present, neither USB nor LCD functionality have been verified. Refer to
 the Viewtool STM32F103/F107
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/viewtool-stm32f107/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/viewtool-stm32f107/README.txt>`__
 file for further information.

 **Kamami STM32 Butterfly 2** Support for the `Kamami STM32 Butterfly
@ -1001,7 +1001,7 @@ support.
 board support includes buttons, LEDS, IWDG, USB OTG HS, and procfs
 support. Configurations available for nsh, usbnsh, and wlan
 configurations. See the Photon
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/photon/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/photon/README.txt>`__
 file for additional information.

 STMicro STM32 F207x
@ -1123,7 +1123,7 @@ boards.

   -  Support for the mbed board was contributed by Dave Marples and
      released in NuttX-5.11. Refer to the NuttX board
-      `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc17xx_40xx/mbed/README.txt>`__
+      `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc17xx_40xx/mbed/README.txt>`__
      file for further information.

 #. **Olimex LPC1766-STK**
@ -1138,7 +1138,7 @@ boards.
   -  The NuttX-5.17 released added support for low-speed USB devices,
      interrupt endpoints, and a *USB host HID keyboard class driver*.
   -  Refer to the NuttX board
-      `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt>`__
+      `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt>`__
      file for further information.

   Verified configurations are now available for the NuttShell with
@ -1159,7 +1159,7 @@ boards.
   Verified configurations include DHCPD, the NuttShell (NSH), NuttX
   graphis (NX), THTTPD, and USB mass storage device. Refer to the NuttX
   board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/README.txt>`__
   file for further information.

 #. **Zilogic's ZKIT-ARM-1769 board**
@ -1169,7 +1169,7 @@ boards.
   NuttX-6.26. The NuttX Buildroot toolchain is used by default. Verifed
   configurations include the "Hello, World!" example application and a
   THTTPD demonstration. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc17xx_40xx/zkit-arm-1769/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc17xx_40xx/zkit-arm-1769/README.txt>`__
   file for further information.

 #. **Micromint Lincoln60 board with an NXP LPC1769**
@ -1178,7 +1178,7 @@ boards.
   NuttX-6.20. As contributed board support, I am unsure of what all has
   been verfied and what has not. See the Microment website
   and the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc17xx_40xx/lincoln60/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc17xx_40xx/lincoln60/README.txt>`__
   file for further information about the Lincoln board.

 #. **U-Blox Modem Evaluation (LPCXpresso LPC1768)**
@ -1187,7 +1187,7 @@ boards.
   and made available in NuttX-7.15. This is a variant of the LPCXpresso
   LPC1768 board support with special provisions for the U-Blox Model
   Evaluation board. See the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc17xx_40xx/u-blox-c027/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc17xx_40xx/u-blox-c027/README.txt>`__
   file for further information about this port.

 #. **Keil MCB1700 (LPC1768)**
@ -1246,7 +1246,7 @@ Semiconductor <http://www.onsemi.com/PowerSolutions/evalBoard.do?id=LC823450XGEV
 website as are LC823450 `related technical
 documents <http://www.onsemi.com/PowerSolutions/supportDoc.do?type=AppNotes&rpn=LC823450>`__.
 Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lc823450/lc823450-xgevk/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/lc823450/lc823450-xgevk/README.txt>`__
 file for details of the NuttX port.

 This port is intended to test LC823450 features including SMP. Supported
@ -1286,7 +1286,7 @@ This initial porting effort uses the Infineon XMC4500 Relax v1 board as
 described on the manufacturer's
 `website <http://www.infineon.com/cms/en/product/evaluation-boards/KIT_XMC45_RELAX_V1/productType.html?productType=db3a304437849205013813b23ac17763>`__.
 The current status of the board is available in the board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/xmc4/xmc4500-relax/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/xmc4/xmc4500-relax/README.txt>`__
 file

 Nordic Semiconductor NRF52xxx
@ -1360,7 +1360,7 @@ NuttX 7.17. Initial release includes two NSH configurations with support
 for on-board LEDs, buttons, and Ethernet with the on-board KSZ8081 PHY.
 SDHC supported has been integrated, but not verified. Refer to the NuttX
 board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/kinetis/freedom-k64f/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/kinetis/freedom-k64f/README.txt>`__
 file for further information.

 **MK64FN1M0VMD12**. Architecture support for the \_MK64FN1M0VMD12 was
@ -1375,7 +1375,7 @@ by
 `TWR-SER <http://www.nxp.com/pages/serial-usb-ethernet-can-rs232-485-tower-system-module:TWR-SER>`__
 which includes (among other things), an RS232 and Ethernet connections.
 Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/kinetis/twr-k64f120m/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/kinetis/twr-k64f120m/README.txt>`__
 file for further information.

 **Driver Status**.
@ -1398,7 +1398,7 @@ NXP/FreeScale Kinetis K66
 Support for the Kinetis K64 family and
 specifically for the **NXP/Freescale Freedom K66F** board was
 contributed by David Sidrane in NuttX 7.20. Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/kinetis/freedom-k66f/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/kinetis/freedom-k66f/README.txt>`__
 file for further information.

 **Driver Status**.
@ -1468,7 +1468,7 @@ team and David Sidrane).

 Support for the Nucleo-F302R8 board was added by raiden00pl in
 NuttX-7.27. Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/nucleo-f302r8/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/nucleo-f302r8/README.txt>`__
 file for further information.

 STMicro STM32 F303x
@ -1485,13 +1485,13 @@ STMicro STM32 F303x
 -  **STMicro ST Nucleo F303RE board**. The basic port for the Nucleo
   F303RE was contributed by Paul Alexander Patience and first released
   in NuttX-7.12. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/nucleo-f303re/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/nucleo-f303re/README.txt>`__
   file for further information.

 -  **STMicro ST Nucleo F303ZE board**. Support for the Nucleo-F303ZE
   board was added by Mateusz Szafoni in NuttX-7.27. Refer to the NuttX
   board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/nucleo-f303ze/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/nucleo-f303ze/README.txt>`__
   file for further information.

 STMicro STM32 F334
@ -1536,7 +1536,7 @@ further information about this board.
 -  **NuttX-7.25** Architecture support (only) for STMicro STM32F401xB
   and STM32F401xC pars was added.
 -  Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/nucleo-f4x1re/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/nucleo-f4x1re/README.txt>`__
   file for further information.

 STMicro STM32410
@ -1595,7 +1595,7 @@ further information about this board.
   board was added in NuttX-7.29.

 Refer to the STM3240G-EVAL board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/stm3240g-eval/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/stm3240g-eval/README.txt>`__
 file for further information.

 **STMicro STM32F4-Discovery**. This port uses the STMicro
@ -1634,30 +1634,30 @@ on-board peripherals than does the STM32F4-Discovery:
 See the
 `Mikroelektronika <http://www.mikroe.com/mikromedia/stm32-m4/>`__
 website for more information about this board and the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/mikroe-stm32f4/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/mikroe-stm32f4/README.txt>`__
 file for further information about the NuttX port.

 **Olimex STM32 H405**. Support for the Olimex STM32 H405 development
 board was contributed by Martin Lederhilger and appeared in NuttX-7.3.
 See the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/olimex-stm32-h405/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/olimex-stm32-h405/README.txt>`__
 file for further information about the NuttX port.

 **Olimex STM32 H407**. Support for the Olimex STM32 H407 development
 board was contributed by Neil Hancock and appeared in NuttX-7.14. See
 the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/olimex-stm32-h407/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/olimex-stm32-h407/README.txt>`__
 file for further information about the NuttX port.

 **Olimex STM32 E407**. Support for the Olimex STM32 E407 development
 board was contributed by Mateusz Szafoni and appeared in NuttX-7.17.
 Networking configurations were added in NuttX-7.18. See the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/olimex-stm32-e407/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/olimex-stm32-e407/README.txt>`__
 file for further information about the NuttX port.

 **Olimex STM32 P407**. Support for the Olimex STM32 P407 development
 board appeared in NuttX-7.19. See the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/olimex-stm32-p407/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/olimex-stm32-p407/README.txt>`__
 file for further information about the NuttX port.

 **MikroElektronika Clicker2 for STM32**. This is yet another board
@ -1669,7 +1669,7 @@ MRF24J40 Click board for the development of IEEE 802.15.4 MAC and
 See the
 `Mikroelektronika <https://shop.mikroe.com/development-boards/starter/clicker-2/stm32f4>`__
 website for more information about this board and the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/clicker2-stm32/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/clicker2-stm32/README.txt>`__
 file for further information about the NuttX port.

 **OmnibusF4**. Initial support for the OmnibusF4 family of flight
@ -1746,7 +1746,7 @@ Flash memory and 256kbytes.
   board in NuttX 7.16. From Kha Vo.

 Refer to the STM32F429I-Discovery board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/stm32f429i-disco/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/stm32f429i-disco/README.txt>`__
 file for further information.

 STMicro STM32 F433
@ -1784,7 +1784,7 @@ One board is supported in this family:
   the `STMicro
   website <https://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-mpu-eval-tools/stm32-mcu-mpu-eval-tools/stm32-discovery-kits/b-g474e-dpow1.html>`__
   and the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/b-g474e-dpow1/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/b-g474e-dpow1/README.txt>`__
   file for further information.

 **Status**:
@ -1799,12 +1799,12 @@ One board is supported in this family:

 -  **Nucleo-G431RB**. Initial board support for the
   Nucleo-G431RB was added in NuttX-10.0. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/nucleo-g431rb/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/nucleo-g431rb/README.txt>`__
   file for further information.

 -  **B-G431B-ESC1**. Initial board support for the
   B-G431B-ESC1 was added in NuttX-10.0. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32/b-g431b-esc1/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32/b-g431b-esc1/README.txt>`__
   file for further information.

 STMicro STM32 L475
@ -1817,7 +1817,7 @@ One board in supported in this family:
   NuttX-7.22. See the `STMicro
   website <http://www.st.com/en/evaluation-tools/b-l475e-iot01a.html>`__
   and the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32l4/b-l475e-iot01a/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32l4/b-l475e-iot01a/README.txt>`__
   file for further information.

   This board STMicro is powered by STM32L475VG Cortex-M4 and targets
@ -1849,20 +1849,20 @@ Three boards are supported in this family:
   from ST Micro was contributed by Sebastien Lorquet in NuttX-7.15. See
   the `STMicro website <http://www.st.com/nucleo-l476rg>`__ and the
   board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32l4/nucleo-l476rg/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32l4/nucleo-l476rg/README.txt>`__
   file for further information.

 -  **STM32L476VG Discovery**. Board support for the STMicro STM32L476VG
   Discovery board from ST Micro was contributed by Dave in NuttX-7.15.
   See the `STMicro website <http://www.st.com/stm32l476g-disco>`__ and
   the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32l4/stm32l476vg-disco/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32l4/stm32l476vg-disco/README.txt>`__
   file for further information.

 -  **STM32L476 MDK**. Very basic support for NuttX on the Motorola Moto
   Z MDK was contributed by Jim Wylder in NuttX 7.18. A simple NSH
   configuration is available for the STM32L476 chip. See the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32l4/stm32l476-mdk/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32l4/stm32l476-mdk/README.txt>`__
   file for further information.

 **Status**:
@ -1932,7 +1932,7 @@ supported.
   See the `STMicro
   website <http://www.st.com/en/evaluation-tools/nucleo-l432kc.html>`__
   and the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32l4/nucleo-l432kc/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32l4/nucleo-l432kc/README.txt>`__
   file for further information.

 -  **Nucleo-L452RE**. Board support for the STMicro Nucleo-L452RE board
@ -1940,7 +1940,7 @@ supported.
   `STMicro
   website <http://www.st.com/en/evaluation-tools/nucleo-l452re.html>`__
   and the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32l4/nucleo-l452re/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32l4/nucleo-l452re/README.txt>`__
   file for further information.

 See also the status above for the STM32 L476 most of which also applies
@ -1958,7 +1958,7 @@ NuttX-7.21:
   `STMicro
   website <http://www.st.com/en/evaluation-tools/nucleo-l496zg.html>`__
   and the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32l4/nucleo-l496zg/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32l4/nucleo-l496zg/README.txt>`__
   file for further information. See also the status above for the STM32
   L476 most of which also applies to this part.

@ -1976,7 +1976,7 @@ STM32L4R5ZI part was added by Jussi in NuttX-8.2.
   part. See the `STMicro
   website <https://www.st.com/en/evaluation-tools/32l4r9idiscovery.html>`__
   and the board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32l4/stm32l4r9ai-disco/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/stm32l4/stm32l4r9ai-disco/README.txt>`__
   file for further information. See also the status above for the
   opther STM32 L4 parts, most of which also applies to this part.

@ -2007,7 +2007,7 @@ website <http://shop.ngxtechnologies.com/product_info.php?cPath=21_37&products_i
 for further information about this board.

 -  **STATUS:** Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc43xx/lpc4330-xplorer/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc43xx/lpc4330-xplorer/README.txt>`__
   file for more detailed information about this port.

 -  **NuttX-6.20** The basic LPC4330-Xplorer port is complete. The basic
@ -2023,7 +2023,7 @@ website <http://www.nxp.com/news/news-archive/2013/nxp-development-kit-based-on-
 for more detailed information about the LPC4357 and the LPC4357-EVB.

 -  **STATUS:** Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc43xx/lpc4357-evb/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc43xx/lpc4357-evb/README.txt>`__
   file for more detailed information about this port.

 -  **NuttX-7.6**. The basic port is was contributed by Toby Duckworth.
@ -2037,7 +2037,7 @@ for more detailed information about the LPC4357 and the LPC4357-EVB.
 development board featuring the NXP LPC4370FET100 MCU.

 -  **STATUS:** Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc43xx/lpc4370-link2/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc43xx/lpc4370-link2/README.txt>`__
   file for more detailed information about this port.

 -  **NuttX-7.12** The NXP LPC4370-Link2 port is was contributed by Lok
@ -2047,7 +2047,7 @@ development board featuring the NXP LPC4370FET100 MCU.
 LPC4337-WS development board featuring the NXP LPC4337JBD144 MCU.

 -  **STATUS:** Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc43xx/lpc4337-ws/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc43xx/lpc4337-ws/README.txt>`__
   file for more detailed information about this port.

 -  **NuttX-7.14** The NXP WaveShare LPC4337-WS port is was contributed
@ -2124,7 +2124,7 @@ relevant changes incorporated in NuttX-7.26.
   Framebuffer" feature also added in NuttX-7.29.

 Refer to the LPCXpresso-LPC54628 board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/lpc54xx/lpcxpresso-lpc54628/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/lpc54xx/lpcxpresso-lpc54628/README.txt>`__
 file for more detailed information about this port.

 NXP S32K14x
@ -2136,12 +2136,12 @@ boards are supported
 -  **S32K146EVB**. A port to the S32K146EVB was included in NuttX-8.1.
   The initial release supports two full-featured NSH configurations.
   Refer to the S32K146EVB board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/s32k1xx/s32k146evb/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/s32k1xx/s32k146evb/README.txt>`__
   file for more detailed information about this port.
 -  **S32K148EVB**. A port to the S32K148EVB was also provided in
   NuttX-8.1. The initial release supports two full-featured NSH
   configurations. Refer to the S32K148EVB board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/s32k1xx/s32k148evb/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/s32k1xx/s32k148evb/README.txt>`__
   file for more detailed information about this port.

 Both boards featured two NSH configurations: One for execution out of
@ -2204,7 +2204,7 @@ LaunchPad `(EK-TM4C1294XL) <http://www.ti.com/tool/ek-tm4c1294xl>`__.
   NuttX-7.25.

 Refer to the EK-TM4C1294XL board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/tiva/tm4c1294-launchpad/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/tiva/tm4c1294-launchpad/README.txt>`__
 file for more detailed information about this port.

 TI/Tiva TM4C129E
@ -2222,7 +2222,7 @@ LaunchPad `(EK-TM4C129EXL) <https://www.ti.com/tool/EK-TM4C129EXL>`__.
   example in the NuttX apps repository.

 Refer to the EK-TM4C129EXL board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/tiva/tm4c129e-launchpad/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/tiva/tm4c129e-launchpad/README.txt>`__
 file for more detailed information about this port.

 TI/Tiva TM4C129X
@ -2243,13 +2243,13 @@ Development Kit `(DK-TM4C129X) <http://www.ti.com/tool/dk-tm4c129x>`__.
   (: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://github.com/apache/incubator-nuttx/blob/master/boards/arm/tiva/dk-tm4c129x/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/tiva/dk-tm4c129x/README.txt>`__
   file for configuring both IPv4 and IPv6 simultaneously.
 -  Tiva PWM and Quadrature Encoder drivers were contributed to NuttX in
   7.18 by Young.

 Refer to the DK-TM4C129X board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/tiva/dk-tm4c129x/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/tiva/dk-tm4c129x/README.txt>`__
 file for more detailed information about this port.

 TI/SimpleLink CC13x2
@ -2285,7 +2285,7 @@ Support for the SAM4L Xplained modules was added in NuttX-6.29:
   module

 Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/sam34/sam4l-xplained/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/sam34/sam4l-xplained/README.txt>`__
 file for further information.

 **Memory Usage**. The ATSAM4LC4C comes in a 100-pin package and has
@ -2323,7 +2323,7 @@ to NuttX by Masayuki Ishikawa in NuttX-7.19. The SAM4CM is a dual-CPU
 part and SMP was included for the ARMv7-M and SAM3/4 families. The
 SAM4CMP-DB board support includes an NSH configuration that operates in
 an SMP configuration. Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/sam34/sam4cmp-db/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/sam34/sam4cmp-db/README.txt>`__
 file for further information.

 Microchip SAM4E
@ -2433,7 +2433,7 @@ And in NuttX-7.14:
 -  RSWDT driver.

 Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/samv7/samv71-xult/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/samv7/samv71-xult/README.txt>`__
 file for further information.

 Microchip SAME70
@ -2444,7 +2444,7 @@ This port uses Microchip SAM E70 Xplained Evaluation Kit
 SAMV71-XULT board featuring the ATSAME70Q21 Cortex-M7 microcontroller.
 See the `Microchip SAMV71 <#at91samv71>`__ for supported features. Also
 refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/samv7/same70-xplained/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/samv7/same70-xplained/README.txt>`__
 file for further information.

 Microchip SAMD5x/E5x
@ -2468,7 +2468,7 @@ Because of the similarity in peripherals, several drivers were brought
 in from the SAML21 port. Most have not been verified as of the
 NuttX-7.26 release. These unverfied drivers include: SPI, I2C, DMA, USB.
 Also refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/samd5e5/metro-m4/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/arm/samd5e5/metro-m4/README.txt>`__
 file for further information about the current state of the port.

 NuttX-9.0 added basic support for Microchip SAME54 Xplained Pro board.
@ -2547,7 +2547,7 @@ is available for two boards from this family:
 -  **Nucleo-F767ZI**. This is a member of the Nucleo-144 board family.
   Support for this board was also contributed by David Sidrane in
   NuttX-7.17. See the board
-   `README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32f7/nucleo-144/README.txt>`__
+   `README.txt <https://github.com/apache/nuttx/blob/master/boards/arm/stm32f7/nucleo-144/README.txt>`__
   file for further information.

 -  **STM32F76I-DISCO**. Support for the STM32F76I-DISCO was contributed
@ -2573,7 +2573,7 @@ is available for two boards from this family:

   Refer to the http://www.st.com website for further information about
   this board (search keyword: stm32f769i-disco). See also the board
-   `README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32f7/nucleo-144/README.txt>`__
+   `README.txt <https://github.com/apache/nuttx/blob/master/boards/arm/stm32f7/nucleo-144/README.txt>`__
   file for further information.

 **STATUS**: See `above <#stm32f7drivers>`__ for STM32 F7 driver
@ -2588,7 +2588,7 @@ for one board from this family:

 -  **Nucleo-H743ZI**. This is a member of the Nucleo-144 board family.
   Support for this board was added in NuttX-7.26. See the board
-   `README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32h7/nucleo-h743zi/README.txt>`__
+   `README.txt <https://github.com/apache/nuttx/blob/master/boards/arm/stm32h7/nucleo-h743zi/README.txt>`__
   file for further information.

   The basic NSH configuration is fully, thanks to the bring-up efforts
@ -2597,7 +2597,7 @@ for one board from this family:

 -  **STMicro STM32H747I-DISCO**. Support for this board was added in
   NuttX-9.0. See the board
-   `README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/stm32h7/stm32h747i-disco/README.txt>`__
+   `README.txt <https://github.com/apache/nuttx/blob/master/boards/arm/stm32h7/stm32h747i-disco/README.txt>`__
   file for further information.

   This port is still a work in progress.
@ -2630,13 +2630,13 @@ NuttX-7.27.

 -  The basic IMXRT1050-EVK port is complete and verified configurations
   are available. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/imxrt/imxrt1050-evk/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/imxrt/imxrt1050-evk/README.txt>`__
   file for further information.

 -  The basic IMXRT1060-EVK port was complete but un-verified as of
   NuttX-7.27 but has been fully verified since NuttX-7.27 Refer to the
   NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/imxrt/imxrt1060-evk/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/imxrt/imxrt1060-evk/README.txt>`__
   file for more current status information.

 -  Architecture-only support for the IMXRT1020 family was contributed in
@ -2646,11 +2646,11 @@ NuttX-7.27.
   configurations in NuttX-8.2. This is again the work of Dave Marples.
   The initial release includes *nsh*, *netnsh*, and *usdhc*
   configurations. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/imxrt/imxrt1020-evk/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/imxrt/imxrt1020-evk/README.txt>`__
   file for further information.

 -  The basic Teensy-4.x port is complete. Refer to the NuttX board
-   `README <https://github.com/apache/incubator-nuttx/blob/master/boards/arm/imxrt/teensy-4.x/README.txt>`__
+   `README <https://github.com/apache/nuttx/blob/master/boards/arm/imxrt/teensy-4.x/README.txt>`__
   file for further information.

 **i.MX RT Driver Status:**
@ -2705,7 +2705,7 @@ LowPowerLab MoteinoMEGA. This port of NuttX to the MoteinoMEGA from
 on an Microchip ATMega1284P. See the LowPowerlab
 `website <https://lowpowerlab.com/shop/index.php?_route_=Moteino/moteinomega>`__
 and the board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/avr/atmega/moteino-mega/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/avr/atmega/moteino-mega/README.txt>`__
 file for further information.

 AVR ATMega2560
@ -2787,7 +2787,7 @@ The basic, port was be released in NuttX-5.13. A complete port will
 include drivers for additional AVR32 UC3 devices -- like SPI and USB ---
 and will be available in a later release, time permitting. Refer to the
 NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/avr/at32uc3/avr32dev1/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/avr/at32uc3/avr32dev1/README.txt>`__
 file for further information.

 Misoc
@ -2839,7 +2839,7 @@ examples under QEMU. The port is reported to be functional on the
 Lizhuoyi contributed additional keyboard and VGA drivers. This is a
 great, stable starting point for anyone interested in fleshing out the
 x86 port! Refer to the NuttX
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/x86/qemu/qemu-i486/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/x86/qemu/qemu-i486/README.txt>`__
 file for further information.

 **QEMU/Intel64** An x86_64 flat address port was ported in NuttX-9.0. It
@ -2968,7 +2968,7 @@ timers.
 **NuttX-9.0**. Cache operations were implemented.

 Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/mips/pic32mz/pic32mz-starterkit/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/mips/pic32mz/pic32mz-starterkit/README.txt>`__
 file for further information.

 **Development Environment:** Same as for the PIC32MZ.
@ -2995,7 +2995,7 @@ Where the reference line is:

 No workaround is known at this time. This is a show stopper for M16C.
 Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/renesas/m16c/skp16c26/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/renesas/m16c/skp16c26/README.txt>`__
 file for further information.

 Renesas RX65N
@ -3104,7 +3104,7 @@ available in NuttX version 0.3.7. A working NuttShell (NSH)
 configuration as added in NuttX-6.33 (although a patch is required to
 work around an issue with a ZDS-II 5.0.1 tool problem). An ESPI
 driver was added in NuttX-7.2. Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/z16/z16f/z16f2800100zcog/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/z16/z16f/z16f2800100zcog/README.txt>`__
 file for further information.

 Zilog eZ80 Acclaim!
@ -3152,9 +3152,9 @@ environment is either Windows native or Cygwin under Windows.
 **STATUS:** This release has been verified only on the ZiLOG ZDS-II
 Z8Encore! chip simulation as of nuttx-0.3.9. Refer to the NuttX board
 README files for the
-`z8encore000zco <https://github.com/apache/incubator-nuttx/blob/master/boards/z80/z8/z8encore000zco/README.txt>`__
+`z8encore000zco <https://github.com/apache/nuttx/blob/master/boards/z80/z8/z8encore000zco/README.txt>`__
 and for
-the\ `z8f64200100kit <https://github.com/apache/incubator-nuttx/blob/master/boards/z80/z8/z8f64200100kit/README.txt>`__
+the\ `z8f64200100kit <https://github.com/apache/nuttx/blob/master/boards/z80/z8/z8f64200100kit/README.txt>`__
 for further information.

 Zilog Z180
@ -3174,7 +3174,7 @@ makes additional P112 derivative hobbyist home brew computers.
 P112 board. Boards from Kickstarter project will not be available,
 however, until the third quarter of 2013. So it will be some time before
 this port is verified on hardware. Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/z80/z180/p112/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/z80/z180/p112/README.txt>`__
 file for further information.

 Zilog Z80
@ -3187,7 +3187,7 @@ Z80 instruction simulator called z80sim.

 **STATUS:** This port is complete and stable to the extent that it can
 be tested using an instruction set simulator. Refer to the NuttX board
-`README <https://github.com/apache/incubator-nuttx/blob/master/boards/z80/z80/z80sim/README.txt>`__
+`README <https://github.com/apache/nuttx/blob/master/boards/z80/z80/z80sim/README.txt>`__
 file for further information.

 **XTRS: TRS-80 Model I/III/4/4P Emulator for Unix**. A very similar Z80
--- a/Documentation/platforms/arm/rp2040/index.rst
+++ b/Documentation/platforms/arm/rp2040/index.rst
@ -47,8 +47,8 @@ Installation
 3. Download NuttX and the companion applications.  These must both be
   contained in the same directory::
  
-    git clone https://github.com/apache/incubator-nuttx.git nuttx
-    git clone https://github.com/apache/incubator-nuttx-apps.git apps
+    git clone https://github.com/apache/nuttx.git nuttx
+    git clone https://github.com/apache/nuttx-apps.git apps

 Building NuttX
 ==============
--- a/Documentation/platforms/risc-v/esp32c3/index.rst
+++ b/Documentation/platforms/risc-v/esp32c3/index.rst
@ -215,7 +215,7 @@ Now you can design an update and confirm agent to your application. Check the `M
 `MCUboot Espressif port documentation <https://docs.mcuboot.com/readme-espressif.html>`_ for
 more information on how to apply MCUboot. Also check some `notes about the NuttX MCUboot port <https://github.com/mcu-tools/mcuboot/blob/main/docs/readme-nuttx.md>`_,
 the `MCUboot porting guide <https://github.com/mcu-tools/mcuboot/blob/main/docs/PORTING.md>`_ and some
-`examples of MCUboot applied in Nuttx applications <https://github.com/apache/incubator-nuttx-apps/tree/master/examples/mcuboot>`_.
+`examples of MCUboot applied in Nuttx applications <https://github.com/apache/nuttx-apps/tree/master/examples/mcuboot>`_.

 After you developed an application which implements all desired functions, you need to flash it into the primary image slot
 of the device (it will automatically be in the confirmed state, you can learn more about image
--- a/Documentation/platforms/xtensa/esp32/index.rst
+++ b/Documentation/platforms/xtensa/esp32/index.rst
@ -473,7 +473,7 @@ Now you can design an update and confirm agent to your application. Check the `M
 `MCUboot Espressif port documentation <https://docs.mcuboot.com/readme-espressif.html>`_ for
 more information on how to apply MCUboot. Also check some `notes about the NuttX MCUboot port <https://github.com/mcu-tools/mcuboot/blob/main/docs/readme-nuttx.md>`_,
 the `MCUboot porting guide <https://github.com/mcu-tools/mcuboot/blob/main/docs/PORTING.md>`_ and some
-`examples of MCUboot applied in Nuttx applications <https://github.com/apache/incubator-nuttx-apps/tree/master/examples/mcuboot>`_.
+`examples of MCUboot applied in Nuttx applications <https://github.com/apache/nuttx-apps/tree/master/examples/mcuboot>`_.

 After you developed an application which implements all desired functions, you need to flash it into the primary image slot
 of the device (it will automatically be in the confirmed state, you can learn more about image
--- a/Documentation/platforms/xtensa/esp32s2/boards/esp32s2-saola-1/index.rst
+++ b/Documentation/platforms/xtensa/esp32s2/boards/esp32s2-saola-1/index.rst
@ -96,7 +96,7 @@ audio
 This configuration uses the I2S peripheral and an externally connected audio
 codec to play an audio file. The easiest way of playing an uncompressed file
 is embedding into the firmware. This configuration selects
-`romfs example <https://github.com/apache/incubator-nuttx-apps/tree/master/examples/romfs>`__
+`romfs example <https://github.com/apache/nuttx-apps/tree/master/examples/romfs>`__
 to allow that.

 **Audio Codec Setup**
--- a/Documentation/platforms/xtensa/esp32s2/index.rst
+++ b/Documentation/platforms/xtensa/esp32s2/index.rst
@ -356,7 +356,7 @@ Now you can design an update and confirm agent to your application. Check the `M
 `MCUboot Espressif port documentation <https://docs.mcuboot.com/readme-espressif.html>`_ for
 more information on how to apply MCUboot. Also check some `notes about the NuttX MCUboot port <https://github.com/mcu-tools/mcuboot/blob/main/docs/readme-nuttx.md>`_,
 the `MCUboot porting guide <https://github.com/mcu-tools/mcuboot/blob/main/docs/PORTING.md>`_ and some
-`examples of MCUboot applied in Nuttx applications <https://github.com/apache/incubator-nuttx-apps/tree/master/examples/mcuboot>`_.
+`examples of MCUboot applied in Nuttx applications <https://github.com/apache/nuttx-apps/tree/master/examples/mcuboot>`_.

 After you developed an application which implements all desired functions, you need to flash it into the primary image slot
 of the device (it will automatically be in the confirmed state, you can learn more about image
--- a/Documentation/quickstart/debugging.rst
+++ b/Documentation/quickstart/debugging.rst
@ -39,13 +39,13 @@ used.
 Note that enabling all these will produce an incredible amount of logging output. Enable the level you want and
 the area you're interested in, and leave the rest disabled, save the config, and then recompile. You can see the full
 list of debug feature logging functions in the file
-`debug.h <https://github.com/apache/incubator-nuttx/blob/master/include/debug.h>`__.
+`debug.h <https://github.com/apache/nuttx/blob/master/include/debug.h>`__.

 Syslog timestamps can be enabled in the configuration in :menuselection:`Device Drivers --> System Logging --> Prepend
 timestamp to syslog message` (``CONFIG_SYSLOG_TIMESTAMP``).

 You may need to do a little bit of experimenting to find the combination of logging settings that work for the problem
-you're trying to solve. See the file `debug.h <https://github.com/apache/incubator-nuttx/blob/master/include/debug.h>`_
+you're trying to solve. See the file `debug.h <https://github.com/apache/nuttx/blob/master/include/debug.h>`_
 for available debug settings that are available.

 There are also subsystems that enable USB trace debugging, and you can log to memory too, if you need the logging to be
--- a/Documentation/quickstart/install.rst
+++ b/Documentation/quickstart/install.rst
@ -135,16 +135,16 @@ ARM architecture:
 .. tip::
  There are hints on how to get the latest tool chains for most supported
  architectures in the Apache NuttX CI helper
-  `script <https://github.com/apache/incubator-nuttx/tree/master/tools/ci/cibuild.sh>`_
-  and Docker `container <https://github.com/apache/incubator-nuttx/tree/master/tools/ci/docker/linux/Dockerfile>`_
+  `script <https://github.com/apache/nuttx/tree/master/tools/ci/cibuild.sh>`_
+  and Docker `container <https://github.com/apache/nuttx/tree/master/tools/ci/docker/linux/Dockerfile>`_
  
 .. todo::
-  Required toolchain should be part of each arch documentation (see `relevant issue <https://github.com/apache/incubator-nuttx/issues/2409>`_).
+  Required toolchain should be part of each arch documentation (see `relevant issue <https://github.com/apache/nuttx/issues/2409>`_).

 Download NuttX
 ==============

-Apache NuttX is actively developed on GitHub. There are two main repositories, `nuttx <https://github.com/apache/incubator-nuttx>`_ and `apps <https://github.com/apache/incubator-nuttx-apps>`_, where the latter is technically optional (but recommended for complete set of features). If you intend to contribute changes, you need the absolute latest version or you simply prefer to work using git, you should clone these repositories (recommended). Otherwise you can choose to download any `stable release <https://nuttx.apache.org/download/>`_ archive.
+Apache NuttX is actively developed on GitHub. There are two main repositories, `nuttx <https://github.com/apache/nuttx>`_ and `apps <https://github.com/apache/nuttx-apps>`_, where the latter is technically optional (but recommended for complete set of features). If you intend to contribute changes, you need the absolute latest version or you simply prefer to work using git, you should clone these repositories (recommended). Otherwise you can choose to download any `stable release <https://nuttx.apache.org/download/>`_ archive.

 .. tabs::

@ -154,8 +154,8 @@ Apache NuttX is actively developed on GitHub. There are two main repositories, `

       $ mkdir nuttxspace
       $ cd nuttxspace
-       $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-       $ git clone https://github.com/apache/incubator-nuttx-apps apps
+       $ git clone https://github.com/apache/nuttx.git nuttx
+       $ git clone https://github.com/apache/nuttx-apps apps

    The development source code is also available as a compressed archive, should you need it:

@ -163,8 +163,8 @@ Apache NuttX is actively developed on GitHub. There are two main repositories, `

       $ mkdir nuttxspace
       $ cd nuttxspace
-       $ curl -L https://github.com/apache/incubator-nuttx/tarball/master -o nuttx.tar.gz 
-       $ curl -L https://github.com/apache/incubator-nuttx-apps/tarball/master -o apps.tar.gz
+       $ curl -L https://github.com/apache/nuttx/tarball/master -o nuttx.tar.gz 
+       $ curl -L https://github.com/apache/nuttx-apps/tarball/master -o apps.tar.gz
       $ tar zxf nuttx.tar.gz --one-top-level=nuttx --strip-components 1
       $ tar zxf apps.tar.gz --one-top-level=apps --strip-components 1
       
--- a/Documentation/quickstart/organization.rst
+++ b/Documentation/quickstart/organization.rst
@ -351,7 +351,7 @@ Supported Boards

 All of the specific boards supported by NuttX are identified in
 the
-`README.txt <https://github.com/apache/incubator-nuttx/blob/master/boards/README.txt>`__
+`README.txt <https://github.com/apache/nuttx/blob/master/boards/README.txt>`__
 file.

 Adding a New Board Configuration
--- a/README.md
+++ b/README.md
@ -124,26 +124,26 @@ into future releases.

 ## Source Code

-The project sources are in two Git repositories.  The core OS is in
-incubator-nuttx and the apps repository is in incubator-nuttx-apps.  These
-are housed in GitBox on ASF servers and also mirrored at GitHub.  These
-are kept in sync, so you can use whichever option you prefer.
+The project sources are in two Git repositories.  The core OS is in nuttx
+and the apps repository is in nuttx-apps.  These are housed in GitBox on
+ASF servers and also mirrored at GitHub.  These are kept in sync, so you
+can use whichever option you prefer.

  - NuttX core OS repository:

    - Primary:
-      <https://gitbox.apache.org/repos/asf?p=incubator-nuttx.git>
+      <https://gitbox.apache.org/repos/asf?p=nuttx.git>

    - GitHub Mirror:
-      <https://github.com/apache/incubator-nuttx>
+      <https://github.com/apache/nuttx>

  - Apps repository:

    - Primary:
-      <https://gitbox.apache.org/repos/asf?p=incubator-nuttx-apps.git>
+      <https://gitbox.apache.org/repos/asf?p=nuttx-apps.git>

    - GitHub Mirror:
-      <https://github.com/apache/incubator-nuttx-apps>
+      <https://github.com/apache/nuttx-apps>

 ## Website Source Code

@ -151,10 +151,10 @@ The project website sources are accessible via the website source code
  repository which is also mirrored in GitHub:

 - Primary:
-  <https://gitbox.apache.org/repos/asf?p=incubator-nuttx-website.git>
+  <https://gitbox.apache.org/repos/asf?p=nuttx-website.git>

 - GitHub Mirror:
-  <https://github.com/apache/incubator-nuttx-website>
+  <https://github.com/apache/nuttx-website>

 # ENVIRONMENTS

@ -625,19 +625,19 @@ The current NuttX du jour is available in from a GIT repository.  Here are
 instructions for cloning the core NuttX RTOS (corresponding to the nuttx
 tarball discussed above):

-    git clone https://gitbox.apache.org/repos/asf/incubator-nuttx.git nuttx
+    git clone https://gitbox.apache.org/repos/asf/nuttx.git nuttx

 -or-

-    git clone https://github.com/apache/incubator-nuttx.git nuttx
+    git clone https://github.com/apache/nuttx.git nuttx

 And the semi-optional apps/ application directory and be cloned like:

-    git clone https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git apps
+    git clone https://gitbox.apache.org/repos/asf/nuttx-apps.git apps

 -or-

-    git clone https://github.com/apache/incubator-nuttx-apps.git apps
+    git clone https://github.com/apache/nuttx-apps.git apps

 That will give you the same directory structure like this:

@ -679,9 +679,9 @@ some scripts like configure.sh. Before cloning, do the following:

 These are standalone repositories:

-  * <https://gitbox.apache.org/repos/asf/incubator-nuttx-apps>
+  * <https://gitbox.apache.org/repos/asf/nuttx-apps>
    or
-    <https://github.com/apache/incubator-nuttx-apps.git>
+    <https://github.com/apache/nuttx-apps.git>

    This directory holds an optional package of applications and libraries
    can be used with the NuttX RTOS.  There is a README.txt file there that
--- a/6534
+++ b/6534
--- a/arch/arm/src/common/Toolchain.defs
+++ b/arch/arm/src/common/Toolchain.defs
@ -143,7 +143,7 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)

  # Since the no_builtin attribute is not fully supported on Clang
  # disable the built-in functions, refer:
-  # https://github.com/apache/incubator-nuttx/pull/5971
+  # https://github.com/apache/nuttx/pull/5971

  ARCHOPTIMIZATION += -fno-builtin

@ -163,7 +163,7 @@ else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y)

  # Since the no_builtin attribute is not fully supported on Clang
  # disable the built-in functions, refer:
-  # https://github.com/apache/incubator-nuttx/pull/5971
+  # https://github.com/apache/nuttx/pull/5971

  ARCHOPTIMIZATION += -fno-builtin
  ARCHOPTIMIZATION += --target=arm-arm-none-eabi
--- a/boards/arm/rp2040/adafruit-feather-rp2040/README.txt
+++ b/boards/arm/rp2040/adafruit-feather-rp2040/README.txt
@ -53,8 +53,8 @@ Installation

 3. Configure and build NuttX

-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh raspberrypi-pico:nsh
--- a/boards/arm/rp2040/adafruit-kb2040/README.txt
+++ b/boards/arm/rp2040/adafruit-kb2040/README.txt
@ -52,8 +52,8 @@ Installation

 3. Configure and build NuttX

-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh raspberrypi-pico:nsh
--- a/boards/arm/rp2040/adafruit-qt-py-rp2040/README.txt
+++ b/boards/arm/rp2040/adafruit-qt-py-rp2040/README.txt
@ -47,8 +47,8 @@ Installation

 3. Configure and build NuttX

-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh raspberrypi-pico:nsh
--- a/boards/arm/rp2040/pimoroni-tiny2040/README.txt
+++ b/boards/arm/rp2040/pimoroni-tiny2040/README.txt
@ -50,8 +50,8 @@ Installation

 3. Configure and build NuttX

-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh pimoroni-tiny2040:nsh
--- a/boards/arm/rp2040/raspberrypi-pico-w/README.txt
+++ b/boards/arm/rp2040/raspberrypi-pico-w/README.txt
@ -54,8 +54,8 @@ Installation

 3. Configure and build NuttX

-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh raspberrypi-pico:nsh
--- a/boards/arm/rp2040/raspberrypi-pico/README.txt
+++ b/boards/arm/rp2040/raspberrypi-pico/README.txt
@ -53,8 +53,8 @@ Installation

 3. Configure and build NuttX

-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh raspberrypi-pico:nsh
--- a/boards/risc-v/fe310/hifive1-revb/README-qemu.txt
+++ b/boards/risc-v/fe310/hifive1-revb/README-qemu.txt
@ -28,8 +28,8 @@ index c449421741..5a76600785 100644
 4. Configure and build NuttX

  $ mkdir ./nuttx; cd ./nuttx
-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh hifive1-revb:nsh
--- a/boards/risc-v/fe310/hifive1-revb/README.txt
+++ b/boards/risc-v/fe310/hifive1-revb/README.txt
@ -11,8 +11,8 @@
 3. Configure and build NuttX

  $ mkdir ./nuttx; cd ./nuttx
-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh hifive1-revb:nsh
--- a/boards/risc-v/k210/maix-bit/README-qemu.txt
+++ b/boards/risc-v/k210/maix-bit/README-qemu.txt
@ -25,8 +25,8 @@
 4. Configure and build NuttX

  $ mkdir ./nuttx; cd ./nuttx
-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh maix-bit:nsh
--- a/boards/risc-v/k210/maix-bit/README.txt
+++ b/boards/risc-v/k210/maix-bit/README.txt
@ -12,8 +12,8 @@
 3. Configure and build NuttX

  $ mkdir ./nuttx; cd ./nuttx
-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh maix-bit:nsh
--- a/boards/risc-v/litex/arty_a7/README.txt
+++ b/boards/risc-v/litex/arty_a7/README.txt
@ -11,8 +11,8 @@
 3. Configure and build NuttX

  $ mkdir ./nuttx; cd ./nuttx
-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh arty_a7:nsh
--- a/boards/risc-v/qemu-rv/rv-virt/README.txt
+++ b/boards/risc-v/qemu-rv/rv-virt/README.txt
@ -13,8 +13,8 @@
 3.1. Configure and build NuttX for BUILD_FLAT

  $ mkdir ./nuttx; cd ./nuttx
-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh rv-virt:nsh
@ -23,8 +23,8 @@
 3.2 Configure and build NuttX for BUILD_KERNEL

  $ mkdir ./nuttx; cd ./nuttx
-  $ git clone https://github.com/apache/incubator-nuttx.git nuttx
-  $ git clone https://github.com/apache/incubator-nuttx-apps.git apps
+  $ git clone https://github.com/apache/nuttx.git nuttx
+  $ git clone https://github.com/apache/nuttx-apps.git apps
  $ cd nuttx
  $ make distclean
  $ ./tools/configure.sh rv-virt:knsh64
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@ -473,7 +473,7 @@ function setup_repos {
  if [ -d "${nuttx}" ]; then
    cd "${nuttx}"; git pull
  else
-    git clone https://github.com/apache/incubator-nuttx.git "${nuttx}"
+    git clone https://github.com/apache/nuttx.git "${nuttx}"
    cd "${nuttx}"
  fi
  git log -1
@ -481,7 +481,7 @@ function setup_repos {
  if [ -d "${apps}" ]; then
    cd "${apps}"; git pull
  else
-    git clone https://github.com/apache/incubator-nuttx-apps.git "${apps}"
+    git clone https://github.com/apache/nuttx-apps.git "${apps}"
    cd "${apps}"
  fi
  git log -1
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@ -92,7 +92,7 @@ RUN mkdir clang-arm-none-eabi && \
 RUN mkdir gcc-arm-none-eabi && \
  curl -s -L  "https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz" \
  | tar -C gcc-arm-none-eabi --strip-components 1 -xJ  \
-  && curl -s -L -O "https://raw.githubusercontent.com/apache/incubator-nuttx/master/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch" \
+  && curl -s -L -O "https://raw.githubusercontent.com/apache/nuttx/master/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch" \
  && patch -p0 < arm-none-eabi-workaround-for-newlib-version-break.patch

 ###############################################################################