From c13b64653f71be3b3cf4f1fb52ce3b3dba487204 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 11 Jul 2020 16:32:50 -0600
Subject: [PATCH] [JENKINS-9346] - Fix token macro help formatting

https://issues.jenkins-ci.org/browse/JENKINS-9346 reports that the
git plugin token macro help formatting is incorrect.

It was using an unnecessary heading to prefix the description of token
macro parameters.  Other plugins use a definition list to describe the
token macro parameters without the unnecessary heading.  Do the same
for the git plugin.
---
 .../git/GitBranchTokenMacro/help.jelly        | 30 +++++++++----------
 .../git/GitRevisionTokenMacro/help.jelly      | 20 ++++++-------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/hudson/plugins/git/GitBranchTokenMacro/help.jelly b/src/main/resources/hudson/plugins/git/GitBranchTokenMacro/help.jelly
index b481cce052..16cfe1fdc3 100644
--- a/src/main/resources/hudson/plugins/git/GitBranchTokenMacro/help.jelly
+++ b/src/main/resources/hudson/plugins/git/GitBranchTokenMacro/help.jelly
@@ -3,19 +3,19 @@
   <dt>$${GIT_BRANCH}</dt>
   <dd>
     Expands to the name of the branch that was built.
-  </dd>
 
-  <h3>Parameters</h3>
-  <dl>
-    <dt>all</dt>
-    <dd>
-      If specified, all the branches that point to the given commit is listed.
-      By default, the token expands to just one of them.
-    </dd>
-    <dt>fullName</dt>
-    <dd>
-      If specified, this token expands to the full branch name, such as 'origin/master'.
-      Otherwise, it only expands to  the short name, such as 'master'.
-    </dd>
-  </dl>
-</j:jelly>
\ No newline at end of file
+    <dl>
+      <dt>all</dt>
+      <dd>
+        If specified, all the branches that point to the given commit are listed.
+        By default, the token expands to just one of them.
+      </dd>
+      <dt>fullName</dt>
+      <dd>
+        If specified, this token expands to the full branch name, such as 'origin/master'.
+        Otherwise, it only expands to  the short name, such as 'master'.
+      </dd>
+    </dl>
+
+  </dd>
+</j:jelly>
diff --git a/src/main/resources/hudson/plugins/git/GitRevisionTokenMacro/help.jelly b/src/main/resources/hudson/plugins/git/GitRevisionTokenMacro/help.jelly
index 3cf65c65da..75ac3c6433 100644
--- a/src/main/resources/hudson/plugins/git/GitRevisionTokenMacro/help.jelly
+++ b/src/main/resources/hudson/plugins/git/GitRevisionTokenMacro/help.jelly
@@ -3,14 +3,14 @@
   <dt>$${GIT_REVISION}</dt>
   <dd>
     Expands to the Git SHA1 commit ID that points to the commit that was built.
-  </dd>
 
-  <h3>Parameters</h3>
-  <dl>
-    <dt>length=N (optional, default to 40)</dt>
-    <dd>
-      Specify the commit ID length. Full SHA1 commit ID is 40 character long, but it is common
-      to cut it off at 8 or 12 as that often provide enough uniqueness and is a lot more legible.
-    </dd>
-  </dl>
-</j:jelly>
\ No newline at end of file
+    <dl>
+      <dt>length=N (optional, default to 40)</dt>
+      <dd>
+        Specify the commit ID length. Full SHA1 commit ID is 40 characters long, but it is common
+        to truncate it at 8 or 12 as that usually provide enough uniqueness and is more legible.
+      </dd>
+    </dl>
+
+  </dd>
+</j:jelly>