Index: xwiki-platform-web/standard/src/main/webapp/skins/albatross/editactions.vm
===================================================================
--- xwiki-platform-web/standard/src/main/webapp/skins/albatross/editactions.vm	(revision 4018)
+++ xwiki-platform-web/standard/src/main/webapp/skins/albatross/editactions.vm	(working copy)
@@ -45,6 +45,14 @@
 $msg.get("core.comment"): <input type="text" name="comment" value="" size="80" />
 #end
 #end
+
+#if((!$tdoc.isNew())&&(!$minorFieldAdded)&&($xwiki.hasMinorEdit()))
+#set($minorFieldAdded = 1)
+<br />
+<input type="checkbox" name="minorEdit" /> $msg.get("core.minoredit")
+<br />
+#end
+
 #set($param = "")
 #if ($sectionNumber && ($sectionNumber != 0))
    #set($param = "section=$sectionNumber")
Index: xwiki-platform-web/standard/src/main/webapp/skins/albatross/historyinline.vm
===================================================================
--- xwiki-platform-web/standard/src/main/webapp/skins/albatross/historyinline.vm	(revision 4018)
+++ xwiki-platform-web/standard/src/main/webapp/skins/albatross/historyinline.vm	(working copy)
@@ -20,38 +20,49 @@
 #if(!$revisionscount)
 #set($revisionscount = 0)
 #end
+#set($skipnext = false)
+#set($versionshown = 0)
 #if ($tdoc.realLanguage!="")
 #set($lang = "&amp;language=${tdoc.realLanguage}")
 #else
 #set($lang = "")
 #end
 #foreach ($version in $tdoc.getRecentRevisions($revisionscount))
-#set($origdoc = "")
-#set($newdoc = "")
 #set($nextversion = $version)
-#set($newdoc = $xwiki.getDocument($tdoc, $nextversion))
-        <tr class="row#if($velocityCount % 2 == 1) even #else odd #end">
+#set($revinfo = $tdoc.getRevisionInfo($nextversion))
+#if($xwiki.hasMinorEdit() && (!$request.getParameter("showminor")))
+  #set($skipcur = $skipnext)
+  #set($skipnext = $revinfo.isMinorEdit())
+#end
+#if(!$skipcur)
+  #set($versionshown = $versionshown + 1)
+        <tr class="row#if($versionshown % 2 == 1) even #else odd #end">
           <td><input type="radio" name="rev1" value="$nextversion" /></td>
           <td><input type="radio" name="rev2" value="$nextversion" /></td>
           <td><a href="$tdoc.getURL("viewrev","rev=$nextversion")">$nextversion</a></td>
-#if($newdoc=="")
-          <td>&ndash;</td>
-          <td>&ndash;</td>
-#else
-          <td>$xwiki.getLocalUserName($newdoc.author)</td>
-          <td>$xwiki.formatDate($newdoc.date, "dd/MM/yyyy hh:mm")</td>
-#end
+          <td>$xwiki.getLocalUserName($revinfo.author)</td>
+          <td>$xwiki.formatDate($revinfo.date, "dd/MM/yyyy hh:mm")</td>
 #if($xwiki.hasEditComment())
-          <td>$!{newdoc.comment}</td>
+          <td>$!{revinfo.comment}</td>
 #end
 #if($hasedit || $hasadmin)
           <td class="xwikibuttonlink"><a href="$tdoc.getURL("rollback","rev=$nextversion$lang")" onclick="if (confirm('$msg.get("readytorollback") $nextversion')){this.href += '&amp;confirm=1'; return true;} return false;">$msg.get("rollback")</a></td>
 #end
         </tr>
 #end
+#end
 </table>
-      <div class="buttons"><div class="buttonwrapper"><input type="submit" accesskey="c" value="$msg.get("compare")" class="button"/></div></div>
+      <div class="buttons">
+        <div class="buttonwrapper"><input type="submit" accesskey="c" value="$msg.get("compare")" class="button"/></div>
+        #if($xwiki.hasMinorEdit())
+          #if(!$request.getParameter("showminor"))
+            <div class="buttonwrapper"><a href="$tdoc.getURL("view","viewer=history&amp;showminor=1&amp;$docvariant")">$msg.get("core.minoredit.show")</a></div>
+          #else
+            <div class="buttonwrapper"><a href="$tdoc.getURL("view","viewer=history&amp;$docvariant")">$msg.get("core.minoredit.hide")</a></div>
+          #end
+        #end
       </div>
+      </div>
     </div>
   </form>
   </div>
Index: xwiki-platform-web/standard/src/main/webapp/templates/preview.vm
===================================================================
--- xwiki-platform-web/standard/src/main/webapp/templates/preview.vm	(revision 4018)
+++ xwiki-platform-web/standard/src/main/webapp/templates/preview.vm	(working copy)
@@ -17,6 +17,7 @@
 <input type="hidden" name="language" value="$!request.getParameter("language")" />
 <input type="hidden" name="isResponsePreviewCorrect" value="$isResponseCorrect">
 <input type="hidden" name="comment" value="$!doc.getComment()" />
+<input type="hidden" name="minorEdit" value="$!doc.isMinorEdit()" />
 </p>
 <div id="xwikiobject">
 #template("hiddenobject.vm")
Index: xwiki-product-enterprise/wiki/src/main/resources/Main/Dashboard
===================================================================
--- xwiki-product-enterprise/wiki/src/main/resources/Main/Dashboard	(revision 4018)
+++ xwiki-product-enterprise/wiki/src/main/resources/Main/Dashboard	(working copy)
@@ -66,7 +66,11 @@
   &lt;div id="webhomeNewsdisplay" style="float:left; width: 50%;"&gt;
     &lt;div style="padding-left: 20px;"&gt;
       &lt;h2 class="heading-1-1-1"&gt;Recent changes &lt;a href="$xwiki.getURL("Main.WebRss", "view", "xpage=rdf")")" style=""&gt;&lt;img src="$xwiki.getSkinFile("icons/black-rss.png")"/&gt;&lt;/a&gt;&lt;/h2&gt;
-      #set ($sql = "where 1=1 order by doc.date desc")
+      #if($request.getParameter("showminor"))
+        #set ($sql = "where 1=1 order by doc.date desc")
+      #else
+        #set ($sql = ", XWikiRCSNodeInfo as ni where doc.id=ni.id.docId and ni.id.version2=1 group by doc.web, doc.name order by max(ni.date) desc")
+      #end
       #set($showdata = 1)
       #if(!$nb)
         #set($nb = 30)
@@ -122,8 +126,13 @@
           #end
         #end
       &lt;/ul&gt;
+      #if($request.getParameter("showminor"))
+        &lt;a href="$xwiki.getURL($tdoc.getFullName(), "view", "")"&gt;hide minor edits&lt;/a&gt;
+      #else
+        &lt;a href="$xwiki.getURL($tdoc.getFullName(), "view", "showminor")"&gt;show minor edits&lt;/a&gt;
+      #end
     &lt;/div&gt;
   &lt;/div&gt;
   &lt;div style="clear:both; margin-bottom: 40px;"&gt;&lt;!-- --&gt;&lt;/div&gt;
 &lt;/div&gt;
-</content></xwikidoc>
\ No newline at end of file
+</content></xwikidoc>