changeset 1441:f87452b408df

merged
author Pavel Sviderski <pavel@psviderski.name>
date Sat, 09 Jun 2012 00:04:57 +0400
parents b4d9048ce48a (current diff) 5f6ee0ddb0aa (diff)
children 11a61fb8d985
files
diffstat 140 files changed, 433 insertions(+), 360 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/_tests/pep8.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/_tests/pep8.py	Sat Jun 09 00:04:57 2012 +0400
@@ -914,3 +914,4 @@
 
 if __name__ == '__main__':
     _main()
+
--- a/MoinMoin/_tests/wiki/data/plugin/__init__.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/_tests/wiki/data/plugin/__init__.py	Sat Jun 09 00:04:57 2012 +0400
@@ -1,3 +1,4 @@
 """
 This file was added so as to make hg track the folders necessary for the tests.
 """
+
--- a/MoinMoin/apps/__init__.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/apps/__init__.py	Sat Jun 09 00:04:57 2012 +0400
@@ -11,3 +11,4 @@
 - admin Module for special stuff for wiki admins
 - serve Module for static file serving
 """
+
--- a/MoinMoin/apps/misc/_tests/test_misc.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/apps/misc/_tests/test_misc.py	Sat Jun 09 00:04:57 2012 +0400
@@ -29,3 +29,4 @@
             rv = c.get(url_for('misc.urls_names'))
             assert rv.status == '200 OK'
             assert rv.headers['Content-Type'] == 'text/plain; charset=utf-8'
+
--- a/MoinMoin/auth/log.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/auth/log.py	Sat Jun 09 00:04:57 2012 +0400
@@ -35,3 +35,4 @@
     def logout(self, user_obj, **kw):
         self.log('logout', user_obj, kw)
         return user_obj, True
+
--- a/MoinMoin/converter/_tests/test__args_wiki.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test__args_wiki.py	Sat Jun 09 00:04:57 2012 +0400
@@ -38,3 +38,4 @@
 
     s = unparse(Arguments(positional, keyword))
     assert s == wiki
+
--- a/MoinMoin/converter/_tests/test_docbook_out.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_docbook_out.py	Sat Jun 09 00:04:57 2012 +0400
@@ -217,3 +217,4 @@
         ]
         for i in data:
             yield (self.do, ) + i
+
--- a/MoinMoin/converter/_tests/test_html_in.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_html_in.py	Sat Jun 09 00:04:57 2012 +0400
@@ -271,3 +271,4 @@
         ]
         for i in data:
             yield (self.do, ) + i
+
--- a/MoinMoin/converter/_tests/test_html_in_out.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_html_in_out.py	Sat Jun 09 00:04:57 2012 +0400
@@ -211,3 +211,4 @@
         ]
         for i in data:
             yield (self.do, ) + i
+
--- a/MoinMoin/converter/_tests/test_html_out.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_html_out.py	Sat Jun 09 00:04:57 2012 +0400
@@ -245,3 +245,4 @@
     def test_unknown(self):
         page = ET.XML("<page:unknown {0}/>".format(self.input_namespaces))
         pytest.raises(ElementException, self.conv.__call__, page)
+
--- a/MoinMoin/converter/_tests/test_include.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_include.py	Sat Jun 09 00:04:57 2012 +0400
@@ -129,3 +129,4 @@
         rendered = MoinWiki.create(u'page1')._render_data()
         assert '<p />' not in rendered
         assert '<p></p>' not in rendered
+
--- a/MoinMoin/converter/_tests/test_mediawiki_in.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_mediawiki_in.py	Sat Jun 09 00:04:57 2012 +0400
@@ -166,3 +166,4 @@
         assert self.serialize(out) == output
 
 coverage_modules = ['MoinMoin.converter.mediawiki_in']
+
--- a/MoinMoin/converter/_tests/test_moinwiki_in.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_moinwiki_in.py	Sat Jun 09 00:04:57 2012 +0400
@@ -317,3 +317,4 @@
             pytest.skip(skip)
         out = self.conv(input, 'text/x.moin.wiki;charset=utf-8', **args)
         assert self.serialize(out) == output
+
--- a/MoinMoin/converter/_tests/test_moinwiki_out.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_moinwiki_out.py	Sat Jun 09 00:04:57 2012 +0400
@@ -147,3 +147,4 @@
             yield (self.do, ) + i
 
 coverage_modules = ['MoinMoin.converter.moinwiki_out']
+
--- a/MoinMoin/converter/_tests/test_rst_in.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_rst_in.py	Sat Jun 09 00:04:57 2012 +0400
@@ -155,3 +155,4 @@
         assert self.serialize(out) == output
 
 coverage_modules = ['MoinMoin.converter.rst_in']
+
--- a/MoinMoin/converter/_tests/test_rst_out.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_rst_out.py	Sat Jun 09 00:04:57 2012 +0400
@@ -181,3 +181,4 @@
             yield (self.do, ) + i
 
 coverage_modules = ['MoinMoin.converter.rst_out']
+
--- a/MoinMoin/converter/_tests/test_smiley.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_tests/test_smiley.py	Sat Jun 09 00:04:57 2012 +0400
@@ -77,3 +77,4 @@
     result = tree.xpath(query)
     print 'query result:', result
     assert result
+
--- a/MoinMoin/converter/_wiki_macro.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/_wiki_macro.py	Sat Jun 09 00:04:57 2012 +0400
@@ -7,6 +7,8 @@
 Base class for wiki parser with macro support.
 """
 
+from MoinMoin import log
+logging = log.getLogger(__name__)
 
 from emeraldtree import ElementTree as ET
 
@@ -110,8 +112,10 @@
     def macro(self, name, args, text, context_block=False):
         func = getattr(self, '_{0}_repl'.format(name), None)
         if func is not None:
+            logging.debug("builtin macro: %r" % name)
             return func(args, text, context_block)
 
+        logging.debug("extension macro: %r" % name)
         tag = context_block and moin_page.part or moin_page.inline_part
 
         elem = tag(attrib={
@@ -146,6 +150,7 @@
             type = Type(name)
         else:
             type = Type(type='x-moin', subtype='format', parameters={'name': name})
+        logging.debug("parser type: %r" % type)
 
         elem = moin_page.part(attrib={moin_page.content_type: type})
 
@@ -165,4 +170,3 @@
 
         return elem
 
-
--- a/MoinMoin/converter/macro.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/macro.py	Sat Jun 09 00:04:57 2012 +0400
@@ -13,8 +13,9 @@
 from flask import current_app as app
 
 from emeraldtree import ElementTree as ET
-import logging
-logger = logging.getLogger(__name__)
+
+from MoinMoin import log
+logging = log.getLogger(__name__)
 
 from MoinMoin.util import plugins
 from MoinMoin.i18n import _, L_, N_
@@ -32,6 +33,7 @@
             return cls()
 
     def handle_macro(self, elem, page):
+        logging.debug("handle_macro elem: %r" % elem)
         type = elem.get(moin_page.content_type)
         alt = elem.get(moin_page.alt)
 
@@ -40,6 +42,7 @@
 
         type = Type(type)
         if not (type.type == 'x-moin' and type.subtype == 'macro'):
+            logging.debug("not a macro, skipping: %r" % type)
             return
 
         name = type.parameters['name']
@@ -109,7 +112,6 @@
     def __call__(self, tree):
         for elem, page in self.recurse(tree, None):
             self.handle_macro(elem, page)
-
         return tree
 
 from . import default_registry
--- a/MoinMoin/converter/moinwiki_in.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/moinwiki_in.py	Sat Jun 09 00:04:57 2012 +0400
@@ -361,7 +361,7 @@
                 args = Arguments(keyword={'_old': nowiki_args_old})
             else:
                 args = None
-
+            logging.debug("nowiki_name: %r" % nowiki_name)
             # Parse it directly if the type is ourself
             if not nowiki_name or nowiki_name == 'wiki':
                 body = self.parse_block(lines, args)
--- a/MoinMoin/converter/pdf_in.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/pdf_in.py	Sat Jun 09 00:04:57 2012 +0400
@@ -67,3 +67,4 @@
 from . import default_registry
 from MoinMoin.util.mime import Type, type_text_plain
 default_registry.register(PDFIndexingConverter._factory, Type('application/pdf'), type_text_plain)
+
--- a/MoinMoin/converter/pygments_in.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/converter/pygments_in.py	Sat Jun 09 00:04:57 2012 +0400
@@ -84,6 +84,7 @@
                 else:
                     pygments_name = None
 
+            logging.debug("pygments_name: %r" % pygments_name)
             if pygments_name:
                 lexer = pygments.lexers.find_lexer_class(pygments_name)
                 return cls(lexer())
--- a/MoinMoin/datastruct/backends/_tests/test_composite_dicts.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/datastruct/backends/_tests/test_composite_dicts.py	Sat Jun 09 00:04:57 2012 +0400
@@ -31,3 +31,4 @@
 
 
 coverage_modules = ['MoinMoin.datastruct.backends.composite_dicts']
+
--- a/MoinMoin/datastruct/backends/_tests/test_composite_groups.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/datastruct/backends/_tests/test_composite_groups.py	Sat Jun 09 00:04:57 2012 +0400
@@ -86,3 +86,4 @@
 
 
 coverage_modules = ['MoinMoin.datastruct.backends.composite_groups']
+
--- a/MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/datastruct/backends/_tests/test_lazy_config_groups.py	Sat Jun 09 00:04:57 2012 +0400
@@ -55,3 +55,4 @@
 
 
 coverage_modules = ['MoinMoin.datastruct.backends.config_lazy_groups']
+
--- a/MoinMoin/datastruct/backends/config_lazy_groups.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/datastruct/backends/config_lazy_groups.py	Sat Jun 09 00:04:57 2012 +0400
@@ -41,3 +41,4 @@
 
     def _group_has_member(self, group_name, member):
         return group_name in self and member in self._groups[group_name]
+
--- a/MoinMoin/macro/__init__.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/macro/__init__.py	Sat Jun 09 00:04:57 2012 +0400
@@ -16,3 +16,4 @@
 from MoinMoin.util import pysupport
 
 modules = pysupport.getPackageModules(__file__)
+
--- a/MoinMoin/script/maint/moinshell.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/script/maint/moinshell.py	Sat Jun 09 00:04:57 2012 +0400
@@ -79,3 +79,4 @@
                 pass
 
         code.interact(self.banner, local=context)
+
--- a/MoinMoin/script/migration/__init__.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/script/migration/__init__.py	Sat Jun 09 00:04:57 2012 +0400
@@ -4,3 +4,4 @@
 """
 MoinMoin - migration scripts
 """
+
--- a/MoinMoin/script/migration/moin19/_logfile19.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/script/migration/moin19/_logfile19.py	Sat Jun 09 00:04:57 2012 +0400
@@ -454,3 +454,4 @@
             self._output.write(line)
             self._output.close() # does this maybe help against the sporadic fedora wikis 160 \0 bytes in the edit-log?
             del self._output # re-open the output file automagically
+
--- a/MoinMoin/search/_tests/test_analyzers.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/search/_tests/test_analyzers.py	Sat Jun 09 00:04:57 2012 +0400
@@ -169,3 +169,4 @@
         for value, expected_tokens in self.test_cases_index:
             tokens = [token.text for token in tokenizer(value, mode="index")]
             assert set(expected_tokens) == set(tokens)
+
--- a/MoinMoin/security/_tests/test_ticket.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/security/_tests/test_ticket.py	Sat Jun 09 00:04:57 2012 +0400
@@ -27,3 +27,4 @@
 
 
 coverage_modules = ['MoinMoin.security.ticket']
+
--- a/MoinMoin/security/textcha.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/security/textcha.py	Sat Jun 09 00:04:57 2012 +0400
@@ -176,3 +176,4 @@
     """a form providing TextCha support"""
     textcha_question = String
     textcha = String.using(label=L_('TextCha')).validated_by(TextChaValid())
+
--- a/MoinMoin/signalling/log.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/signalling/log.py	Sat Jun 09 00:04:57 2012 +0400
@@ -21,3 +21,4 @@
 def log_item_modified(app, item_name):
     wiki_name = app.cfg.interwikiname
     logging.info("item {0}:{1} modified".format(wiki_name, item_name))
+
--- a/MoinMoin/static/js/common.js	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/static/js/common.js	Sat Jun 09 00:04:57 2012 +0400
@@ -488,3 +488,4 @@
     $('#moin-usersettings form').submit(submitHandler);
 }
 $(document).ready(initMoinUsersettings);
+
--- a/MoinMoin/static/js/countdown.js	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/static/js/countdown.js	Sat Jun 09 00:04:57 2012 +0400
@@ -40,6 +40,6 @@
     counter -= step
 
     // Set timer for next update
-    setTimeout("countdown()", delay);    
+    setTimeout("countdown()", delay);
 }
 
