diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache
index c31facd7593..a8224d1579b 100644
--- a/modules/swagger-codegen/src/main/resources/Java/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache
@@ -57,7 +57,7 @@ public class {{classname}} {
{{/isDeprecated}}
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
index 98cfaface78..4ee1d743969 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/api.mustache
@@ -32,7 +32,7 @@ public interface {{classname}} extends ApiClient.Api {
{{/returnType}}
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
@RequestLine("{{httpMethod}} {{{path}}}{{#hasQueryParams}}?{{/hasQueryParams}}{{#queryParams}}{{baseName}}={{=<% %>=}}{<%paramName%>}<%={{ }}=%>{{#hasMore}}&{{/hasMore}}{{/queryParams}}")
@@ -70,7 +70,7 @@ public interface {{classname}} extends ApiClient.Api {
{{/returnType}}
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
@RequestLine("{{httpMethod}} {{{path}}}?{{#queryParams}}{{baseName}}={{=<% %>=}}{<%paramName%>}<%={{ }}=%>{{#hasMore}}&{{/hasMore}}{{/queryParams}}")
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache
index f3cba416b0a..ce026ab79e4 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/api.mustache
@@ -54,7 +54,7 @@ public class {{classname}} {
{{/isDeprecated}}
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
index ec18b454cd4..a5241d8acae 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/api.mustache
@@ -72,7 +72,7 @@ public class {{classname}} {
* @throws ApiException If fail to serialize the request body object
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
public com.squareup.okhttp.Call {{operationId}}Call({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
@@ -177,7 +177,7 @@ public class {{classname}} {
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
@@ -193,7 +193,7 @@ public class {{classname}} {
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
public ApiResponse<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{operationId}}WithHttpInfo({{#allParams}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
@@ -211,7 +211,7 @@ public class {{classname}} {
* @throws ApiException If fail to process the API call, e.g. serializing the request body object
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
public com.squareup.okhttp.Call {{operationId}}Async({{#allParams}}{{{dataType}}} {{paramName}}, {{/allParams}}final ApiCallback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Void{{/returnType}}> {{localVariablePrefix}}callback) throws ApiException {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/api.mustache
index c3de0de9426..76eeea1e1ec 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/api.mustache
@@ -50,7 +50,7 @@ public class {{classname}} {
{{/isDeprecated}}
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache
index 193d11d1ba1..5daa24d1fb0 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/api.mustache
@@ -57,7 +57,7 @@ public class {{classname}} {
{{/returnType}} * @throws RestClientException if an error occurs while attempting to invoke the API
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws RestClientException {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache
index 898583ace1b..f94389c12a1 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache
@@ -31,7 +31,7 @@ public interface {{classname}} {
{{/returnType}}
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
{{#formParams}}{{#-first}}
@@ -50,7 +50,7 @@ public interface {{classname}} {
* @param cb callback method
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
{{#formParams}}{{#-first}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache
index 7b4eb2d993f..36d4a5c55a9 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache
@@ -42,7 +42,7 @@ public interface {{classname}} {
* @return Call<{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Object{{/returnType}}>
{{#externalDocs}}
* {{description}}
- * @see {{url}}
+ * @see {{summary}} Documentation
{{/externalDocs}}
*/
{{#formParams}}
diff --git a/samples/client/petstore/java/jersey1/docs/StoreApi.md b/samples/client/petstore/java/jersey1/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/jersey1/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey1/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/jersey2-java6/docs/StoreApi.md b/samples/client/petstore/java/jersey2-java6/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/jersey2-java6/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/jersey2-java8/docs/StoreApi.md b/samples/client/petstore/java/jersey2-java8/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/jersey2/docs/StoreApi.md b/samples/client/petstore/java/jersey2/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/jersey2/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey2/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md b/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/resteasy/docs/StoreApi.md b/samples/client/petstore/java/resteasy/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/resteasy/docs/StoreApi.md
+++ b/samples/client/petstore/java/resteasy/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/resttemplate/docs/StoreApi.md b/samples/client/petstore/java/resttemplate/docs/StoreApi.md
index e6dc635e517..7aed6450e6a 100644
--- a/samples/client/petstore/java/resttemplate/docs/StoreApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/StoreApi.md
@@ -94,7 +94,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md b/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md
index 6b53c6a5661..134f0c36578 100644
--- a/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2-play24/docs/StoreApi.md
@@ -95,7 +95,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/retrofit2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2/docs/StoreApi.md
index 6b53c6a5661..134f0c36578 100644
--- a/samples/client/petstore/java/retrofit2/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/StoreApi.md
@@ -95,7 +95,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md
index 6b53c6a5661..134f0c36578 100644
--- a/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/StoreApi.md
@@ -95,7 +95,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
index 6b53c6a5661..134f0c36578 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
@@ -95,7 +95,7 @@ This endpoint does not need any parameter.
### Return type
-[**Map<String, Integer>**](Map.md)
+**Map<String, Integer>**
### Authorization