From bcea45518c7f229e61c206b640c5078018b4a4a5 Mon Sep 17 00:00:00 2001
From: imonteroperez <imontero@cloudbees.com>
Date: Wed, 10 Nov 2021 17:17:06 +0100
Subject: [PATCH] Remove headerDocumentation

---
 core/src/main/java/hudson/Functions.java      |  3 --
 .../JenkinsHeader/headerDocumentation.jelly   | 28 -------------------
 .../resources/lib/layout/pageHeader.jelly     | 26 ++++++++++++++++-
 3 files changed, 25 insertions(+), 32 deletions(-)
 delete mode 100644 core/src/main/resources/jenkins/views/JenkinsHeader/headerDocumentation.jelly

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index a0e385abbc0fa..c727d22435f1e 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -153,9 +153,6 @@
 import jenkins.model.ModelObjectWithContextMenu;
 import jenkins.model.SimplePageDecorator;
 import jenkins.util.SystemProperties;
-import jenkins.views.Header;
-import jenkins.views.JenkinsHeader;
-
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.JellyTagException;
 import org.apache.commons.jelly.Script;
diff --git a/core/src/main/resources/jenkins/views/JenkinsHeader/headerDocumentation.jelly b/core/src/main/resources/jenkins/views/JenkinsHeader/headerDocumentation.jelly
deleted file mode 100644
index 9d48a25667bca..0000000000000
--- a/core/src/main/resources/jenkins/views/JenkinsHeader/headerDocumentation.jelly
+++ /dev/null
@@ -1,28 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:i="jelly:fmt" xmlns:x="jelly:xml">
-	<st:documentation>
-        Generates the page header, along with its associated dynamic behaviours.
-        This tag is used by l:layout and not expected to be used by anyone else,
-        but it's written as separate tag for better readability of code.
-
-        <st:attribute name="title" required="true">
-            Page title and title attribute for the logo
-        </st:attribute>
-
-        <st:attribute name="logoAlt" required="true">
-            Alt text for the logo
-        </st:attribute>
-
-        <st:attribute name="searchPlaceholder" required="true">
-            Placeholder text for the search input
-        </st:attribute>
-
-        <st:attribute name="searchHelpUrl" required="true">
-            Link value for the help icon on the search box
-        </st:attribute>
-
-        <st:attribute name="logout" required="true">
-            Text for the logout link
-        </st:attribute>
-    </st:documentation>
-</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/layout/pageHeader.jelly b/core/src/main/resources/lib/layout/pageHeader.jelly
index 881fde275d8e8..8be492a658508 100644
--- a/core/src/main/resources/lib/layout/pageHeader.jelly
+++ b/core/src/main/resources/lib/layout/pageHeader.jelly
@@ -1,7 +1,31 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:i="jelly:fmt" xmlns:x="jelly:xml">
+	<st:documentation>
+        Generates the page header, along with its associated dynamic behaviours.
+        This tag is used by l:layout and not expected to be used by anyone else,
+        but it's written as separate tag for better readability of code.
+
+        <st:attribute name="title" required="true">
+            Page title and title attribute for the logo
+        </st:attribute>
+
+        <st:attribute name="logoAlt" required="true">
+            Alt text for the logo
+        </st:attribute>
+
+        <st:attribute name="searchPlaceholder" required="true">
+            Placeholder text for the search input
+        </st:attribute>
+
+        <st:attribute name="searchHelpUrl" required="true">
+            Link value for the help icon on the search box
+        </st:attribute>
+
+        <st:attribute name="logout" required="true">
+            Text for the logout link
+        </st:attribute>
+    </st:documentation>
 	<j:invokeStatic var="header" className="jenkins.views.JenkinsHeader" method="get"/>
-	<st:include it="${header}" page="headerDocumentation.jelly"/>
 	<st:include it="${header}" page="preHeader.jelly"/>
 	<st:include it="${header}" page="headerContent.jelly"/>
 	<st:include it="${header}" page="postHeader.jelly"/>