Merge branch 'master' of github.com:jenkinsci/jenkins

core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly

@@ -88,9 +88,13 @@ THE SOFTWARE.
     -->
     <tr class="build-row">
       <td colspan="3" align="right">
-        <a href="${it.baseUrl}/rssAll"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/> RSS ${%for all}</a>
+        <a href="${it.baseUrl}/rssAll"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/></a>
         <st:nbsp/>
-        <a href="${it.baseUrl}/rssFailed"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/> RSS ${%for failures}</a>
+        <a href="${it.baseUrl}/rssAll">RSS ${%for all}</a>
+        <st:nbsp/>
+        <a href="${it.baseUrl}/rssFailed"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/></a>
+        <st:nbsp/>
+        <a href="${it.baseUrl}/rssFailed">RSS ${%for failures}</a>
       </td>
     </tr>
   </l:pane>

core/src/main/resources/lib/hudson/rssBar.jelly

@@ -27,13 +27,19 @@ THE SOFTWARE.
   <div align="right" style="margin:1em">
     <a href="${rootURL}/legend">${%Legend}</a>
     <span style="padding-left:1em">
-      <a href="rssAll"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/> RSS ${%for all}</a>
+      <a href="rssAll"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/></a>
+      <st:nbsp/>
+      <a href="rssAll">RSS ${%for all}</a>
     </span>
     <span style="padding-left:1em">
-      <a href="rssFailed"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/> RSS ${%for failures}</a>
+      <a href="rssFailed"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/></a>
+      <st:nbsp/>
+      <a href="rssFailed">RSS ${%for failures}</a>
     </span>
     <span style="padding-left:1em">
-      <a href="rssLatest"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/> RSS ${%for just latest builds}</a>
+      <a href="rssLatest"><img src="${imagesURL}/atom.gif" border="0" alt="Feed" height="16" width="16"/></a>
+      <st:nbsp/>
+      <a href="rssLatest">RSS ${%for just latest builds}</a>
     </span>
   </div>
 </j:jelly>

core/src/main/resources/lib/layout/breakable.jelly

@@ -30,6 +30,6 @@ THE SOFTWARE.
     <st:attribute name="value" use="required">
       Unescaped value to output
     </st:attribute>
-  </st:documentation>
-  ${h.breakableString(h.escape(value))}
-</j:jelly>
+  </st:documentation>${
+    h.breakableString(h.escape(value))
+}</j:jelly>