From ef0b9eea3e9ad2a0b47ea21e27fe34b6d94ded9e Mon Sep 17 00:00:00 2001
From: Rick M <kingthorin@users.noreply.github.com>
Date: Tue, 3 Dec 2024 07:16:05 -0500
Subject: [PATCH] formhandler: Help Fix

Signed-off-by: kingthorin <kingthorin@users.noreply.github.com>
---
 addOns/formhandler/CHANGELOG.md                    |  3 +++
 .../resources/help/contents/FormHandlerHelp.html   | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addOns/formhandler/CHANGELOG.md b/addOns/formhandler/CHANGELOG.md
index 996bd9ef3f0..e8e17e13b63 100644
--- a/addOns/formhandler/CHANGELOG.md
+++ b/addOns/formhandler/CHANGELOG.md
@@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Depend on Common Library add-on, to provide the default/custom values to the other add-ons (Issue 8016).
 
+### Fixed
+- Fixed an issue in the help which may cause images to be displayed inline impacting the flow of the text.
+
 ## [6.6.0] - 2024-05-07
 ### Changed
 - Update minimum ZAP version to 2.15.0.
diff --git a/addOns/formhandler/src/main/javahelp/org/zaproxy/zap/extension/formhandler/resources/help/contents/FormHandlerHelp.html b/addOns/formhandler/src/main/javahelp/org/zaproxy/zap/extension/formhandler/resources/help/contents/FormHandlerHelp.html
index a12c077ec62..d4e20ebb2c7 100644
--- a/addOns/formhandler/src/main/javahelp/org/zaproxy/zap/extension/formhandler/resources/help/contents/FormHandlerHelp.html
+++ b/addOns/formhandler/src/main/javahelp/org/zaproxy/zap/extension/formhandler/resources/help/contents/FormHandlerHelp.html
@@ -31,8 +31,8 @@ <H2>Using the Value Generator</H2>
 			<p>
 				The Value Generator can be configured thought ZAP's Options. Selecting the Value Generator tab will display a table 
 				with all existing inputs that are currently defined. An example is shown below.
-			</p>
-			<img src="../contents/images/formHandlerTable.PNG" alt="Image Not Available"/>
+			</p><br>
+			<img src="../contents/images/formHandlerTable.PNG" alt="A screenshot of the Value Generator's main table"/>
 
 		<H3>Adding a New Field</H3>
 			<p>
@@ -40,7 +40,7 @@ <H3>Adding a New Field</H3>
 				for the user to provide field information.
 			</p>
 
-			<img src="../contents/images/formHandlerAddDialog.PNG" alt="Image Not Available"/>
+			<img src="../contents/images/formHandlerAddDialog.PNG" alt="A screenshot of the Value Generator's add dialog"/>
 
 			<p>
 				Please take note of the following when adding a new field:
@@ -60,15 +60,15 @@ <H3>Modifying an Existing Field</H3>
 			<p>
 				The add-on allows the user to modify the values and names of existing fields. This can be done 
 				by selecting the field that you wish to modify and clicking on the <b>Modify</b> button.
-			</p>
-			<img src="../contents/images/formHandlerModDialog.PNG" alt="Image Not Available"/>
+			</p><br>
+			<img src="../contents/images/formHandlerModDialog.PNG" alt="A screenshot of the Value Generator's modify dialog"/>
 
 			<p>
 				When modifying a field the user is constrained by the same rules as creating a new one. The most
 				common constraint when modifying a field is that the name cannot be the same as an existing field.
 				(i.e. No duplicate fields)
-			<p>
- 
+			</p>
+
 		<H3>Removing Fields</H3>
 			<p>
 				The user can remove fields at any time. To do so simply select the field that you wish to remove and