--- a/MoinMoin/static/js/index_action.js	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/static/js/index_action.js	Sat Jun 09 00:04:57 2012 +0400
@@ -1,6 +1,6 @@
 /*
  * Script for the actions performed on the items at index page.
- * Copyright 2011, AkashSinha<akash2607@gmail.com> 
+ * Copyright 2011, AkashSinha<akash2607@gmail.com>
  */
 
 var actionLoading = [];
@@ -61,7 +61,7 @@
     });
     var itemnames = JSON.stringify(links);
     var actionTrigger = "moin-" + action + "-trigger";
-    url = $("#" + actionTrigger).attr("actionurl");
+    url = $("#" + actionTrigger).attr("data-actionurl");
     $("#popup").css("display", "none");
     $(".moin-index-message span").text(actionLoading[action]);
     $(".moin-index-message").css("display", "block");
@@ -81,7 +81,7 @@
                     else {
                         show_conflict($('.selected-item').children('a.moin-item[title="' + itemname + '"]'));
                         left_item++;
-                   }  
+                   }
                    });
                    var message = "Items " + actionDone[action] + ": " + success_item ;
                    if(left_item)
@@ -125,7 +125,7 @@
         else {
             $(".moin-contenttypes-wrapper form").find(".helper-text").css("display", "block");
         }
-            
+
         return false;
     });
 
@@ -156,7 +156,7 @@
              actionsDiv.addClass("action-visible");
          }
     });
-    
+
     $(".moin-select-allitem").click(function () {
         if($(this).hasClass("allitem-toselect")) {
             $(".moin-item-index div").removeClass().addClass("selected-item");
@@ -185,7 +185,7 @@
             }, 4000);
         }
         else {
-            if(this.id == "moin-delete-trigger") 
+            if(this.id == "moin-delete-trigger")
                 showpop("delete");
             else
                 showpop("destroy");
@@ -240,3 +240,4 @@
     $('#moin-download-trigger').multiDownload('click', { delay: 3000 });
 
 });
+
--- a/MoinMoin/static/js/jfu.js	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/static/js/jfu.js	Sat Jun 09 00:04:57 2012 +0400
@@ -44,7 +44,7 @@
             });
         };
     }
-        
+
     UploadHandler = function (container, options) {
         var uploadHandler = this;
 
@@ -57,11 +57,11 @@
         this.uploadTemplate = this.uploadTable.find('.file_upload_template:first');
         this.downloadTemplate = this.downloadTable.find('.file_download_template:first');
         this.multiButtons = container.find('.file_upload_buttons:first');
-        
+
         this.formatFileName = function (name) {
             return name.replace(/^.*[\/\\]/, '');
         };
-        
+
         this.enableDragToDesktop = function () {
             var link = $(this),
                 url = link.get(0).href,
@@ -118,7 +118,7 @@
             return uploadRow;
             }
             return null;
-            
+
         };
 
         this.buildMultiDownloadRow = function (files, handler) {
@@ -146,7 +146,7 @@
                 .attr('class', fileContenttype || null);
             return downloadRow;
         };
-        
+
         this.beforeSend = function (event, files, index, xhr, handler, callBack) {
             var fileSize = null;
             if (typeof index === 'undefined') {
@@ -201,12 +201,12 @@
 
         this.destroyEventHandlers = function () {
         };
-        
+
         this.multiButtonHandler = function (e) {
             uploadHandler.uploadTable.find(e.data.selector + ' button:visible').click();
             e.preventDefault();
         };
-        
+
         this.initMultiButtons = function () {
             uploadHandler.multiButtons.find('.file_upload_start:first')
                 .button({icons: {primary: 'ui-icon-circle-arrow-e'}})
@@ -215,7 +215,7 @@
                 .button({icons: {primary: 'ui-icon-cancel'}})
                 .bind('click', {selector: '.file_upload_cancel'}, uploadHandler.multiButtonHandler);
         };
-        
+
         this.destroyMultiButtons = function () {
             uploadHandler.multiButtons.find(
                 '.file_upload_start:first, .file_upload_cancel:first'
@@ -241,7 +241,7 @@
                 $(this).fileUploadUI(new UploadHandler($(this), options));
             });
         },
-        
+
         option: function (option, value, namespace) {
             if (!option || (typeof option === 'string' && typeof value === 'undefined')) {
                 return $(this).fileUpload('option', option, value, namespace);
@@ -250,20 +250,20 @@
                 $(this).fileUploadUI('option', option, value, namespace);
             });
         },
-            
+
         destroy : function (namespace) {
             return this.each(function () {
                 $(this).fileUploadUI('destroy', namespace);
             });
         },
-        
+
         upload: function (files, namespace) {
             return this.each(function () {
                 $(this).fileUploadUI('upload', files, namespace);
             });
         }
     };
-    
+
     $.fn.fileUploadUIX = function (method) {
         if (methods[method]) {
             return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
@@ -273,7 +273,7 @@
             $.error('Method "' + method + '" does not exist on jQuery.fileUploadUIX');
         }
     };
-    
+
 }(jQuery));
 
 
@@ -294,3 +294,4 @@
     // Initialize jQuery File Upload (Extended User Interface Version):
     $('#file_upload').fileUploadUIX();
 });
+
--- a/MoinMoin/storage/backends/__init__.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/storage/backends/__init__.py	Sat Jun 09 00:04:57 2012 +0400
@@ -77,3 +77,4 @@
         """
         delete meta, data related to metaid from the backend
         """
+
--- a/MoinMoin/storage/middleware/_tests/__init__.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/storage/middleware/_tests/__init__.py	Sat Jun 09 00:04:57 2012 +0400
@@ -4,3 +4,4 @@
 """
 MoinMoin - middleware tests
 """
+
--- a/MoinMoin/storage/stores/_tests/test_fs.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/storage/stores/_tests/test_fs.py	Sat Jun 09 00:04:57 2012 +0400
@@ -39,3 +39,4 @@
 def test_from_uri(tmpdir, Store):
     store = Store.from_uri("%s" % tmpdir)
     assert store.path == tmpdir
