Index: standard/src/main/webapp/WEB-INF/xwiki.cfg
===================================================================
--- standard/src/main/webapp/WEB-INF/xwiki.cfg	(revision 3830)
+++ standard/src/main/webapp/WEB-INF/xwiki.cfg	(working copy)
@@ -76,6 +76,9 @@
 ## is empty. 0 means there is no popup. This setting is ignored is mandatory is set)
 xwiki.editcomment.suggested=0
 
+## Use minor edit feature
+xwiki.minoredit=1
+
 # GraphViz plugin configuration. The GraphViz plugin is not configured by default.
 # To enable it, add "com.xpn.xwiki.plugin.graphviz.GraphVizPlugin" to the list of plugins
 # in the xwiki.plugins property.
Index: standard/src/main/webapp/skins/albatross/editactions.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/editactions.vm	(revision 3830)
+++ 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((!$minorFieldAdded)&&($xwiki.hasMinorEdit()))
+#set($minorFieldAdded = 1)
+<br />
+$msg.get("core.minoredit"): <input type="checkbox" name="minorEdit" />
+<br />
+#end
+
 #set($param = "")
 #if ($sectionNumber && ($sectionNumber != 0))
    #set($param = "section=$sectionNumber")
Index: standard/src/main/webapp/skins/albatross/historyinline.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/historyinline.vm	(revision 3830)
+++ standard/src/main/webapp/skins/albatross/historyinline.vm	(working copy)
@@ -20,6 +20,7 @@
 #if(!$revisionscount)
 #set($revisionscount = 0)
 #end
+#set($skipnext = false)
 #if ($tdoc.realLanguage!="")
 #set($lang = "&amp;language=${tdoc.realLanguage}")
 #else
@@ -30,6 +31,11 @@
 #set($newdoc = "")
 #set($nextversion = $version)
 #set($newdoc = $xwiki.getDocument($tdoc, $nextversion))
+#if($xwiki.hasMinorEdit() && !$request.getParameter("showminor"))
+  #set($skipcur = $skipnext)
+  #set($skipnext = $newdoc.isMinorEdit())
+#end
+#if(!$skipcur)
         <tr class="row#if($velocityCount % 2 == 1) even #else odd #end">
           <td><input type="radio" name="rev1" value="$nextversion" /></td>
           <td><input type="radio" name="rev2" value="$nextversion" /></td>
@@ -49,9 +55,19 @@
 #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&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: standard/src/main/webapp/templates/preview.vm
===================================================================
--- standard/src/main/webapp/templates/preview.vm	(revision 3830)
+++ 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")