diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 7814c9683..94007b232 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.7.15
   - fixed #10629: WebGUI::ProfileField create new field bug
+  - fixed #10626: Carriage returns stripped from Wiki comments
 
 7.7.14
  - fixed #10606: shelf selector
diff --git a/lib/WebGUI/AssetAspect/Comments.pm b/lib/WebGUI/AssetAspect/Comments.pm
index bf26fefd6..59d0d2b58 100644
--- a/lib/WebGUI/AssetAspect/Comments.pm
+++ b/lib/WebGUI/AssetAspect/Comments.pm
@@ -257,7 +257,7 @@ sub getFormattedComments {
 		if ($canEdit) {
 			$out .= q{ <a href="}.$self->getUrl("func=deleteComment;commentId=".$comment->{id}).q{">[X]</a> };
 		}
-		$out .= q{<b>}.$comment->{alias}.q{:</b> "}.WebGUI::HTML::format($comment->{comment},'html').q{"</div>};
+		$out .= q{<b>}.$comment->{alias}.q{:</b> "}.WebGUI::HTML::format($comment->{comment},'text').q{"</div>};
 	}
 	if ($self->canComment) {
 		$out .= '<div class="assetAspectCommentForm">';
diff --git a/lib/WebGUI/HTML.pm b/lib/WebGUI/HTML.pm
index 43532948c..779b64c6d 100644
--- a/lib/WebGUI/HTML.pm
+++ b/lib/WebGUI/HTML.pm
@@ -182,7 +182,8 @@ The text content to be formatted.
 
 =head3 contentType
 
-The content type to use as formatting. Valid types are 'html', 'text', 'code', and 'mixed'. Defaults to mixed. See also the contentType method in WebGUI::Form, WebGUI::HTMLForm, and WebGUI::FormProcessor.
+The content type to use as formatting. Valid types are 'text', 'code', and 'mixed'. The default contentType is 'mixed'.
+See also the contentType method in WebGUI::Form, WebGUI::HTMLForm, and WebGUI::FormProcessor.
 
 =cut