diff --git a/base/changes.txt b/base/changes.txt
index fd8a60125..faac38d40 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -8,7 +8,7 @@ not part of the distribution.
 
 2024-04-10  Joseph Wright  <Joseph.Wright@latex-project.org>
 
-	* ltfilehook.dtx
+	* ltfilehook.dtx, ltshipout.dtx
 	  Correct mark-up for commands with no documentation
 
 2024-03-22  Yukai Chou <muzimuzhi@gmail.com>
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index 0c9113ce9..d92e20e8e 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -34,7 +34,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltshipout.dtx}
-             [2024/02/11 v1.0n LaTeX Kernel (Shipout)]
+             [2024/04/10 v1.0n LaTeX Kernel (Shipout)]
 % \iffalse
 %
 \documentclass{l3doc}
@@ -1144,7 +1144,7 @@
 %
 %
 %
-%  \begin{macro}{\@kernel@after@shipout@lastpage,
+%  \begin{macro}[no-user-doc]{\@kernel@after@shipout@lastpage,
 %                \@kernel@before@shipout@background,
 %                \@kernel@after@shipout@background}
 %    And here are the internal kernel hooks going before or after the
@@ -1668,7 +1668,7 @@
 %
 %
 %
-%  \begin{macro}{\@abspage@last}
+%  \begin{macro}[int]{\@abspage@last}
 %    In \cs{@abspage@last} record the number of pages from the last
 %    run. This is written to the \texttt{.aux} and this way made
 %    available to the next run. In case there is no \texttt{.aux} file
@@ -1683,7 +1683,7 @@
 %  \end{macro}
 %
 %
-% \begin{macro}{\enddocument}
+% \begin{macro}[no-user-doc]{\enddocument}
 %
 %    Instead of using the hooks \hook{enddocument} and
 %    \hook{enddocument/afterlastpage} we add this code to private
@@ -1700,7 +1700,7 @@
 %    be wrong but then rerunning the document will give us the correct
 %    value next time around.
 %
-% \begin{macro}{\@kernel@after@enddocument}
+% \begin{macro}[no-user-doc]{\@kernel@after@enddocument}
 %    \begin{macrocode}
 \g@addto@macro \@kernel@after@enddocument {
   \int_compare:nNnT \@abspage@last = \maxdimen
@@ -1714,7 +1714,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@kernel@after@enddocument@afterlastpage}
+% \begin{macro}[no-user-doc]{\@kernel@after@enddocument@afterlastpage}
 %    Once the \cs{clearpage} has done its work inside \cs{enddocument}
 %    we know for sure how many pages this document has, so we record
 %    that in the \texttt{.aux} file for the next run.
@@ -1891,7 +1891,7 @@
 %<@@=>
 %    \end{macrocode}
 %
-%  \begin{macro}{\@expl@@@shipout@add@firstpage@material@@Nn,
+%  \begin{macro}[int]{\@expl@@@shipout@add@firstpage@material@@Nn,
 %                \@expl@@@shipout@add@background@box@@n,
 %                \@expl@@@shipout@add@foreground@box@@n,
 %                \@expl@@@shipout@add@background@picture@@n,
@@ -2152,7 +2152,7 @@
 %  \end{macro}
 %
 %
-%  \begin{macro}{\ShipoutBoxHeight,\ShipoutBoxWidth,\ShipoutBoxDepth}
+%  \begin{macro}[no-user-doc]{\ShipoutBoxHeight,\ShipoutBoxWidth,\ShipoutBoxDepth}
 %    This is somewhat different from the original in \pkg{atbegshi}
 %    where \cs{ShipoutBoxHeight} etc.\ only holds the
 %    \verb=\the\ht<box>= value. This may has some implications in some