Merge pull request #22495 from sftim/20200713_retain_whitespace_in_callouts

Fix whitespace trimming for note callout shortcode

Author: k8s-ci-robot

layouts/shortcodes/note.html

@@ -1,3 +1,3 @@
 <blockquote class="note">
-  <div><strong>{{ T "note" }}</strong> {{ replaceRE "\\s+|\n" " " .Inner | markdownify }}</div>
+  <div><strong>{{ T "note" }}</strong> {{ trim .Inner " \n" | markdownify }}</div>
 </blockquote>