diff --git a/bin/cwiki-petstore.sh b/bin/cwiki-petstore.sh
index 4201c4fe50d..e8935bbb36a 100755
--- a/bin/cwiki-petstore.sh
+++ b/bin/cwiki-petstore.sh
@@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cwiki -o samples/documentation/cwiki $@"
+ags="generate -t modules/openapi-generator/src/main/resources/confluenceWikiDocs -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cwiki -o samples/documentation/cwiki $@"
java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/html-petstore.sh b/bin/html-petstore.sh
index 1b8fadbac98..06fe224c524 100755
--- a/bin/html-petstore.sh
+++ b/bin/html-petstore.sh
@@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html -o samples/documentation/html $@"
+ags="generate -t modules/openapi-generator/src/main/resources/htmlDocs -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g html -o samples/documentation/html $@"
java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/openapi-generator/src/main/resources/confluenceWikiDocs/index.mustache b/modules/openapi-generator/src/main/resources/confluenceWikiDocs/index.mustache
index e67c95a4d01..0c42ad9bf66 100644
--- a/modules/openapi-generator/src/main/resources/confluenceWikiDocs/index.mustache
+++ b/modules/openapi-generator/src/main/resources/confluenceWikiDocs/index.mustache
@@ -35,8 +35,8 @@ h2. Endpoints
{{#hasHeaderParams}}
h5. Header Parameters
||Name||Description||Required||Default||Pattern||
- {{#headerParam}}{{>param}}
- {{/headerParam}}
+ {{#headerParams}}{{>param}}
+ {{/headerParams}}
{{/hasHeaderParams}}
{{#hasQueryParams}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs/headerParam.mustache b/modules/openapi-generator/src/main/resources/htmlDocs/headerParam.mustache
index 936f3772b03..7f5d4efc140 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs/headerParam.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs/headerParam.mustache
@@ -1,3 +1,3 @@
-{{#isHeaderParam}}{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
+{{baseName}} {{^required}}(optional){{/required}}{{#required}}(required){{/required}}
- Header Parameter — {{unescapedDescription}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}
{{/isHeaderParam}}
\ No newline at end of file
+ Header Parameter — {{unescapedDescription}} {{#defaultValue}}default: {{{defaultValue}}} {{/defaultValue}}{{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs/index.mustache b/modules/openapi-generator/src/main/resources/htmlDocs/index.mustache
index 81fc2074fc9..eb13cf63fc2 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs/index.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs/index.mustache
@@ -83,7 +83,7 @@
{{#hasHeaderParams}}
Request headers
- {{#headerParam}}{{>headerParam}}{{/headerParam}}
+ {{#headerParams}}{{>headerParam}}{{/headerParams}}
{{/hasHeaderParams}}
diff --git a/samples/documentation/cwiki/.openapi-generator/VERSION b/samples/documentation/cwiki/.openapi-generator/VERSION
index 14900cee60e..d077ffb477a 100644
--- a/samples/documentation/cwiki/.openapi-generator/VERSION
+++ b/samples/documentation/cwiki/.openapi-generator/VERSION
@@ -1 +1 @@
-3.2.1-SNAPSHOT
\ No newline at end of file
+3.3.4-SNAPSHOT
\ No newline at end of file
diff --git a/samples/documentation/cwiki/confluence-markup.txt b/samples/documentation/cwiki/confluence-markup.txt
index e983e003d4c..f790908e8f1 100644
--- a/samples/documentation/cwiki/confluence-markup.txt
+++ b/samples/documentation/cwiki/confluence-markup.txt
@@ -59,13 +59,15 @@ h2. Endpoints
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |petId |Pet id to delete |(/) | | |
+ |petId |Pet id to delete |(/) |null | |
h5. Header Parameters
||Name||Description||Required||Default||Pattern||
-
+ |apiKey | |(x) |null | |
+
+
@@ -103,7 +105,7 @@ h2. Endpoints
h5. Query Parameters
||Name||Description||Required||Default||Pattern||
- |status |Status values that need to be considered for filter |(/) | | |
+ |status |Status values that need to be considered for filter |(/) |null | |
@@ -174,7 +176,7 @@ array[Pet]
h5. Query Parameters
||Name||Description||Required||Default||Pattern||
- |tags |Tags to filter by |(/) | | |
+ |tags |Tags to filter by |(/) |null | |
@@ -242,7 +244,7 @@ array[Pet]
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |petId |ID of pet to return |(/) | | |
+ |petId |ID of pet to return |(/) |null | |
@@ -391,7 +393,7 @@ Pet
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |petId |ID of pet that needs to be updated |(/) | | |
+ |petId |ID of pet that needs to be updated |(/) |null | |
@@ -430,7 +432,7 @@ Pet
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |petId |ID of pet to update |(/) | | |
+ |petId |ID of pet to update |(/) |null | |
@@ -475,7 +477,7 @@ ApiResponse
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |orderId |ID of the order that needs to be deleted |(/) | | |
+ |orderId |ID of the order that needs to be deleted |(/) |null | |
@@ -574,7 +576,7 @@ map[String, Integer]
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |orderId |ID of pet that needs to be fetched |(/) | | |
+ |orderId |ID of pet that needs to be fetched |(/) |null | |
@@ -836,7 +838,7 @@ Order
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |username |The name that needs to be deleted |(/) | | |
+ |username |The name that needs to be deleted |(/) |null | |
@@ -890,7 +892,7 @@ Order
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |username |The name that needs to be fetched. Use user1 for testing. |(/) | | |
+ |username |The name that needs to be fetched. Use user1 for testing. |(/) |null | |
@@ -973,9 +975,9 @@ User
h5. Query Parameters
||Name||Description||Required||Default||Pattern||
- |username |The user name for login |(/) | | |
+ |username |The user name for login |(/) |null | |
-|password |The password for login in clear text |(/) | | |
+|password |The password for login in clear text |(/) |null | |
@@ -1088,7 +1090,7 @@ String
h4. Parameters
h5. Path Parameters
||Name||Description||Required||Default||Pattern||
- |username |name that need to be deleted |(/) | | |
+ |username |name that need to be deleted |(/) |null | |
h5. Body Parameter
diff --git a/samples/documentation/html/.openapi-generator/VERSION b/samples/documentation/html/.openapi-generator/VERSION
index a6527129083..d077ffb477a 100644
--- a/samples/documentation/html/.openapi-generator/VERSION
+++ b/samples/documentation/html/.openapi-generator/VERSION
@@ -1 +1 @@
-3.3.2-SNAPSHOT
\ No newline at end of file
+3.3.4-SNAPSHOT
\ No newline at end of file
diff --git a/samples/documentation/html/index.html b/samples/documentation/html/index.html
index 7da2214c634..543b4acfc78 100644
--- a/samples/documentation/html/index.html
+++ b/samples/documentation/html/index.html
@@ -284,7 +284,10 @@ font-style: italic;
Request headers
-
+
api_key (optional)
+
+
Header Parameter — default: null
+