6 files changed, 21 insertions, 11 deletions
diff --git a/doc/develop/bootstd/overview.rst b/doc/develop/bootstd/overview.rst
index 397f6db18b4..99ff7d6192d 100644
--- a/doc/develop/bootstd/overview.rst
+++ b/doc/develop/bootstd/overview.rst
@@ -422,7 +422,7 @@ includes the full set of commands, more error messages when things go wrong and
 bootmeth ordering with the bootmeths environment variable.
 
 You should probably also enable `CONFIG_BOOTSTD_DEFAULTS`, which provides
-several filesystem and network features (if `CONFIG_NET` is enabled) so that
+several filesystem and network features (if `CONFIG_NET_LEGACY` is enabled) so that
 a good selection of boot options is available.
 
 Some devicetree properties are supported in the bootstd node when
diff --git a/doc/develop/package/bintools.rst b/doc/develop/package/bintools.rst
deleted file mode 120000
index 7ef3d75e935..00000000000
--- a/doc/develop/package/bintools.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/binman/bintools.rst
-\ No newline at end of file
diff --git a/doc/develop/package/entries.rst b/doc/develop/package/entries.rst
deleted file mode 120000
index ecedcebaad4..00000000000
--- a/doc/develop/package/entries.rst
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/binman/entries.rst
-\ No newline at end of file
diff --git a/doc/develop/pytest/test_fit.rst b/doc/develop/pytest/test_fit.rst
new file mode 100644
index 00000000000..3a2359f1e89
--- /dev/null
+++ b/doc/develop/pytest/test_fit.rst
@@ -0,0 +1,10 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+test_fit
+========
+
+.. automodule:: test_fit
+   :synopsis:
+   :member-order: bysource
+   :members:
+   :undoc-members:
diff --git a/doc/develop/pytest/usage.rst b/doc/develop/pytest/usage.rst
index e9296fd1f44..6002244d608 100644
--- a/doc/develop/pytest/usage.rst
+++ b/doc/develop/pytest/usage.rst
@@ -546,11 +546,11 @@ following annotation for a test requires ``CONFIG_EFI_LOADER=y``:
 Sometimes multiple configuration option supply the same functionality. If
 multiple arguments are passed to ``buildconfigspec()``, only one of the
 configuration options needs to be set. The following annotation requires that
-either of ``CONFIG_NET`` or ``CONFIG_NET_LWIP`` is set:
+either of ``CONFIG_NET_LEGACY`` or ``CONFIG_NET_LWIP`` is set:
 
 .. code-block:: python
 
-    @pytest.mark.buildconfigspec('net', 'net_lwip')
+    @pytest.mark.buildconfigspec('net_legacy', 'net_lwip')
 
 The ``notbuildconfigspec()`` annotation can be used to require a configuration
 option not to be set. The following annotation requires ``CONFIG_RISCV=n``:
diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst
index 69678f2897a..6a1f71bfefa 100644
--- a/doc/develop/release_cycle.rst
+++ b/doc/develop/release_cycle.rst
@@ -55,7 +55,7 @@ Current Status
 
 * U-Boot v2026.04 was released on Monday, 06 April 2026.
 
-* The Merge Window for the next release (|next_ver|) is **open** until the -rc1
+* The Merge Window for the next release (|next_ver|) is **closed** with the -rc1
   release on Monday, 27 April 2026.
 
 * The next branch is now **closed** until the -rc2 release on Monday, 11
@@ -69,15 +69,17 @@ Future Releases
 .. The following commented out dates are for when release candidates are
    planned to be tagged.
 
-.. For the next scheduled release, release candidates were made on:
+For the next scheduled release, release candidates were made on:
 
-.. * U-Boot |next_ver|-rc1 was released on Mon 11 May 2026.
+* U-Boot |next_ver|-rc1 was released on Mon 27 April 2026.
 
-.. * U-Boot |next_ver|-rc2 was released on Mon 25 May 2026.
+.. * U-Boot |next_ver|-rc2 was released on Mon 11 May 2026.
 
-.. * U-Boot |next_ver|-rc3 was released on Mon 08 June 2026.
+.. * U-Boot |next_ver|-rc3 was released on Mon 25 May 2026.
 
-.. * U-Boot |next_ver|-rc4 was released on Mon 22 June 2026.
+.. * U-Boot |next_ver|-rc4 was released on Mon 08 June 2026.
+
+.. * U-Boot |next_ver|-rc5 was released on Mon 22 June 2026.
 
 Please note that the following dates are planned only and may be deviated from
 as needed.