+
--- a/MoinMoin/storage/stores/_tests/test_memory.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/storage/stores/_tests/test_memory.py	Sat Jun 09 00:04:57 2012 +0400
@@ -33,3 +33,4 @@
 def test_from_uri(Store):
     store = Store.from_uri("mem://")
     assert isinstance(store, Store)
+
--- a/MoinMoin/storage/stores/_tests/test_sqla.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/storage/stores/_tests/test_sqla.py	Sat Jun 09 00:04:57 2012 +0400
@@ -33,3 +33,4 @@
     store = Store.from_uri("sqlite://%s::test_base" % tmpdir)
     assert store.db_uri == "sqlite://%s" % tmpdir
     assert store.table_name == "test_base"
+
--- a/MoinMoin/templates/atom.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/atom.html	Sat Jun 09 00:04:57 2012 +0400
@@ -1,62 +1,62 @@
-{% import "utils.html" as utils %}
-{% macro show_meta(rev) %}
-    <div class="moin-diff-info moin-diff-info-rev-id">
-        <span class="moin-diff-info-caption">{{ _('Revision') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['revid'] | shorten_id }}</span>
-    </div>
-    <div class="moin-diff-info moin-diff-info-rev-size">
-        <span class="moin-diff-info-caption">{{ _('Size') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['size'] }}</span>
-    </div>
-    <div class="moin-diff-info moin-diff-info-rev-comment">
-        <span class="moin-diff-info-caption">{{ _('Comment') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['comment'] }}</span>
-    </div>
-{% endmacro %}
-
-{# A few style rules to ensure the content doesn't overflow #}
-{% macro atom_style() %}
-    <style type="text/css">
-        img {
-            max-width: 100%;
-        }
-        td {
-            padding-right: 10px;
-        }
-        table {
-            width: 100%;
-        }
-    </style>
-{% endmacro %}
-
-{%- if get == 'xml' -%}
-    <?xml-stylesheet type="text/xsl" href="{{ theme_static('atom.xslt') }}"?>
-{%- elif get == 'comment_cont_merge' -%}
-    <p style="font-size: 1.2em">…{{ comment }}</p> <br /> {{ content }}
-{%- elif get == 'first_revision' -%}
-    {{ content }}
-    <br />
-    <table class="moin-diff" cellpadding="10" width="100%">
-        <tr>
-            <td class="moin-diff-header" style="width: 100%;">
-                <strong>{{ show_meta(rev) }}</strong>
-            </td>
-        </tr>
-    </table>
-    {{ atom_style() }}
-{%- elif get == 'binary' -%}
-    {{ content }}
-    <br />
-    <table class="moin-diff" cellpadding="10" width="100%">
-        <tr>
-            <td class="moin-diff-header" style="width: 50%;">
-                <strong>{{ show_meta(oldrev) }}</strong>
-            </td>
-            <td class="moin-diff-header" style="width: 50%;">
-                <strong>{{ show_meta(newrev) }}</strong>
-            </td>
-        </tr>
-    </table>
-    {{ atom_style() }}
-{%- endif -%}
-
+{% import "utils.html" as utils %}
+{% macro show_meta(rev) %}
+    <div class="moin-diff-info moin-diff-info-rev-id">
+        <span class="moin-diff-info-caption">{{ _('Revision') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['revid'] | shorten_id }}</span>
+    </div>
+    <div class="moin-diff-info moin-diff-info-rev-size">
+        <span class="moin-diff-info-caption">{{ _('Size') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['size'] }}</span>
+    </div>
+    <div class="moin-diff-info moin-diff-info-rev-comment">
+        <span class="moin-diff-info-caption">{{ _('Comment') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['comment'] }}</span>
+    </div>
+{% endmacro %}
+
+{# A few style rules to ensure the content doesn't overflow #}
+{% macro atom_style() %}
+    <style type="text/css">
+        img {
+            max-width: 100%;
+        }
+        td {
+            padding-right: 10px;
+        }
+        table {
+            width: 100%;
+        }
+    </style>
+{% endmacro %}
+
+{%- if get == 'xml' -%}
+    <?xml-stylesheet type="text/xsl" href="{{ theme_static('atom.xslt') }}"?>
+{%- elif get == 'comment_cont_merge' -%}
+    <p style="font-size: 1.2em">…{{ comment }}</p> <br /> {{ content }}
+{%- elif get == 'first_revision' -%}
+    {{ content }}
+    <br />
+    <table class="moin-diff" cellpadding="10" width="100%">
+        <tr>
+            <td class="moin-diff-header" style="width: 100%;">
+                <strong>{{ show_meta(rev) }}</strong>
+            </td>
+        </tr>
+    </table>
+    {{ atom_style() }}
+{%- elif get == 'binary' -%}
+    {{ content }}
+    <br />
+    <table class="moin-diff" cellpadding="10" width="100%">
+        <tr>
+            <td class="moin-diff-header" style="width: 50%;">
+                <strong>{{ show_meta(oldrev) }}</strong>
+            </td>
+            <td class="moin-diff-header" style="width: 50%;">
+                <strong>{{ show_meta(newrev) }}</strong>
+            </td>
+        </tr>
+    </table>
+    {{ atom_style() }}
+{%- endif -%}
+
--- a/MoinMoin/templates/base.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/base.html	Sat Jun 09 00:04:57 2012 +0400
@@ -74,3 +74,4 @@
 
 </body>
 </html>
+
--- a/MoinMoin/templates/diff.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/diff.html	Sat Jun 09 00:04:57 2012 +0400
@@ -6,3 +6,4 @@
 {% endblock %}
 {{ diff_html }}
 {% endblock %}
+
--- a/MoinMoin/templates/diff_text.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/diff_text.html	Sat Jun 09 00:04:57 2012 +0400
@@ -45,3 +45,4 @@
         </tr>
     {% endfor %}
 </table>
+
--- a/MoinMoin/templates/diff_text_atom.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/diff_text_atom.html	Sat Jun 09 00:04:57 2012 +0400
@@ -1,43 +1,43 @@
-{% import "utils.html" as utils %}
-
-{% macro show_meta(rev) %}
-    <div class="moin-diff-info moin-diff-info-rev-id">
-        <span class="moin-diff-info-caption">{{ _('Revision') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['revid'] | shorten_id }}</span>
-    </div>
-    <div class="moin-diff-info moin-diff-info-rev-size">
-        <span class="moin-diff-info-caption">{{ _('Size') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['size'] }}</span>
-    </div>
-    <div class="moin-diff-info moin-diff-info-rev-comment">
-        <span class="moin-diff-info-caption">{{ _('Comment') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['comment'] }}</span>
-    </div>
-{% endmacro %}
-<table class="moin-diff" style="width: 100%;">
-    {% for llineno, lcontent, rlineno, rcontent in diffs %}
-        <tr>
-            <td style="vertical-align: top;">{{ llineno }}:</td>
-            <td class="moin-diff-removed" style="vertical-align: top; background-color:#ff9; word-wrap: break-word;"><blockquote>{{ lcontent }}</blockquote></td>
-            <td style="vertical-align: top;">{{ rlineno }}:</td>
-            <td class="moin-diff-added" style="vertical-align: top; background-color: #cfc; word-wrap: break-word;"><blockquote>{{ rcontent }}</blockquote></td>
-        </tr>
-    {% endfor %}
-    <tr>
-        <td class="moin-diff-header-line" style="width: 3%;">
-        </td>
-        <td class="moin-diff-header" style="width: 47%;">
-            <strong>{{ show_meta(oldrev) }}</strong>
-        </td>
-        <td class="moin-diff-header-line" style="width: 3%;">
-        </td>
-        <td class="moin-diff-header" style="width: 47%;">
-            <strong>{{ show_meta(newrev) }}</strong>
-        </td>    
-    </tr>
-</table>
-<style type="text/css">
-    .moin-diff-added span { background-color: #80FF80; }
-    .moin-diff-removed span { background-color: #FFFF80; }
-</style>
-
+{% import "utils.html" as utils %}
+
+{% macro show_meta(rev) %}
+    <div class="moin-diff-info moin-diff-info-rev-id">
+        <span class="moin-diff-info-caption">{{ _('Revision') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['revid'] | shorten_id }}</span>
+    </div>
+    <div class="moin-diff-info moin-diff-info-rev-size">
+        <span class="moin-diff-info-caption">{{ _('Size') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['size'] }}</span>
+    </div>
+    <div class="moin-diff-info moin-diff-info-rev-comment">
+        <span class="moin-diff-info-caption">{{ _('Comment') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['comment'] }}</span>
+    </div>
+{% endmacro %}
+<table class="moin-diff" style="width: 100%;">
+    {% for llineno, lcontent, rlineno, rcontent in diffs %}
+        <tr>
+            <td style="vertical-align: top;">{{ llineno }}:</td>
+            <td class="moin-diff-removed" style="vertical-align: top; background-color:#ff9; word-wrap: break-word;"><blockquote>{{ lcontent }}</blockquote></td>
+            <td style="vertical-align: top;">{{ rlineno }}:</td>
+            <td class="moin-diff-added" style="vertical-align: top; background-color: #cfc; word-wrap: break-word;"><blockquote>{{ rcontent }}</blockquote></td>
+        </tr>
+    {% endfor %}
+    <tr>
+        <td class="moin-diff-header-line" style="width: 3%;">
+        </td>
+        <td class="moin-diff-header" style="width: 47%;">
+            <strong>{{ show_meta(oldrev) }}</strong>
+        </td>
+        <td class="moin-diff-header-line" style="width: 3%;">
+        </td>
+        <td class="moin-diff-header" style="width: 47%;">
+            <strong>{{ show_meta(newrev) }}</strong>
+        </td>
+    </tr>
+</table>
+<style type="text/css">
+    .moin-diff-added span { background-color: #80FF80; }
+    .moin-diff-removed span { background-color: #FFFF80; }
+</style>
+
--- a/MoinMoin/templates/forms.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/forms.html	Sat Jun 09 00:04:57 2012 +0400
@@ -31,7 +31,11 @@
 
 {% macro render_filter_field(gen, field, field_type, helper_text) %}
   <li>
-    {{ gen.input(field, type=field_type) }}
+    {# Use of auto_value=false below prevents flatland from appending _1
+       to the input id attribute. This is needed so the id will match the for attribute
+       in the matching label generated 2 lines below.
+    #}
+    {{ gen.input(field, type=field_type, auto_value=False) }}
     {{ render_errors(field) }}
     {{ gen.label(field) }}
     <span class="helper-text">
@@ -115,3 +119,4 @@
     <script src="{{ url_for('serve.files', name='jquery_file_upload', filename='jquery.fileupload.js') }}"></script>
     <script src="{{ url_for('serve.files', name='jquery_file_upload', filename='jquery.fileupload-ui.js') }}"></script>
 {% endmacro %}
+
--- a/MoinMoin/templates/global_history.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/global_history.html	Sat Jun 09 00:04:57 2012 +0400
@@ -12,7 +12,7 @@
     <div id="moin-global-history">
         {% for day, revs in history %}
            {% set latest_timestamp = revs[0].meta['mtime'] %}
-            <div class="moin-history-container"> 
+            <div class="moin-history-container">
                 <div class="moin-history-container-header">
                     <h2>{{ day }}</h2>
                     {% if user.valid %}
@@ -42,7 +42,7 @@
             </div>
         {% endfor %}
         {% if bookmark_time %}
-        <div class="moin-history-container"> 
+        <div class="moin-history-container">
             <div class="moin-history-container-header">
                 <span>
                     <h2>{{ bookmark_time|datetimeformat }}</h2>
@@ -53,3 +53,4 @@
         {% endif %}
     </div>
 {% endblock %}
+
--- a/MoinMoin/templates/global_tags.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/global_tags.html	Sat Jun 09 00:04:57 2012 +0400
@@ -11,3 +11,4 @@
 </ul>
 {% endif %}
 {% endblock %}
+
--- a/MoinMoin/templates/highlight.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/highlight.html	Sat Jun 09 00:04:57 2012 +0400
@@ -8,3 +8,4 @@
 {% endblock %}
 {{ data_text }}
 {% endblock %}
+
--- a/MoinMoin/templates/history.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/history.html	Sat Jun 09 00:04:57 2012 +0400
@@ -75,3 +75,4 @@
         </form>
     {% endif %}
 {% endblock %}
+
--- a/MoinMoin/templates/index.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/index.html	Sat Jun 09 00:04:57 2012 +0400
@@ -18,7 +18,7 @@
     <div class="moin-align-right">
         <ul>
             {% if index %}
-            <li class="action-bar"> 
+            <li class="action-bar">
             <div class="moin-select-all">
                 <span class="moin-select-allitem allitem-toselect" title="{{ _("Select All") }}">{{ _("Select All") }}</span>
             </div>
@@ -27,19 +27,19 @@
             <li class="action-bar">
             <div class="moin-select-actions">
                 <div>
-                    <span class="show-action">Actions</span> 
+                    <span class="show-action">Actions</span>
                 </div>
                 <ul>
                     <li id="moin-create-newitem">{{ _("New item") }}</li>
                     <li id="moin-download-trigger">{{ _("Download") }}</li>
-                    <li class="moin-action-tab" 
-                        id="moin-delete-trigger" 
-                        actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}">
+                    <li class="moin-action-tab"
+                        id="moin-delete-trigger"
+                        data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}">
                         {{ _("Delete") }}
                     </li>
-                    <li class="moin-action-tab" 
-                        id="moin-destroy-trigger" 
-                        actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}">
+                    <li class="moin-action-tab"
+                        id="moin-destroy-trigger"
+                        data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}">
                         {{ _("Destroy") }}
                     </li>
                 </ul>
@@ -63,8 +63,8 @@
                     {{ forms.render_filter_field(gen, form['video_items'], 'checkbox', contenttype_groups['video items']) }}
                     {{ forms.render_filter_field(gen, form['other_items'], 'checkbox', contenttype_groups['other items']) }}
                     {{ forms.render_filter_field(gen, form['unknown_items'], 'checkbox', unknown_items_label) }}
-                    {{ gen.input(form['submit'], type='submit') }}
                 </ul>
+                {{ gen.input(form['submit'], type='submit') }}
                 {{ gen.form.close() }}
             </div>
             </li>
@@ -120,13 +120,13 @@
                 <a href="about:blank" title="{{ url_for('.download_item', item_name=fullname, mimetype=mimetype) }}"
                    class="moin-download-link">
                 </a>
-                <a href="{{ url_for('.show_item', item_name=fullname) }}" 
+                <a href="{{ url_for('.show_item', item_name=fullname) }}"
                    class="{{ contenttype|contenttype_to_class }} moin-item"
                    title="{{ relname }}">
                    {{ relname|truncate(maxchars, true, '..') }}
                 </a>
                 {% if hassubitem %}
-                    <a href="{{ url_for('frontend.index', item_name=fullname) }}" 
+                    <a href="{{ url_for('frontend.index', item_name=fullname) }}"
                        title="{{ _("More") }}"
                        class="moin-more-index">&nbsp;
                 </a>
@@ -157,11 +157,11 @@
             </div>
             <div class="popup-body">
                 <form action={{ url_for('.ajaxmodify') }} method="post">
-                    <label for="newitem">{{ _("Item name") }}</label>
+                    <label for="moin-newitem">{{ _("Item name") }}</label>
                     {% if item_name %}
-                        <input type="text" name="newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="true"/>
+                        <input type="text" id="moin-newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="required"/>
                     {% else %}
-                        <input type="text" name="newitem" placeholder="{{ _("Enter item name here") }}" required="true"/>
+                        <input type="text" id="moin-newitem" placeholder="{{ _("Enter item name here") }}" required="required"/>
                     {% endif %}
                     <br/>
                     <input type="submit" value="{{ _("Create") }}"/>
@@ -179,3 +179,4 @@
     <script src="{{ url_for('static', filename='js/jfu.js') }}"></script>
     <div id="lightbox">&nbsp;</div>
 {% endblock %}
+
--- a/MoinMoin/templates/item_link_list.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/item_link_list.html	Sat Jun 09 00:04:57 2012 +0400
@@ -12,3 +12,4 @@
 </ul>
 {% endif %}
 {% endblock %}
+
--- a/MoinMoin/templates/itemviews.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/itemviews.html	Sat Jun 09 00:04:57 2012 +0400
@@ -94,3 +94,4 @@
         {%- endif %}
     {%- endfor %}
 </ul>
+
--- a/MoinMoin/templates/layout.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/layout.html	Sat Jun 09 00:04:57 2012 +0400
@@ -175,3 +175,4 @@
 {{ after_footer }}
 
 {% endblock %}
+
--- a/MoinMoin/templates/lookup.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/lookup.html	Sat Jun 09 00:04:57 2012 +0400
@@ -48,3 +48,4 @@
     {% endif %}
     {% endif %}
 {% endblock %}
+
--- a/MoinMoin/templates/modify_anywikidraw.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_anywikidraw.html	Sat Jun 09 00:04:57 2012 +0400
@@ -5,7 +5,7 @@
         archive="{{ url_for('serve.files', name='anywikidraw', filename='AnyWikiDrawForMoinMoin.jar') }}"
         width="800" height="620">
 <param name="DrawingName" value="drawing.svg" />
-{% if drawing_exists %} 
+{% if drawing_exists %}
 <param name="DrawingURL" value="{{ url_for('frontend.get_item', item_name=item_name, member='drawing.svg') }}" />
 {% endif %}
 <param name="PageURL" value="{{ url_for('frontend.show_item', item_name=item_name) }}" />
@@ -20,3 +20,4 @@
 </p>
 <br />
 {% endblock %}
+
--- a/MoinMoin/templates/modify_applet.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_applet.html	Sat Jun 09 00:04:57 2012 +0400
@@ -20,3 +20,4 @@
     {{ gen.form.close() }}
 </div>
 {% endblock %}
+
--- a/MoinMoin/templates/modify_binary.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_binary.html	Sat Jun 09 00:04:57 2012 +0400
@@ -7,3 +7,4 @@
     {{ forms.render_field(gen, form['comment'], 'text') }}
 </dl>
 {% endblock %}
+
--- a/MoinMoin/templates/modify_show_template_selection.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_show_template_selection.html	Sat Jun 09 00:04:57 2012 +0400
@@ -14,3 +14,4 @@
     {% endfor %}
 </ul>
 {% endblock %}
+
--- a/MoinMoin/templates/modify_show_type_selection.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_show_type_selection.html	Sat Jun 09 00:04:57 2012 +0400
@@ -19,3 +19,4 @@
     {% endfor %}
 </table>
 {% endblock %}
+
--- a/MoinMoin/templates/modify_svg-edit.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_svg-edit.html	Sat Jun 09 00:04:57 2012 +0400
@@ -6,3 +6,4 @@
 </p>
 <br />
 {% endblock %}
+
--- a/MoinMoin/templates/modify_text.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_text.html	Sat Jun 09 00:04:57 2012 +0400
@@ -21,3 +21,4 @@
 {% endif %}
 <br />
 {% endblock %}
+
--- a/MoinMoin/templates/modify_text_html.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_text_html.html	Sat Jun 09 00:04:57 2012 +0400
@@ -11,3 +11,4 @@
 {{ gen.textarea(form['data_text'], class='ckeditor', lang=lang, dir=direction, rows=rows_data, cols=cols) }}
 </p>
 {% endblock %}
+
--- a/MoinMoin/templates/modify_twikidraw.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/modify_twikidraw.html	Sat Jun 09 00:04:57 2012 +0400
@@ -15,3 +15,4 @@
 </p>
 <br />
 {% endblock %}
+
--- a/MoinMoin/templates/openid_register.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/openid_register.html	Sat Jun 09 00:04:57 2012 +0400
@@ -22,3 +22,4 @@
 {{ gen.form.close() }}
 </div>
 {% endblock %}
+
--- a/MoinMoin/templates/rename.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/rename.html	Sat Jun 09 00:04:57 2012 +0400
@@ -17,3 +17,4 @@
 {{ gen.form.close() }}
 </div>
 {% endblock %}
+
--- a/MoinMoin/templates/search.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/search.html	Sat Jun 09 00:04:57 2012 +0400
@@ -73,3 +73,4 @@
         {% endif %}
     {% endif %}
 {% endblock %}
+
--- a/MoinMoin/templates/show.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/show.html	Sat Jun 09 00:04:57 2012 +0400
@@ -93,3 +93,4 @@
     <br id="moin-show-comments" />
 {%- endif %}
 {% endblock %}
+
--- a/MoinMoin/templates/usersettings_ajax.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/usersettings_ajax.html	Sat Jun 09 00:04:57 2012 +0400
@@ -13,3 +13,4 @@
 {% elif part == 'options' %}
     {{ user_forms.options(form) }}
 {% endif %}
+
--- a/MoinMoin/templates/usersettings_forms.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/usersettings_forms.html	Sat Jun 09 00:04:57 2012 +0400
@@ -81,3 +81,4 @@
 {{ forms.render_button(_("Save")) }}
 {{ gen.form.close() }}
 {% endmacro %}
+
--- a/MoinMoin/templates/utils.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/templates/utils.html	Sat Jun 09 00:04:57 2012 +0400
@@ -82,3 +82,4 @@
         </div>
     {% endif %}
 {% endmacro %}
+
--- a/MoinMoin/themes/foobar/static/css/common.css	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/static/css/common.css	Sat Jun 09 00:04:57 2012 +0400
@@ -237,3 +237,4 @@
 .moin-small{font-size:.83em}
 @media print{#moin-global-tray,#moin-local-panel,#moin-footer,#moin-search{display:none}
 }
+
--- a/MoinMoin/themes/foobar/static/css/stylus/pygments_default.css	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/static/css/stylus/pygments_default.css	Sat Jun 09 00:04:57 2012 +0400
@@ -59,3 +59,4 @@
 .vg { color: #19177C } /* Name.Variable.Global */
 .vi { color: #19177C } /* Name.Variable.Instance */
 .il { color: #666666 } /* Literal.Number.Integer.Long */
+
--- a/MoinMoin/themes/foobar/templates/global_history.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/global_history.html	Sat Jun 09 00:04:57 2012 +0400
@@ -12,7 +12,7 @@
     <div id="moin-global-history">
         {% for day, revs in history %}
            {% set latest_timestamp = revs[0].meta['mtime'] %}
-            <div class="moin-history-container"> 
+            <div class="moin-history-container">
                 <div class="moin-history-container-header">
                     <h2>{{ day }}</h2>
                     {% if user.valid %}
@@ -42,7 +42,7 @@
             </div>
         {% endfor %}
         {% if bookmark_time %}
-        <div class="moin-history-container"> 
+        <div class="moin-history-container">
             <div class="moin-history-container-header">
                 <span>
                     <h2>{{ bookmark_time|datetimeformat }}</h2>
@@ -53,3 +53,4 @@
         {% endif %}
     </div>
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/global_tags.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/global_tags.html	Sat Jun 09 00:04:57 2012 +0400
@@ -11,3 +11,4 @@
 </ul>
 {% endif %}
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/history.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/history.html	Sat Jun 09 00:04:57 2012 +0400
@@ -72,3 +72,4 @@
         </form>
     {% endif %}
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/index.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/index.html	Sat Jun 09 00:04:57 2012 +0400
@@ -11,7 +11,7 @@
     <div class="moin-align-right">
         <ul>
             {% if index %}
-            <li class="action-bar"> 
+            <li class="action-bar">
             <div class="moin-select-all">
                 <span class="moin-select-allitem allitem-toselect" title="{{ _("Select All") }}">{{ _("Select All") }}</span>
             </div>
@@ -20,19 +20,19 @@
             <li class="action-bar">
             <div class="moin-select-actions">
                 <div>
-                    <span class="show-action">Actions</span> 
+                    <span class="show-action">Actions</span>
                 </div>
                 <ul>
                     <li id="moin-create-newitem">{{ _("New item") }}</li>
                     <li id="moin-download-trigger">{{ _("Download") }}</li>
-                    <li class="moin-action-tab" 
-                        id="moin-delete-trigger" 
-                        actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}">
+                    <li class="moin-action-tab"
+                        id="moin-delete-trigger"
+                        data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}">
                         {{ _("Delete") }}
                     </li>
-                    <li class="moin-action-tab" 
-                        id="moin-destroy-trigger" 
-                        actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}">
+                    <li class="moin-action-tab"
+                        id="moin-destroy-trigger"
+                        data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}">
                         {{ _("Destroy") }}
                     </li>
                 </ul>
@@ -56,8 +56,9 @@
                     {{ forms.render_filter_field(gen, form['video_items'], 'checkbox', contenttype_groups['video items']) }}
                     {{ forms.render_filter_field(gen, form['other_items'], 'checkbox', contenttype_groups['other items']) }}
                     {{ forms.render_filter_field(gen, form['unknown_items'], 'checkbox', unknown_items_label) }}
-                    {{ gen.input(form['submit'], type='submit') }}
+
                 </ul>
+                {{ gen.input(form['submit'], type='submit') }}
                 {{ gen.form.close() }}
             </div>
             </li>
@@ -113,13 +114,13 @@
                 <a href="about:blank" title="{{ url_for('.download_item', item_name=fullname, mimetype=mimetype) }}"
                    class="moin-download-link">
                 </a>
-                <a href="{{ url_for('.show_item', item_name=fullname) }}" 
+                <a href="{{ url_for('.show_item', item_name=fullname) }}"
                    class="{{ contenttype|contenttype_to_class }} moin-item"
                    title="{{ relname }}">
                    {{ relname|truncate(maxchars, true, '..') }}
                 </a>
                 {% if hassubitem %}
-                    <a href="{{ url_for('frontend.index', item_name=fullname) }}" 
+                    <a href="{{ url_for('frontend.index', item_name=fullname) }}"
                        title="{{ _("More") }}"
                        class="moin-more-index">&nbsp;
                 </a>
@@ -150,11 +151,11 @@
             </div>
             <div class="popup-body">
                 <form action={{ url_for('.ajaxmodify') }} method="post">
-                    <label for="newitem">{{ _("Item name") }}</label>
+                    <label for="moin-newitem">{{ _("Item name") }}</label>
                     {% if item_name %}
-                        <input type="text" name="newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="true"/>
+                        <input type="text" id="moin-newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="required"/>
                     {% else %}
-                        <input type="text" name="newitem" placeholder="{{ _("Enter item name here") }}" required="true"/>
+                        <input type="text" id="moin-newitem" placeholder="{{ _("Enter item name here") }}" required="required"/>
                     {% endif %}
                     <br/>
                     <input type="submit" value="{{ _("Create") }}"/>
@@ -172,3 +173,4 @@
     <script src="{{ url_for('static', filename='js/jfu.js') }}"></script>
     <div id="lightbox">&nbsp;</div>
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/item_link_list.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/item_link_list.html	Sat Jun 09 00:04:57 2012 +0400
@@ -12,3 +12,4 @@
 </ul>
 {% endif %}
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/itemviews.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/itemviews.html	Sat Jun 09 00:04:57 2012 +0400
@@ -88,3 +88,4 @@
         {%- endif %}
     {%- endfor %}
 </ul>
+
--- a/MoinMoin/themes/foobar/templates/layout.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/layout.html	Sat Jun 09 00:04:57 2012 +0400
@@ -99,7 +99,7 @@
 <div id="moin-main-container">
 <div id="moin-main-box">
 <div id="moin-header">
-    {% if search_form %} 
+    {% if search_form %}
     <div id="moin-search">
     {{ gen.form.open(search_form, id='moin-searchform', method='get', action=url_for('frontend.search')) }}
         {{ gen.input(search_form['q'], type='search', id='moin-search-query', size='40') }}
@@ -107,7 +107,7 @@
         {{ forms.render_errors(search_form) }}
     {{ gen.form.close() }}
     </div>
-    {% endif %} 
+    {% endif %}
     <div id="moin-breadcrumbs-location">
         {% if cfg.show_interwiki -%}
         <span id="moin-interwiki">
@@ -159,7 +159,7 @@
     <div id="moin-footer-items">
         {{ footer_items }}
     </div>
-    <div id="moin-credits">
+    <div>
         {{ credits }}
     </div>
 {% endblock %}
--- a/MoinMoin/themes/foobar/templates/modify_applet.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/modify_applet.html	Sat Jun 09 00:04:57 2012 +0400
@@ -15,3 +15,4 @@
 {{ gen.form.close() }}
 </div>
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/modify_binary.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/modify_binary.html	Sat Jun 09 00:04:57 2012 +0400
@@ -5,3 +5,4 @@
 {{ forms.render_textcha(gen, form) }}
 {{ forms.render_field(gen, form['comment'], 'text') }}
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/modify_show_template_selection.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/modify_show_template_selection.html	Sat Jun 09 00:04:57 2012 +0400
@@ -14,3 +14,4 @@
     {% endfor %}
 </ul>
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/modify_show_type_selection.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/modify_show_type_selection.html	Sat Jun 09 00:04:57 2012 +0400
@@ -19,3 +19,4 @@
     {% endfor %}
 </table>
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/modify_text.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/modify_text.html	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,7 @@
             {% set fullname = fullname|json_dumps %}
             <button class="link-action" onclick='linkSubitem({{ shortname }}, {{ fullname }})'
                 title="{{ _('Link to Subitem') }}">{{ _('Link') }}</button>
-            <button class="transclude-action" 
+            <button class="transclude-action"
                 onclick='transcludeSubitem({{ shortname }}, {{ fullname }})'
                 title="{{ _('Transclude Subitem') }}">{{ _('Transclude') }}</button>
         {% endcall %}
@@ -17,3 +17,4 @@
 {{ gen.textarea(form['data_text'], lang=lang, dir=direction, rows=rows_data, cols=cols) }}
 <br />
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/modify_text_html.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/modify_text_html.html	Sat Jun 09 00:04:57 2012 +0400
@@ -11,3 +11,4 @@
 {{ gen.textarea(form['data_text'], class='ckeditor', lang=lang, dir=direction, rows=rows_data, cols=cols) }}
 </p>
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/rename.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/rename.html	Sat Jun 09 00:04:57 2012 +0400
@@ -14,3 +14,4 @@
 {{ gen.form.close() }}
 </div>
 {% endblock %}
+
--- a/MoinMoin/themes/foobar/templates/show.html	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/foobar/templates/show.html	Sat Jun 09 00:04:57 2012 +0400
@@ -27,3 +27,4 @@
     <br id="moin-show-comments" />
 {%- endif %}
 {% endblock %}
+
--- a/MoinMoin/themes/modernized/static/css/common.css	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/modernized/static/css/common.css	Sat Jun 09 00:04:57 2012 +0400
@@ -692,3 +692,4 @@
 #moin-pagelocation, #moin-pageinfo  { display: none; }
 
 }   /* end of @media projection */
+
--- a/MoinMoin/themes/modernized/static/css/msie.css	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/themes/modernized/static/css/msie.css	Sat Jun 09 00:04:57 2012 +0400
@@ -1,4 +1,4 @@
-/*  msie.css - MoinMoin MS Internet explorer bug workarounds 
+/*  msie.css - MoinMoin MS Internet explorer bug workarounds
 
     Copyright: 2003 MoinMoin:JuergenHermann
     Copyright: 2010 MoinMoin:RogerHaase
@@ -42,3 +42,4 @@
 
 /*  avoid a gap between navibar and pageline on IE7  */
 #moin-navibar { zoom: 1; }
+
--- a/MoinMoin/util/__init__.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/__init__.py	Sat Jun 09 00:04:57 2012 +0400
@@ -114,3 +114,4 @@
         previous_offset = -1
     next_offset = count
     return (selected_result, next_offset, previous_offset)
+
--- a/MoinMoin/util/_tests/test_filesys.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/_tests/test_filesys.py	Sat Jun 09 00:04:57 2012 +0400
@@ -168,3 +168,4 @@
             filesys.copytree(self.test_dir, self.test_dest_dir)
 
 coverage_modules = ['MoinMoin.util.filesys']
+
--- a/MoinMoin/util/_tests/test_pysupport.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/_tests/test_pysupport.py	Sat Jun 09 00:04:57 2012 +0400
@@ -135,3 +135,4 @@
 
 coverage_modules = ['MoinMoin.util.pysupport']
 pytest.main("-x test_pysupport.py")
+
--- a/MoinMoin/util/_tests/test_send_file.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/_tests/test_send_file.py	Sat Jun 09 00:04:57 2012 +0400
@@ -35,3 +35,4 @@
 
         with pytest.raises(TypeError):
             send_file.send_file(None, as_attachment = True)
+
--- a/MoinMoin/util/_tests/test_tree.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/_tests/test_tree.py	Sat Jun 09 00:04:57 2012 +0400
@@ -65,3 +65,4 @@
 
 def test_moin_page():
     assert isinstance(moin_page, Namespace)
+
--- a/MoinMoin/util/_tests/test_util.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/_tests/test_util.py	Sat Jun 09 00:04:57 2012 +0400
@@ -42,3 +42,4 @@
 
 
 coverage_modules = ['MoinMoin.util']
+
--- a/MoinMoin/util/_tests/test_version.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/_tests/test_version.py	Sat Jun 09 00:04:57 2012 +0400
@@ -59,3 +59,4 @@
 
 
 coverage_modules = ['MoinMoin.util.version']
+
--- a/MoinMoin/util/clock.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/clock.py	Sat Jun 09 00:04:57 2012 +0400
@@ -45,3 +45,4 @@
     def __del__(self):
         if self.timers:
             logging.warning('These timers have not been stopped: {0}'.format(', '.join(self.timers.keys())))
+
--- a/MoinMoin/util/diff3.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/diff3.py	Sat Jun 09 00:04:57 2012 +0400
@@ -267,3 +267,4 @@
 
 if __name__ == '__main__':
     main()
+
--- a/MoinMoin/util/iri.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/iri.py	Sat Jun 09 00:04:57 2012 +0400
@@ -695,3 +695,4 @@
 
 class IriFragment(_Value):
     quote_filter = frozenset('@:/?')
+
--- a/MoinMoin/util/lock.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/lock.py	Sat Jun 09 00:04:57 2012 +0400
@@ -401,3 +401,4 @@
             return WriteLock.expire(self)
         else: # POSIX
             return True
+
--- a/MoinMoin/util/md5crypt.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/md5crypt.py	Sat Jun 09 00:04:57 2012 +0400
@@ -170,3 +170,4 @@
 
 if __name__ == "__main__":
     print unix_md5_crypt("cat", "hat")
+
--- a/MoinMoin/util/pysupport.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/pysupport.py	Sat Jun 09 00:04:57 2012 +0400
@@ -139,3 +139,4 @@
             lock.release()
 
     return decorated
+
--- a/MoinMoin/util/registry.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/registry.py	Sat Jun 09 00:04:57 2012 +0400
@@ -89,3 +89,4 @@
         :param factory: Factory to register. Callable, have to return a class
         """
         return self._register(self.Entry(factory, priority))
+
--- a/MoinMoin/util/tree.py	Thu May 24 22:59:12 2012 +0400
+++ b/MoinMoin/util/tree.py	Sat Jun 09 00:04:57 2012 +0400
@@ -69,3 +69,4 @@
 xlink = Namespace('http://www.w3.org/1999/xlink')
 docbook = Namespace('http://docbook.org/ns/docbook')
 xml = Namespace('http://www.w3.org/XML/1998/namespace')
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/pep8/DeleteTrailingSpaces.py	Sat Jun 09 00:04:57 2012 +0400
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+# Copyright: 2012 by MoinMoin:RogerHaase
+# License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
+
+"""
+Detect and correct violations of the moin2 coding standards:
+    - no trailing blanks
+    - blank line at file end
+    - DOS line endings on .bat files, unix line endings everywhere else
+
+Execute this script from the root directory of the moin2 repository or
+from anywhere within the contrib path.
+"""
+
+import sys, os
+import warnings
+warnings.simplefilter("once")
+
+# file types to be processed
+selected_suffixes = "py bat html css js".split()
+
+# directories to ignore
+def directories_to_ignore(starting_dir):
+    """Return a list of directories that will not be processed."""
+    # list format: [(fully qualified directory name, sub-directory name), ... ]
+    ignore_dirs = []
+    level2_dirs = ".hg contrib dlc docs env moin.egg-info wiki".split()
+    for dir in level2_dirs:
+        ignore_dirs.append((starting_dir, dir))
+    ignore_dirs.append((starting_dir + os.sep + "MoinMoin",  "translations"))
+    return ignore_dirs
+
+
+def check_files(filename, suffix):
+    """Delete trailing blanks,
+        force blank line at file end,
+        force line ending to be \r\n for bat files and \n for all others."""
+    if suffix.lower() == "bat":
+        line_end = "\r\n"
+    else:
+        line_end = "\n"
+
+    with open(filename, "rb") as f:
+        lines = f.readlines()
+
+    with open(filename, "wb") as f:
+        for line in lines:
+            pep8_line = line.rstrip() + line_end
+            f.write(pep8_line)
+            # if line was changed, issue warning once for each type of change
+            if suffix == "bat" and not line.endswith("\r\n"):
+                warnings.warn("%s was changed to DOS line endings" % filename)
+            elif suffix != "bat" and line.endswith("\r\n"):
+                warnings.warn("%s was changed to Unix line endings" % filename)
+            elif pep8_line != line:
+                warnings.warn("%s was changed to remove trailing blanks" % filename)
+
+        # add blank line at end of file if needed
+        if lines and pep8_line != line_end:
+            f.write(line_end)
+            warnings.warn("%s was changed to add blank line to end of file" % filename)
+
+def file_picker(starting_dir):
+    """Select target files and pass each to file checker."""
+    ignore_dirs = directories_to_ignore(starting_dir)
+
+    for root, dirs, files in os.walk(starting_dir):
+        # delete directories in ignore list
+        for mama_dir, baby_dir in ignore_dirs:
+            if mama_dir == root and baby_dir in dirs:
+                dirs.remove(baby_dir)
+        # check files with selected suffixes
+        for file in files:
+            suffix = file.split(".")[-1]
+            if suffix in selected_suffixes:
+                filename = os.path.join(root, file)
+                check_files(filename, suffix)
+
+if __name__ == "__main__":
+    starting_dir = os.path.abspath(os.path.dirname(__file__))
+    starting_dir = starting_dir.split(os.sep + 'contrib')[0]
+    warnings.warn("%s is starting directory" % starting_dir)
+    file_picker(starting_dir)
+
--- a/docs/devel/api/MoinMoin.apps.admin.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.apps.admin.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.apps.admin
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`views` Module
@@ -16,6 +15,5 @@
 .. automodule:: MoinMoin.apps.admin.views
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.apps.feed.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.apps.feed.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.apps.feed
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`views` Module
@@ -16,6 +15,5 @@
 .. automodule:: MoinMoin.apps.feed.views
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.apps.frontend.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.apps.frontend.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.apps.frontend
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`views` Module
@@ -16,6 +15,5 @@
 .. automodule:: MoinMoin.apps.frontend.views
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.apps.misc.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.apps.misc.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.apps.misc
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`views` Module
@@ -16,6 +15,5 @@
 .. automodule:: MoinMoin.apps.misc.views
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.apps.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.apps.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.apps
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 Subpackages
--- a/docs/devel/api/MoinMoin.apps.serve.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.apps.serve.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.apps.serve
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`views` Module
@@ -16,6 +15,5 @@
 .. automodule:: MoinMoin.apps.serve.views
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.auth.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.auth.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.auth
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`http` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.auth.http
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`ldap_login` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.auth.ldap_login
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`log` Module
@@ -34,7 +31,6 @@
 .. automodule:: MoinMoin.auth.log
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`openidrp` Module
@@ -43,7 +39,6 @@
 .. automodule:: MoinMoin.auth.openidrp
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`smb_mount` Module
@@ -52,6 +47,5 @@
 .. automodule:: MoinMoin.auth.smb_mount
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.config.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.config.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.config
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`default` Module
@@ -16,6 +15,5 @@
 .. automodule:: MoinMoin.config.default
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/devel/api/MoinMoin.constants.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -0,0 +1,51 @@
+constants Package
+=================
+
+:mod:`constants` Package
+------------------------
+
+.. automodule:: MoinMoin.constants
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`chartypes` Module
+-----------------------
+
+.. automodule:: MoinMoin.constants.chartypes
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`contenttypes` Module
+--------------------------
+
+.. automodule:: MoinMoin.constants.contenttypes
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`keys` Module
+------------------
+
+.. automodule:: MoinMoin.constants.keys
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`misc` Module
+------------------
+
+.. automodule:: MoinMoin.constants.misc
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`rights` Module
+--------------------
+
+.. automodule:: MoinMoin.constants.rights
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
--- a/docs/devel/api/MoinMoin.converter.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.converter.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.converter
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_args` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.converter._args
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_args_wiki` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.converter._args_wiki
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_table` Module
@@ -34,7 +31,6 @@
 .. automodule:: MoinMoin.converter._table
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_util` Module
@@ -43,7 +39,6 @@
 .. automodule:: MoinMoin.converter._util
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_wiki_macro` Module
@@ -52,7 +47,6 @@
 .. automodule:: MoinMoin.converter._wiki_macro
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`archive_in` Module
@@ -61,7 +55,6 @@
 .. automodule:: MoinMoin.converter.archive_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`audio_video_in` Module
@@ -70,7 +63,6 @@
 .. automodule:: MoinMoin.converter.audio_video_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`creole_in` Module
@@ -79,7 +71,6 @@
 .. automodule:: MoinMoin.converter.creole_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`docbook_in` Module
@@ -88,7 +79,6 @@
 .. automodule:: MoinMoin.converter.docbook_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`docbook_out` Module
@@ -97,7 +87,6 @@
 .. automodule:: MoinMoin.converter.docbook_out
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`everything` Module
@@ -106,7 +95,6 @@
 .. automodule:: MoinMoin.converter.everything
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`highlight` Module
@@ -115,7 +103,6 @@
 .. automodule:: MoinMoin.converter.highlight
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`html_in` Module
@@ -124,7 +111,6 @@
 .. automodule:: MoinMoin.converter.html_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`html_out` Module
@@ -133,7 +119,6 @@
 .. automodule:: MoinMoin.converter.html_out
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`image_in` Module
@@ -142,7 +127,6 @@
 .. automodule:: MoinMoin.converter.image_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`include` Module
@@ -151,7 +135,6 @@
 .. automodule:: MoinMoin.converter.include
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`link` Module
@@ -160,7 +143,6 @@
 .. automodule:: MoinMoin.converter.link
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`macro` Module
@@ -169,7 +151,6 @@
 .. automodule:: MoinMoin.converter.macro
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`mediawiki_in` Module
@@ -178,7 +159,6 @@
 .. automodule:: MoinMoin.converter.mediawiki_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`moinwiki19_in` Module
@@ -187,7 +167,6 @@
 .. automodule:: MoinMoin.converter.moinwiki19_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`moinwiki_in` Module
@@ -196,7 +175,6 @@
 .. automodule:: MoinMoin.converter.moinwiki_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`moinwiki_out` Module
@@ -205,7 +183,6 @@
 .. automodule:: MoinMoin.converter.moinwiki_out
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`nonexistent_in` Module
@@ -214,7 +191,6 @@
 .. automodule:: MoinMoin.converter.nonexistent_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`opendocument_in` Module
@@ -223,7 +199,6 @@
 .. automodule:: MoinMoin.converter.opendocument_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`pdf_in` Module
@@ -232,7 +207,6 @@
 .. automodule:: MoinMoin.converter.pdf_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`pygments_in` Module
@@ -241,7 +215,6 @@
 .. automodule:: MoinMoin.converter.pygments_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`rst_in` Module
@@ -250,7 +223,6 @@
 .. automodule:: MoinMoin.converter.rst_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`rst_out` Module
@@ -259,7 +231,6 @@
 .. automodule:: MoinMoin.converter.rst_out
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`smiley` Module
@@ -268,7 +239,6 @@
 .. automodule:: MoinMoin.converter.smiley
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`text_csv_in` Module
@@ -277,7 +247,6 @@
 .. automodule:: MoinMoin.converter.text_csv_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`text_in` Module
@@ -286,7 +255,6 @@
 .. automodule:: MoinMoin.converter.text_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`text_out` Module
@@ -295,7 +263,6 @@
 .. automodule:: MoinMoin.converter.text_out
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`xml_in` Module
@@ -304,6 +271,5 @@
 .. automodule:: MoinMoin.converter.xml_in
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.datastruct.backends.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.datastruct.backends.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.datastruct.backends
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`composite_dicts` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.datastruct.backends.composite_dicts
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`composite_groups` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.datastruct.backends.composite_groups
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`config_dicts` Module
@@ -34,7 +31,6 @@
 .. automodule:: MoinMoin.datastruct.backends.config_dicts
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`config_groups` Module
@@ -43,7 +39,6 @@
 .. automodule:: MoinMoin.datastruct.backends.config_groups
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`config_lazy_groups` Module
@@ -52,7 +47,6 @@
 .. automodule:: MoinMoin.datastruct.backends.config_lazy_groups
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`wiki_dicts` Module
@@ -61,7 +55,6 @@
 .. automodule:: MoinMoin.datastruct.backends.wiki_dicts
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`wiki_groups` Module
@@ -70,6 +63,5 @@
 .. automodule:: MoinMoin.datastruct.backends.wiki_groups
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.datastruct.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.datastruct.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.datastruct
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 Subpackages
--- a/docs/devel/api/MoinMoin.i18n.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.i18n.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,6 +7,5 @@
 .. automodule:: MoinMoin.i18n
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.items.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.items.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,6 +7,5 @@
 .. automodule:: MoinMoin.items
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.macro.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.macro.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.macro
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`Anchor` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.macro.Anchor
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`Date` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.macro.Date
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`DateTime` Module
@@ -34,7 +31,6 @@
 .. automodule:: MoinMoin.macro.DateTime
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`GetText` Module
@@ -43,7 +39,6 @@
 .. automodule:: MoinMoin.macro.GetText
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`GetVal` Module
@@ -52,7 +47,6 @@
 .. automodule:: MoinMoin.macro.GetVal
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`MailTo` Module
@@ -61,7 +55,6 @@
 .. automodule:: MoinMoin.macro.MailTo
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`PagenameList` Module
@@ -70,7 +63,6 @@
 .. automodule:: MoinMoin.macro.PagenameList
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`RandomItem` Module
@@ -79,7 +71,6 @@
 .. automodule:: MoinMoin.macro.RandomItem
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`Verbatim` Module
@@ -88,7 +79,6 @@
 .. automodule:: MoinMoin.macro.Verbatim
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_base` Module
@@ -97,6 +87,5 @@
 .. automodule:: MoinMoin.macro._base
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.mail.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.mail.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.mail
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`sendmail` Module
@@ -16,6 +15,5 @@
 .. automodule:: MoinMoin.mail.sendmail
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.__init__
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_template` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin._template
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`app` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.app
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`conftest` Module
@@ -34,7 +31,6 @@
 .. automodule:: MoinMoin.conftest
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`error` Module
@@ -43,7 +39,6 @@
 .. automodule:: MoinMoin.error
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`log` Module
@@ -52,7 +47,6 @@
 .. automodule:: MoinMoin.log
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`user` Module
@@ -61,7 +55,6 @@
 .. automodule:: MoinMoin.user
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`wikiutil` Module
@@ -70,7 +63,6 @@
 .. automodule:: MoinMoin.wikiutil
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 Subpackages
@@ -81,6 +73,7 @@
     MoinMoin.apps
     MoinMoin.auth
     MoinMoin.config
+    MoinMoin.constants
     MoinMoin.converter
     MoinMoin.datastruct
     MoinMoin.i18n
--- a/docs/devel/api/MoinMoin.script.account.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.script.account.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.script.account
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`create` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.script.account.create
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`disable` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.script.account.disable
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`resetpw` Module
@@ -34,6 +31,5 @@
 .. automodule:: MoinMoin.script.account.resetpw
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.script.maint.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.script.maint.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.script.maint
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`index` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.script.maint.index
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`modified_systemitems` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.script.maint.modified_systemitems
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`modify_item` Module
@@ -34,7 +31,14 @@
 .. automodule:: MoinMoin.script.maint.modify_item
     :members:
     :undoc-members:
-    :inherited-members:
+    :show-inheritance:
+
+:mod:`moinshell` Module
+-----------------------
+
+.. automodule:: MoinMoin.script.maint.moinshell
+    :members:
+    :undoc-members:
     :show-inheritance:
 
 :mod:`reduce_revisions` Module
@@ -43,7 +47,6 @@
 .. automodule:: MoinMoin.script.maint.reduce_revisions
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`serialization` Module
@@ -52,7 +55,6 @@
 .. automodule:: MoinMoin.script.maint.serialization
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`set_meta` Module
@@ -61,6 +63,5 @@
 .. automodule:: MoinMoin.script.maint.set_meta
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.script.migration.moin19.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.script.migration.moin19.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.script.migration.moin19
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_logfile19` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.script.migration.moin19._logfile19
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_utils19` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.script.migration.moin19._utils19
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`import19` Module
@@ -34,6 +31,5 @@
 .. automodule:: MoinMoin.script.migration.moin19.import19
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.script.migration.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.script.migration.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.script.migration
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 Subpackages
--- a/docs/devel/api/MoinMoin.script.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.script.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.script
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 Subpackages
--- a/docs/devel/api/MoinMoin.search.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.search.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.search
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`analyzers` Module
@@ -16,6 +15,5 @@
 .. automodule:: MoinMoin.search.analyzers
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.security.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.security.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.security
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`textcha` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.security.textcha
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`ticket` Module
@@ -25,6 +23,5 @@
 .. automodule:: MoinMoin.security.ticket
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.signalling.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.signalling.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.signalling
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`log` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.signalling.log
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`signals` Module
@@ -25,6 +23,5 @@
 .. automodule:: MoinMoin.signalling.signals
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.storage.backends.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.storage.backends.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.storage.backends
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`_util` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.storage.backends._util
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`fileserver` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.storage.backends.fileserver
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`stores` Module
@@ -34,15 +31,5 @@
 .. automodule:: MoinMoin.storage.backends.stores
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
-:mod:`validation` Module
-------------------------
-
-.. automodule:: MoinMoin.storage.backends.validation
-    :members:
-    :undoc-members:
-    :inherited-members:
-    :show-inheritance:
-
--- a/docs/devel/api/MoinMoin.storage.middleware.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.storage.middleware.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.storage.middleware
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`indexing` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.storage.middleware.indexing
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`protecting` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.storage.middleware.protecting
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`routing` Module
@@ -34,7 +31,6 @@
 .. automodule:: MoinMoin.storage.middleware.routing
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`serialization` Module
@@ -43,6 +39,13 @@
 .. automodule:: MoinMoin.storage.middleware.serialization
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
+:mod:`validation` Module
+------------------------
+
+.. automodule:: MoinMoin.storage.middleware.validation
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
--- a/docs/devel/api/MoinMoin.storage.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.storage.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.storage
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`error` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.storage.error
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 Subpackages
--- a/docs/devel/api/MoinMoin.storage.stores.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.storage.stores.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.storage.stores
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`fs` Module
@@ -16,7 +15,6 @@
 .. automodule:: MoinMoin.storage.stores.fs
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`kc` Module
@@ -25,7 +23,6 @@
 .. automodule:: MoinMoin.storage.stores.kc
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`kt` Module
@@ -34,7 +31,6 @@
 .. automodule:: MoinMoin.storage.stores.kt
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`memory` Module
@@ -43,7 +39,6 @@
 .. automodule:: MoinMoin.storage.stores.memory
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`sqla` Module
@@ -52,7 +47,6 @@
 .. automodule:: MoinMoin.storage.stores.sqla
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`sqlite` Module
@@ -61,7 +55,6 @@
 .. automodule:: MoinMoin.storage.stores.sqlite
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`wrappers` Module
@@ -70,6 +63,5 @@
 .. automodule:: MoinMoin.storage.stores.wrappers
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.themes.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.themes.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,6 +7,5 @@
 .. automodule:: MoinMoin.themes
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
--- a/docs/devel/api/MoinMoin.util.rst	Thu May 24 22:59:12 2012 +0400
+++ b/docs/devel/api/MoinMoin.util.rst	Sat Jun 09 00:04:57 2012 +0400
@@ -7,7 +7,6 @@
 .. automodule:: MoinMoin.util
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`SubProcess` Module
@@ -16,25 +15,6 @@
 .. automodule:: MoinMoin.util.SubProcess
     :members:
     :undoc-members:
-    :inherited-members:
-    :show-inheritance:
-
-:mod:`chartypes` Module
------------------------
-
-.. automodule:: MoinMoin.util.chartypes
-    :members:
-    :undoc-members:
-    :inherited-members:
-    :show-inheritance:
-
-:mod:`chartypes_create` Module
-------------------------------
-
-.. automodule:: MoinMoin.util.chartypes_create
-    :members:
-    :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`clock` Module
@@ -43,7 +23,6 @@
 .. automodule:: MoinMoin.util.clock
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`crypto` Module
@@ -52,7 +31,6 @@
 .. automodule:: MoinMoin.util.crypto
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`diff3` Module
@@ -61,7 +39,6 @@
 .. automodule:: MoinMoin.util.diff3
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`diff_html` Module
@@ -70,7 +47,6 @@
 .. automodule:: MoinMoin.util.diff_html
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`diff_text` Module
@@ -79,16 +55,6 @@
 .. automodule:: MoinMoin.util.diff_text
     :members:
     :undoc-members:
-    :inherited-members:
-    :show-inheritance:
-
-:mod:`edit_lock` Module
------------------------
-
-.. automodule:: MoinMoin.util.edit_lock
-    :members:
-    :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`filesys` Module
@@ -97,7 +63,6 @@
 .. automodule:: MoinMoin.util.filesys
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`forms` Module
@@ -106,7 +71,6 @@
 .. automodule:: MoinMoin.util.forms
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`interwiki` Module
@@ -115,7 +79,6 @@
 .. automodule:: MoinMoin.util.interwiki
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`iri` Module
@@ -124,7 +87,6 @@
 .. automodule:: MoinMoin.util.iri
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`lock` Module
@@ -133,7 +95,6 @@
 .. automodule:: MoinMoin.util.lock
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`md5crypt` Module
@@ -142,7 +103,6 @@
 .. automodule:: MoinMoin.util.md5crypt
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`mime` Module
@@ -151,7 +111,6 @@
 .. automodule:: MoinMoin.util.mime
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`mimetype` Module
@@ -160,7 +119,6 @@
 .. automodule:: MoinMoin.util.mimetype
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`monkeypatch` Module
@@ -169,7 +127,6 @@
 .. automodule:: MoinMoin.util.monkeypatch
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`paramparser` Module
@@ -178,7 +135,6 @@
 .. automodule:: MoinMoin.util.paramparser
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`plugins` Module
@@ -187,7 +143,6 @@
 .. automodule:: MoinMoin.util.plugins
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`profile` Module
@@ -196,7 +151,6 @@
 .. automodule:: MoinMoin.util.profile
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`pysupport` Module
@@ -205,7 +159,6 @@
 .. automodule:: MoinMoin.util.pysupport
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`registry` Module
@@ -214,7 +167,6 @@
 .. automodule:: MoinMoin.util.registry
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`send_file` Module
@@ -223,7 +175,6 @@
 .. automodule:: MoinMoin.util.send_file
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`thread_monitor` Module
@@ -232,7 +183,6 @@
 .. automodule:: MoinMoin.util.thread_monitor
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`tree` Module
@@ -241,7 +191,6 @@
 .. automodule:: MoinMoin.util.tree
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
 
 :mod:`version` Module
@@ -250,6 +199,5 @@
 .. automodule:: MoinMoin.util.version
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance: