changeset 2790:6af6e61dc25f

change coding-std.py to inspect docs/*.rst; mass changes to rst files to remove trailing blanks, tabs, etc
author RogerHaase <haaserd@gmail.com>
date Sun, 21 Sep 2014 08:53:23 -0700
parents 887f5f4d9093
children 9c392efcc302
files contrib/pep8/coding_std.py docs/admin/backup.rst docs/admin/changes.rst docs/admin/configure.rst docs/admin/index.rst docs/admin/password-reset.rst docs/admin/serve.rst docs/admin/upgrade.rst docs/conf.py docs/devel/development.rst docs/devel/translate.rst docs/index.rst docs/intro/features.rst docs/intro/general.rst docs/intro/glossary.rst docs/intro/license.rst docs/make.bat docs/man/moin.rst docs/todo/todo.rst docs/user/accounts.rst docs/user/creolewiki.rst docs/user/markups.rst docs/user/mediawiki.rst docs/user/moinwiki.rst docs/user/namespaces.rst docs/user/rest.rst docs/user/search.rst
diffstat 27 files changed, 415 insertions(+), 434 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/pep8/coding_std.py	Fri Sep 19 10:21:07 2014 -0700
+++ b/contrib/pep8/coding_std.py	Sun Sep 21 08:53:23 2014 -0700
@@ -22,7 +22,7 @@
 
 
 # file types to be processed
-SELECTED_SUFFIXES = set("py bat cmd html css js styl".split())
+SELECTED_SUFFIXES = set("py bat cmd html css js styl rst".split())
 
 # stuff considered DOS/WIN
 WIN_SUFFIXES = set("bat cmd".split())
@@ -50,7 +50,7 @@
     """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()
+    level2_dirs = ".hg contrib dlc 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"))
--- a/docs/admin/backup.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/admin/backup.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -49,4 +49,3 @@
 Then build an index of the loaded data::
 
  moin index-build
-
--- a/docs/admin/changes.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/admin/changes.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -10,4 +10,3 @@
 .. todo::
 
    rewrite CHANGES in rst syntax
-
--- a/docs/admin/configure.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/admin/configure.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -13,7 +13,7 @@
   - it is written in Python
 
 * Framework Configuration
-  
+
   - this is also located in the same file as the Wiki Engine Configuration
   - there are some UPPERCASE settings at the bottom; this is the framework's
     config (for Flask and Flask extensions)
@@ -46,9 +46,9 @@
 
 Why use Python for configuration?
 ---------------------------------
-At first, you might wonder why we use Python code for configuration. One of the 
+At first, you might wonder why we use Python code for configuration. One of the
 reasons is that it is a powerful language. MoinMoin itself is developed in Python
-and using something else would usually mean much more work when developing new 
+and using something else would usually mean much more work when developing new
 functionality.
 
 
@@ -217,7 +217,7 @@
 
 Adding CSS
 ~~~~~~~~~~
-To apply some style changes, add some custom css and overwrite any style you 
+To apply some style changes, add some custom css and overwrite any style you
 don't like in the base theme::
 
     {# Additional Stylesheets (after theme css, before user css #}
@@ -239,7 +239,7 @@
 configuring it for the public.
 
 Please note that `stylesheets` will be included no matter what theme the
-user has selected, so either only apply changes to all available themes or 
+user has selected, so either only apply changes to all available themes or
 force all users to use the same theme, so that your CSS displays correctly.
 
 Displaying user avatars
@@ -259,13 +259,13 @@
 
 XStatic Packages
 ----------------
-`XStatic <http://readthedocs.org/projects/xstatic>`_ is a packaging standard 
-to package external static files as a Python package, often third party. 
-That way they are easily usable on all operating systems, whether it has a package management 
+`XStatic <http://readthedocs.org/projects/xstatic>`_ is a packaging standard
+to package external static files as a Python package, often third party.
+That way they are easily usable on all operating systems, whether it has a package management
 system or not.
 
 In many cases, those external static files are maintained by someone else (like jQuery
-javascript library or larger js libraries) and we definitely do not want to merge 
+javascript library or larger js libraries) and we definitely do not want to merge
 them into our project.
 
 For MoinMoin we require the following XStatic Packages in setup.py:
@@ -280,7 +280,7 @@
   JSON encoders/decoders in JavaScript.
 
 * `ckeditor <http://pypi.python.org/pypi/XStatic-CKEditor>`_
-  used in template file modify_text_html. A WYSIWYG editor similar to word processing 
+  used in template file modify_text_html. A WYSIWYG editor similar to word processing
   desktop editing applications.
 
 * `svgweb <http://pypi.python.org/pypi/XStatic-svgweb>`_
@@ -292,9 +292,9 @@
 
 * `twikidraw_moin <http://pypi.python.org/pypi/XStatic-TWikiDraw-moin>`_
   a Java applet loaded from template file of modify_twikidraw. It is a simple drawing editor.
-  
+
 * `anywikidraw <http://pypi.python.org/pypi/XStatic-AnyWikiDraw>`_
-  a Java applet loaded from template file of modify_anywikidraw. It can be used for 
+  a Java applet loaded from template file of modify_anywikidraw. It can be used for
   editing drawings and diagrams on items.
 
 
@@ -317,8 +317,8 @@
 Adding XStatic Packages
 -----------------------
 
-The following example shows how you can enable the additional package 
-`XStatic-MathJax <http://pypi.python.org/pypi/XStatic-MathJax>`_ which is 
+The following example shows how you can enable the additional package
+`XStatic-MathJax <http://pypi.python.org/pypi/XStatic-MathJax>`_ which is
 used for mathml or latex formulas in items content.
 
 Just *pip install xstatic-mathjax* add the name 'mathjax' to mod_names in wikiconfig
@@ -336,10 +336,10 @@
 
 Custom Themes
 -------------
-In case you want to do major changes to how MoinMoin displays its pages, you 
+In case you want to do major changes to how MoinMoin displays its pages, you
 could also write your own theme.
 
-Caution: developing your own theme means you also have to maintain and update it, 
+Caution: developing your own theme means you also have to maintain and update it,
 which normally requires a long-term effort.
 
 .. todo::
@@ -618,7 +618,7 @@
 are tempted to use easily crackable passwords.
 
 To help users choose reasonable passwords, moin has a simple builtin
-password checker that is enabled by default and does some sanity checks, 
+password checker that is enabled by default and does some sanity checks,
 so users don't choose easily crackable passwords.
 
 It **does** check:
@@ -702,7 +702,7 @@
   account and to log in before being able to do changes, you will rarely get
   contributions from casual users and maybe also less from members of your
   community. But, getting spam is then less likely.
- 
+
 
 ACL for functions
 -----------------
@@ -912,7 +912,7 @@
 * do not ask "computable" questions, like "1+1" or "2*3"
 * do not ask overly obvious questions
 * do not share your questions with other sites / copy questions from other
-  sites (or spammers might try to adapt to this) 
+  sites (or spammers might try to adapt to this)
 * you should at least give textchas for 'en' or for your language_default, if
   that is not 'en', as this will be used as fallback if MoinMoin does not find
   a textcha in the user's language
@@ -1073,7 +1073,7 @@
                               hierarchiv=False, ),
     )
 
-The `uri` depends on the kind of storage backend and stores you want to use, 
+The `uri` depends on the kind of storage backend and stores you want to use,
 see below. Usually it is a URL-like string in the form of::
 
     stores:fs:/srv/mywiki/%(backend)s/%(kind)s
@@ -1162,7 +1162,7 @@
   give different table names then
 * uses slqalchemy (without the ORM) for database abstraction
 * supports multiple types of databases, for example:
- 
+
   - sqlite (default, comes built-into Python)
   - postgresql
   - mysql
@@ -1194,7 +1194,7 @@
   give different table names then
 * can optionally compress/decompress the data using zlib: default compression
   level is 0, which means "do not compress"
- 
+
 `uri` for `create_simple_mapping` looks like e.g.::
 
     stores:sqlite:/srv/mywiki/data/mywiki_%(nsname)s_%(kind)s.db
@@ -1423,7 +1423,7 @@
  #PERMANENT_SESSION_LIFETIME = timedelta(days=31)
  #USE_X_SENDFILE = False
  #LOGGER_NAME = 'MoinMoin'
- 
+
  # for Flask-Cache:
  #CACHE_TYPE = 'filesystem'
  #CACHE_DIR = '/path/to/flask-cache-dir'
@@ -1459,5 +1459,3 @@
 
 Please note that the logging configuration has to be a separate file, so don't
 try this in your wiki configuration file!
-
-
--- a/docs/admin/index.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/admin/index.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -55,7 +55,7 @@
 
 **Note:** the moin WSGI application needs an index to successfully start up.
 As the moin index-* script commands are also based on the moin WSGI application,
-this can lead to a chicken and egg problem. To solve this, the moin command has 
+this can lead to a chicken and egg problem. To solve this, the moin command has
 a ``-i`` (``--index-create``) option that will trigger index creation on startup.
 
 Additionally, if the storage is also non-existent yet, one might also need
@@ -146,8 +146,8 @@
 between the wikis, so users will be able to search in one wiki
 and also see results from the other wikis.
 
-Before you start, you must prepare your wiki configs. For example, for a company 
-that uses two farm wikis, such as ``Sales`` and ``Engineering``, Their respective 
+Before you start, you must prepare your wiki configs. For example, for a company
+that uses two farm wikis, such as ``Sales`` and ``Engineering``, Their respective
 wiki configs could look like:
 
 ``Sales``::
@@ -173,4 +173,3 @@
 
 **Note:** Do not build indexes for multiple wikis in parallel. This is not
 supported.
-
--- a/docs/admin/password-reset.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/admin/password-reset.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -131,4 +131,3 @@
 wiki farms (showing the builtin default here)::
 
     '[%(sitename)s] Your wiki account data'
-
--- a/docs/admin/serve.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/admin/serve.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -56,7 +56,7 @@
 MoinMoin is a Flask application, which is a micro framework for WSGI applications,
 so we recommend you read Flask's good deployment documentation.
 
-Make sure you use `create_app()` as shown above to create the application, 
+Make sure you use `create_app()` as shown above to create the application,
 because you can't import the application from MoinMoin.
 
 Continue reading here: http://flask.pocoo.org/docs/deploying/
@@ -70,4 +70,3 @@
 When the test app starts doing something other than Server Error 500, please
 proceed with the MoinMoin app and its configuration.
 Otherwise, read your web server error log files to troubleshoot the issue from there.
-
--- a/docs/admin/upgrade.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/admin/upgrade.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -87,7 +87,7 @@
 
 Importing your moin 1.9 data
 ----------------------------
-Assuming you have no moin2 storage and no index created yet, include the 
+Assuming you have no moin2 storage and no index created yet, include the
 -s and -i options to create the storage and an index.
 
 The import19 argument to the `moin` script will then read your 1.9 data_dir (pages, attachments and users),
@@ -117,4 +117,3 @@
 -----------------
 Make sure you keep all backups of your moin 1.9 installation, such as code, config,
 data, just in case you are not happy with moin2 and need to revert to the old version.
-
--- a/docs/conf.py	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/conf.py	Sun Sep 21 08:53:23 2014 -0700
@@ -244,7 +244,7 @@
 # Inheritance diagrams, use it like:
 # .. inheritance-diagram::
 #    MoinMoin.items.MoinWiki
-    
+
 inheritance_graph_attrs = dict(rankdir="LR", size='"12.0, 16.0"',
                                fontsize=20, ratio='compress')
 
@@ -252,4 +252,3 @@
                               color='yellow', style='filled')
 
 autosummary_generate = True
-
--- a/docs/devel/development.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/devel/development.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -371,13 +371,13 @@
 
 Internationalization in MoinMoin's JS
 -------------------------------------
-Any string which has to be translated and used in the JavaScript code, has to be defined 
+Any string which has to be translated and used in the JavaScript code, has to be defined
 at ``MoinMoin/templates/dictionary.js``. This dictionary is loaded when the page loads and
 the translation for any string can be received by passing it as a parameter to the ``_`` function,
 also defined in the same file.
 
 For example, if we add the following to ``i18n_dict`` in ``dictionary.js`` ::
-    
+
     "Delete this"  : "{{  _("Delete this") }}",
 
 The translated version of "somestring" can be accessed in the JavaScript code by ::
--- a/docs/devel/translate.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/devel/translate.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -7,7 +7,7 @@
 
 To find out if someone has already started a translation of moin2 into your
 language; check the folder MoinMoin/translations in the source tree.
-If there is a folder with your language code (locale) [#]_, you can 
+If there is a folder with your language code (locale) [#]_, you can
 start with the steps below. If not, please take a look at `If your
 language doesn't exist yet`_.
 
@@ -19,38 +19,38 @@
 2. Go to the top directory and execute::
 
        python setup.py update_catalog -l <locale>
-   
+
    where locale is the short language descriptor of your desired
    language. It should be the name of a folder in MoinMoin/translations.
    For German it is "de".
 
 3. Open the file ``MoinMoin/translations/<locale>/LC_MESSAGES/messages.po``
    and do your translation. A short explanation of this process follows:
-   
+
    * Find an entry with an empty or bad translated text, the text after
      msgstr, and apply your changes.
-   
+
    * **never** edit the 'msgid' string, and only edit the 'msgstr' field
-   
+
    * Variables like ``%(name)x``, where x is any character, must be kept as
      they are. They must occur in the translated text.
-   
+
    * For better readability you can divide a text-string over more than
      one line, by "surrounding" each line with double quotes (").
      It is a usual convention to have a maximal line-length of 80
      characters.
-   
+
    * Comments starting with "#.", "*#:*" or "*#|*" are
      auto-generated and should not be modified.
-   
+
    * Comments starting with "# " (# and at least one whitespace) are
-     translator-comments. You can modify/add them. They have to be 
+     translator-comments. You can modify/add them. They have to be
      placed right before the auto-generated comments.
-   
+
    * Comments starting with "*#,*" and separated with "," are flags.
      They can be auto-generated, but they can also be set by the
      translator.
-     
+
      An important flag is "fuzzy". It shows that the msgstr string might
      not be a correct translation. Only the translator can
      judge if the translation requires further modification, or is
@@ -67,7 +67,7 @@
 In languages where a separate polite form of address exists, like the
 German "Sie"/"Du", always use the polite form.
 
-   
+
 If your language doesn't exist yet
 ----------------------------------
 
@@ -84,7 +84,7 @@
 1. Initialize a new catalog::
 
        python setup.py init_catalog -l <locale>
-   
+
 2. Adjust the ``MoinMoin/translations/<locale>/LC_MESSAGES/messages.po``.
 
    Follow the instructions in `First steps with a new *.po file`_ and
@@ -105,7 +105,7 @@
 
 * replace "``PROJECT VERSION``" in the head msgstr with
   "``MoinMoin 2.0``" or newer if neccessary
-  
+
 * change the value of "``Last-Translator``" to your data
 
 * change the value of "``Language-Team``" to
@@ -151,4 +151,3 @@
 
 .. [#] For more information on locale strings, see
    http://www.gnu.org/software/hello/manual/gettext/Locale-Names.html.
-
--- a/docs/index.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/index.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -2,7 +2,7 @@
 
    This documentation **only** applies to **MoinMoin version 2** (aka moin2,
    moin 2.0, mm2, MoinMoin2, etc.), except where explicitly noted otherwise.
-   Moin2 is very different from moin 1.x, so docs from one version will not 
+   Moin2 is very different from moin 1.x, so docs from one version will not
    apply to the other.
 
 Introducing MoinMoin
@@ -77,4 +77,3 @@
 * :ref:`modindex`
 * :ref:`search`
 * :ref:`glossary`
-
--- a/docs/intro/features.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/intro/features.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -50,7 +50,7 @@
     + admin
 
   - to:
-   
+
     + specific users
     + specific groups of users
     + all logged-in users
@@ -160,4 +160,3 @@
 * flask, flask-cache, flask-babel, flask-themes, flask-script
 * whoosh, werkzeug, pygments, flatland, blinker, babel, emeraldtree
 * sqlalchemy (supports all popular SQL DBMS), sqlite, kyoto tycoon/cabinet
-
--- a/docs/intro/general.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/intro/general.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -9,7 +9,7 @@
 
 Project homepage: http://moinmo.in/
 
-Using MoinMoin, wiki users can easily create and maintain web content from 
+Using MoinMoin, wiki users can easily create and maintain web content from
 their browser.
 
 You can use it:
@@ -41,11 +41,11 @@
 minimalistic either.
 
 There are lots of wiki engines out there, making it hard to pick one.
-However, choosing wisely is important because you may have to live with 
+However, choosing wisely is important because you may have to live with
 your choice for a long time because switching wiki engines is not easy.
 
 We won't list all of moin's features, because comparing feature lists
-is just not enough. Some features are best left unimplemented, 
+is just not enough. Some features are best left unimplemented,
 even if they sound great at first. In moin, you will find most
 important features like in most major wiki engines. But still, you and your wiki
 users might feel quite a different overall experience just because of a bunch
@@ -56,7 +56,7 @@
 MoinMoin has **been around since about 2000**.
 It has rapidly grown and evolved through moin 1.9.x. Its developers have
 increased their experience with Python and wiki technology over the years.
-With **moin 2.0**, there has been a rather **revolutionary cleanup / rewrite** 
+With **moin 2.0**, there has been a rather **revolutionary cleanup / rewrite**
 of how moin works based on that experience. This promises to make it easier,
 cleaner, more consistent, more powerful, more flexible and more
 modular.
@@ -96,6 +96,5 @@
 * government and administration
 * scientific research facilities, universities, schools
 * communities
-  
+
 Unfortunately, we do not have permission to name them here.
-
--- a/docs/intro/glossary.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/intro/glossary.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -87,4 +87,3 @@
 
    werkzeug
       A WSGI library used by moin.
-
--- a/docs/intro/license.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/intro/license.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -12,4 +12,3 @@
 This is the GNU GPL version 2. From file docs/licenses/COPYING:
 
 .. literalinclude:: ../licenses/COPYING
-
--- a/docs/make.bat	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/make.bat	Sun Sep 21 08:53:23 2014 -0700
@@ -1,188 +1,188 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-)
-
-if "%1" == "" goto help
-
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
-)
-
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
-
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\MoinMoin.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\MoinMoin.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %ALLSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
-
-:end
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+    set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+    set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+    :help
+    echo.Please use `make ^<target^>` where ^<target^> is one of
+    echo.  html       to make standalone HTML files
+    echo.  dirhtml    to make HTML files named index.html in directories
+    echo.  singlehtml to make a single large HTML file
+    echo.  pickle     to make pickle files
+    echo.  json       to make JSON files
+    echo.  htmlhelp   to make HTML files and a HTML help project
+    echo.  qthelp     to make HTML files and a qthelp project
+    echo.  devhelp    to make HTML files and a Devhelp project
+    echo.  epub       to make an epub
+    echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+    echo.  text       to make text files
+    echo.  man        to make manual pages
+    echo.  texinfo    to make Texinfo files
+    echo.  gettext    to make PO message catalogs
+    echo.  changes    to make an overview over all changed/added/deprecated items
+    echo.  linkcheck  to check all external links for integrity
+    echo.  doctest    to run all doctests embedded in the documentation if enabled
+    goto end
+)
+
+if "%1" == "clean" (
+    for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+    del /q /s %BUILDDIR%\*
+    goto end
+)
+
+if "%1" == "html" (
+    %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+    goto end
+)
+
+if "%1" == "dirhtml" (
+    %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+    goto end
+)
+
+if "%1" == "singlehtml" (
+    %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+    goto end
+)
+
+if "%1" == "pickle" (
+    %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished; now you can process the pickle files.
+    goto end
+)
+
+if "%1" == "json" (
+    %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished; now you can process the JSON files.
+    goto end
+)
+
+if "%1" == "htmlhelp" (
+    %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+    goto end
+)
+
+if "%1" == "qthelp" (
+    %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+    echo.^> qcollectiongenerator %BUILDDIR%\qthelp\MoinMoin.qhcp
+    echo.To view the help file:
+    echo.^> assistant -collectionFile %BUILDDIR%\qthelp\MoinMoin.ghc
+    goto end
+)
+
+if "%1" == "devhelp" (
+    %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished.
+    goto end
+)
+
+if "%1" == "epub" (
+    %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished. The epub file is in %BUILDDIR%/epub.
+    goto end
+)
+
+if "%1" == "latex" (
+    %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+    goto end
+)
+
+if "%1" == "text" (
+    %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished. The text files are in %BUILDDIR%/text.
+    goto end
+)
+
+if "%1" == "man" (
+    %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished. The manual pages are in %BUILDDIR%/man.
+    goto end
+)
+
+if "%1" == "texinfo" (
+    %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+    goto end
+)
+
+if "%1" == "gettext" (
+    %SPHINXBUILD% -b gettext %ALLSPHINXOPTS% %BUILDDIR%/locale
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+    goto end
+)
+
+if "%1" == "changes" (
+    %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.The overview file is in %BUILDDIR%/changes.
+    goto end
+)
+
+if "%1" == "linkcheck" (
+    %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+    goto end
+)
+
+if "%1" == "doctest" (
+    %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+    if errorlevel 1 exit /b 1
+    echo.
+    echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+    goto end
+)
+
+:end
--- a/docs/man/moin.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/man/moin.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -27,4 +27,3 @@
 --------
 
 :manpage:`moinmoin(1)`
-
--- a/docs/todo/todo.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/todo/todo.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -12,7 +12,7 @@
 -------
 
 If someone adds a new type of node in the Moinmoin DOM tree:
-  
+
   TODO: add support of new types of node
 
 Allow creation of unicode URIs for wiki links. This should also provide
@@ -99,4 +99,3 @@
   large document using Include, one wants the links to the pages that got
   included point to some anchor where the page inclusion starts. For normal
   anchor links to / within included pages, it should be #Pagename-anchorid.
-
--- a/docs/user/accounts.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/user/accounts.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -2,8 +2,8 @@
 User Accounts
 =============
 
-Accounts provide an easy way for wiki users to identify themselves to MoinMoin and other wiki users, 
-store personal preferences and track wiki contributions. Account creation is simple and 
+Accounts provide an easy way for wiki users to identify themselves to MoinMoin and other wiki users,
+store personal preferences and track wiki contributions. Account creation is simple and
 straightforward, and provides many benefits over browsing and editing anonymously.
 
 Account Creation
@@ -67,7 +67,7 @@
 
 Timezone
  Setting this value will allow you to see edit times as they would appear in your time zone. For
- example, an edit time of 10AM UTC would appear as 8PM AEST if you changed your time zone to 
+ example, an edit time of 10AM UTC would appear as 8PM AEST if you changed your time zone to
  GMT +10/Australian Eastern Standard Time.
 
 Locale
@@ -114,7 +114,7 @@
  The size (in lines) of MoinMoin's plain text editor when you edit an item.
 
 .. warning::
- **MOINTODO** "Editor Size" isn't a very good title as it doesn't specify *which* editor or in what 
+ **MOINTODO** "Editor Size" isn't a very good title as it doesn't specify *which* editor or in what
  units the size is. This setting doesn't seem to affect my MoinMoin instance, either.
 
 History results per page
@@ -171,7 +171,7 @@
  and item several times, it just inserts several identical links to that item. This behaviour should be
  checked and rectified.
 
- **MOINTODO** +mychanges isn't very pretty if you visit it without making any changes, it just says 
+ **MOINTODO** +mychanges isn't very pretty if you visit it without making any changes, it just says
  "My Changes" at the top with the rest of the page left blank.
 
 Bookmarking
@@ -182,7 +182,7 @@
 To help users remember which revisions they have read and which they have yet to read,
 MoinMoin provides bookmarks. If you have read revisions up until the 13th of January, for example, you would
 simply click the :guilabel:`Set bookmark` button next to the revisions from the 13th of January to hide
-all revisions from before that date. If you wish to examine those revisions again, navigate back to the 
+all revisions from before that date. If you wish to examine those revisions again, navigate back to the
 global history page and click :guilabel:`Remove bookmark`.
 
 Quicklinks
@@ -209,7 +209,7 @@
 --------------------
 
 Subscribing to items allows you to be notified via email when changes are made. To subscribe, navigate
-to the item in question and click the :guilabel:`Subscribe` button at the top or bottom of the page. You 
+to the item in question and click the :guilabel:`Subscribe` button at the top or bottom of the page. You
 will now receive an email each time a user modifies this item. To unsubscribe, navigate to the item
 again and click the :guilabel:`Unsubscribe` button at the top or bottom of the page.
 
--- a/docs/user/creolewiki.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/user/creolewiki.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -62,7 +62,7 @@
 | ``//**Bold and Italic**//``         | :bolditalic:`Bold and Italic`         |
 +-------------------------------------+---------------------------------------+
 | ``First line\\Second line``         | | First line                          |
-|                                     | | Second line                         | 
+|                                     | | Second line                         |
 +-------------------------------------+---------------------------------------+
 
 **RSTTODO**: Restructured Text line blocks are not working in Moin2
@@ -73,13 +73,13 @@
 Internal links
 --------------
 
-.. _Item name: 
-.. _ItemName/Subitem: 
-.. _/SubItem: 
-.. _../SiblingItem: 
-.. _Named Item: 
+.. _Item name:
+.. _ItemName/Subitem:
+.. _/SubItem:
+.. _../SiblingItem:
+.. _Named Item:
 .. _#AnchorName:
-.. _Named anchor: 
+.. _Named anchor:
 .. _ItemName#AnchorName:
 .. _Filename.txt: #
 
@@ -154,7 +154,7 @@
 **Markup**: ::
 
  You can leave an empty line to start a new paragraph.
- 
+
  Single breaks are ignored.
  To force a line break, use <<BR>> or \\.
 
@@ -163,7 +163,7 @@
 You can leave an empty line to start a new paragraph.
 
 | Single breaks are ignored. To force a line break, use
-| or 
+| or
 | .
 
 **RSTTODO**: reStructuredText line blocks are not working in Moin2
@@ -187,7 +187,7 @@
 
 This text will be displayed below the rule.
 
-Preformatted text 
+Preformatted text
 =================
 
 **Markup**:  ::
@@ -195,7 +195,7 @@
     {{{
     This text will [[escape]] **special** WikiCreole //markup//
         It will also preserve indents
-    
+
     And whitespace.
     }}}
     ~[[This text will not be a link, because it uses the tilde (~) escape character]]
@@ -266,9 +266,9 @@
 
  #. First item (second level)
  #. Second item (second level)
- 
+
   #. First item (third level)
-  
+
 3. Third item
 
 Unordered lists
@@ -288,9 +288,9 @@
 - List item
 
  - List item (second level)
- 
+
   - List item (third level)
-  
+
 - List item
 
 Mixed lists
@@ -322,7 +322,7 @@
 **Markup**: ::
 
 |= Header one |= Header two |
-| Cell one    | Cell two    
+| Cell one    | Cell two
 | Cell three  | Cell four   |
 
 **Result**:
--- a/docs/user/markups.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/user/markups.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -15,17 +15,17 @@
 .. _MoinWiki: http://moinmo.in/HelpOnMoinWikiSyntax
 .. _WikiCreole: http://www.wikicreole.org/
 .. _reStructuredText: http://docutils.sourceforge.net/rst.html
-.. _Docbook: http://www.docbook.org/ 
+.. _Docbook: http://www.docbook.org/
 .. _MediaWiki: http://www.mediawiki.org/wiki/Help:Formatting
 .. _Markdown: http://daringfireball.net/projects/markdown/syntax
 
-In Moin2, you specify the item's markup language when you create the document. 
-Its markup language can also be changed at any time by modifying the item's ``contenttype`` metadata. 
+In Moin2, you specify the item's markup language when you create the document.
+Its markup language can also be changed at any time by modifying the item's ``contenttype`` metadata.
 Currently Moin2 supports `MoinWiki`_, `WikiCreole`_, `reStructuredText`_, `Docbook`_,
 `MediaWiki`_ and `Markdown`_ markups.
 
-**MOINTODO**: Currently the use of ``{{{#!syntax content}}}`` parsers crashes moin. 
+**MOINTODO**: Currently the use of ``{{{#!syntax content}}}`` parsers crashes moin.
 This should be looked into.
 
-**MOINTODO**: The creation of items/editing of an item's metadata is not yet documented. 
+**MOINTODO**: The creation of items/editing of an item's metadata is not yet documented.
 This is beyond the scope of this index page and should be looked into.
--- a/docs/user/mediawiki.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/user/mediawiki.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -158,39 +158,39 @@
 The syntax for inserting an image is as follows: ::
 
  [[File:<filename>|<options>|<caption>]]
- 
+
 The *options* field can be empty or can contain one or more of
 the following options separated by pipes (``|``).
 
 Format option:
-	Controls how the image is formatted in the item.
-	
-	one of ``border`` and/or ``frameless``, ``frame`` or ``thumb``
+    Controls how the image is formatted in the item.
+
+    one of ``border`` and/or ``frameless``, ``frame`` or ``thumb``
 Resizing option:
-	Controls the display size of the picture.
-	The aspect ratio cannot be changed.
-	
-	one of ``<width>px``, ``x<height>px``, ``<width>x<height>px`` or ``upright``
+    Controls the display size of the picture.
+    The aspect ratio cannot be changed.
+
+    one of ``<width>px``, ``x<height>px``, ``<width>x<height>px`` or ``upright``
 Horizontal alignment option:
-	Controls the horizontal alignment of an image.
-	
-	one of ``left``, ``right``, ``center`` or ``none``
+    Controls the horizontal alignment of an image.
+
+    one of ``left``, ``right``, ``center`` or ``none``
 Vertical alignment option:
-	Controls the vertical alignment of a non-floating inline image.
-	
-	one of ``baseline``, ``sub``, ``super``, ``top``, ``text-top``, ``middle`` (default), ``bottom`` or ``text-bottom``
+    Controls the vertical alignment of a non-floating inline image.
+
+    one of ``baseline``, ``sub``, ``super``, ``top``, ``text-top``, ``middle`` (default), ``bottom`` or ``text-bottom``
 Link option:
-	The option ``link=<target>`` allows to change the
-	target of the link represented by the picture.
-	The image will not be clickable if ``<target>`` is left empty.
-	
-	Please note that the link option cannot be used with one of the options ``thumb`` or ``frame``.
+    The option ``link=<target>`` allows to change the
+    target of the link represented by the picture.
+    The image will not be clickable if ``<target>`` is left empty.
+
+    Please note that the link option cannot be used with one of the options ``thumb`` or ``frame``.
 Other options:
-	The ``alt=<alternative text>`` option sets the alternative
-	text (HTML attribute ``alt=``) of the image.
-	
-	The option ``page=<number>`` sets the number of the page
-	of a .pdf or .djvu file	to be rendered.
+    The ``alt=<alternative text>`` option sets the alternative
+    text (HTML attribute ``alt=``) of the image.
+
+    The option ``page=<number>`` sets the number of the page
+    of a .pdf or .djvu file    to be rendered.
 
 Examples
 --------
@@ -222,7 +222,7 @@
 **Markup**: ::
 
  You can leave an empty line to start a new paragraph.
- 
+
  Single breaks are ignored.
  To force a line break, use the <br /> HTML tag.
 
@@ -285,7 +285,7 @@
 
  <!-- This is a comment -->
  Comments are only visible in the modify window.
- 
+
 **Result**:
 
 Comments are only visible in the modify window.
@@ -351,9 +351,9 @@
 
  #. First item (second level)
  #. Second item (second level)
- 
+
   #. First item (third level)
-  
+
 3. Third item
 
 Unordered lists
@@ -373,9 +373,9 @@
 - List item
 
  - List item (second level)
- 
+
   - List item (third level)
-  
+
 - List item
 
 Definition lists
@@ -396,7 +396,7 @@
 
 object
   description 1
-  
+
   description 2
 
 Mixed lists
@@ -423,14 +423,14 @@
 
  - point one
  - point two
- 
+
 3. third item
 
  term
   definition
-  
+
   continuation of the definition
-  
+
 4. fourth item
 
 Indentations
--- a/docs/user/moinwiki.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/user/moinwiki.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -84,7 +84,7 @@
 +-------------------------------------+---------------------------------------+
 | ``,,Sub,,Script``                   | SubScript                             |
 +-------------------------------------+---------------------------------------+
-| ``~-Smaller-~``                     |	Smaller                               |
+| ``~-Smaller-~``                     |    Smaller                               |
 +-------------------------------------+---------------------------------------+
 | ``~+Larger+~``                      | Larger                                |
 +-------------------------------------+---------------------------------------+
@@ -176,12 +176,12 @@
 |                                                   | doesn't make much sense.              |
 +---------------------------------------------------+---------------------------------------+
 
-**Extra Info**: 
+**Extra Info**:
 
 Markup like ``{{ example.jpg || &w=20 }}``, simply adds ``&w`` to the ``src`` URL of the image, the Python Imaging Library (PIL)
-understands that it has to compress the image on the server side and render as shrinked to size ``20``. 
+understands that it has to compress the image on the server side and render as shrinked to size ``20``.
 
-For markup like ``{{ example.jpg || width=20, height=100 }}`` we currently allow only the ``width`` and ``height`` (anything 
+For markup like ``{{ example.jpg || width=20, height=100 }}`` we currently allow only the ``width`` and ``height`` (anything
 else is ignored) to be added as attributes in the HTML, however one can, add anything to the query URL using ``&``, like ``&w`` in the example above.
 
 
@@ -242,7 +242,7 @@
   - item 4.1
 
    - item 4.1.1 (bulletless)
-   
+
 **Note**:
  - moin markup allows a square, white and a bulletless item for unordered lists, these cannot be chosen in rst
 
@@ -254,19 +254,19 @@
 
 **Markup**: ::
 
- 1. item 1 
-   1. item 1.1   
-   1. item 1.2   
+ 1. item 1
+   1. item 1.1
+   1. item 1.2
  1. item 2
 
 **Result**:
 
  1. item 1
- 
+
    1. item 1.1
-   
+
    2. item 1.2
-   
+
  2. item 2
 
 With Roman Numbers
@@ -274,19 +274,19 @@
 
 **Markup**: ::
 
- I. item 1 
-   i. item 1.1   
-   i. item 1.2   
+ I. item 1
+   i. item 1.1
+   i. item 1.2
  I. item 2
 
 **Result**:
 
  I. item 1
- 
+
    i. item 1.1
-   
+
    ii. item 1.2
-   
+
  II. item 2
 
 With Letters
@@ -294,30 +294,30 @@
 
 **Markup**: ::
 
- A. item 1 
-   a. item 1.1   
-   a. item 1.2   
+ A. item 1
+   a. item 1.1
+   a. item 1.2
  A. item 2
 
 **Result**:
 
  A. item 1
- 
+
    a. item 1.1
-   
+
    b. item 1.2
-   
+
  B. item 2
-   
+
 Definition Lists
 ================
 
 **Markup**: ::
 
- term:: definition 
- object:: 
- :: description 1 
- :: description 2 
+ term:: definition
+ object::
+ :: description 1
+ :: description 2
 
 **Result**:
 
@@ -330,7 +330,7 @@
 **Notes**:
  - reStructuredText does not support multiple definitions for a single term, so a line break has been forced to illustrate the appearance of several definitions.
    Using the prescribed Moin Wiki markup will, in fact, produce two separate definitions in MoinMoin (using separate ``<dd>`` tags).
-  
+
 Tables
 ======
 
@@ -341,13 +341,13 @@
 
  ||'''A'''||'''B'''||'''C'''||
  ||1      ||2      ||3      ||
- 
+
 **Result**:
 
 ======= ======= =======
- A       B       C     
+ A       B       C
 ======= ======= =======
- 1       2       3     
+ 1       2       3
 ======= ======= =======
 
 Cell Width
@@ -356,7 +356,7 @@
 **Markup**: ::
 
  ||minimal width ||<99%>maximal width ||
- 
+
 **Result**:
 
 +---------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -371,12 +371,12 @@
 -------------------------
 
 **Markup**: ::
- 
+
  ||<|2> cell spanning 2 rows ||cell in the 2nd column ||
  ||cell in the 2nd column of the 2nd row ||
  ||<-2> cell spanning 2 columns ||
  ||||use empty cells as a shorthand ||
- 
+
 **Result**:
 
 +----------------------+---------------------------------------+
@@ -396,11 +396,11 @@
 --------------------------
 
 **Markup**: ::
- 
+
  ||<^|3> Top (Combined) ||<:> Center (Combined) ||<v|3> Bottom (Combined) ||
  ||<)> Right ||
  ||<(> Left ||
- 
+
 **Result**:
 
 +----------------+---------------------------------------+-------------------+
@@ -418,11 +418,11 @@
 ----------------------------
 
 **Markup**: ::
- 
+
  ||A ||<rowspan="2"> like <|2> ||
  ||B ||
  ||<colspan="2"> like <-2>||
- 
+
 **Result**:
 
 +----------------+---------------+
@@ -432,7 +432,7 @@
 +----------------+---------------+
 | like <-2>                      |
 +--------------------------------+
-  
+
 Macros
 ------
 
@@ -441,12 +441,12 @@
  - ``<<FootNote(Note)>>`` inserts a footnote saying Note
  - ``<<Include(HelpOnMacros/Include)>>`` inserts the contents of the page HelpOnMacros/Include inline
  - ``<<MailTo(user AT example DOT com)>>`` obfuscates the email address user@example.com to users not logged in
- 
+
 **Notes**:
  - **MOINTODO:** ``<<Anchor(anchorname)>>`` throws an error ``<<Anchor: execution failed [__init__() takes exactly 2 arguments (1 given)] (see also the log)>>`` in moin 2.
  - **MOINTODO:** ``<<Include(HelpOnMacros/Include)>>`` does not work in moin 2.
- - **MOINTODO:** ``<<MailTo(user AT example DOT com)>>`` throws an error ``<<MailTo: execution failed [__init__() takes exactly 2 arguments (1 given)] (see also the log)>>`` in moin 2.  
- 
+ - **MOINTODO:** ``<<MailTo(user AT example DOT com)>>`` throws an error ``<<MailTo: execution failed [__init__() takes exactly 2 arguments (1 given)] (see also the log)>>`` in moin 2.
+
 Smileys and Icons
 =================
 
@@ -466,8 +466,8 @@
 | ``{X}`` | ``{i}`` | ``{1}`` | ``{2}`` |
 +---------+---------+---------+---------+
 | ``{3}`` | ``{*}`` | ``{o}`` |         |
-+---------+---------+---------+---------+ 	 
- 
++---------+---------+---------+---------+
+
 Parsers
 =======
 
@@ -475,12 +475,12 @@
 ----------------
 
 **Markup**: ::
- 
+
  {{{
  def hello():
   print "Hello World!"
  }}}
- 
+
 **Result**: ::
 
  def hello():
@@ -490,12 +490,12 @@
 -------------------
 
 **Markup**: ::
- 
+
  {{{#!highlight python
  def hello():
     print "Hello World!"
  }}}
- 
+
 **Result**:
 
 .. code-block:: python
@@ -517,11 +517,11 @@
  - Comments: comment
 
 **Markup**: ::
- 
+
  {{{#!wiki red/solid
  This is wiki markup in a '''div''' with css `class="red solid"`.
  }}}
- 
+
 **Result**:
 
 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -535,13 +535,13 @@
 -----------
 
 **Markup**: ::
- 
+
  {{{#!wiki caution
  '''Don't overuse admonitions'''
- 
+
  Admonitions should be used with care. A page riddled with admonitions will look restless and will be harder to follow than a page where admonitions are used sparingly.
  }}}
- 
+
 **Result**:
 
 .. warning::
@@ -553,13 +553,13 @@
 --------
 
 **Markup**: ::
- 
+
  {{{#!wiki comment/dotted
  This is a wiki parser section with class "comment dotted" (see HelpOnParsers).
 
  Its visibility gets toggled the same way.
  }}}
- 
+
 **Result**:
 
 +--------------------------------------------------------------------------------+
--- a/docs/user/namespaces.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/user/namespaces.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -7,7 +7,7 @@
 ``http://server/[NAMESPACE/][[@FIELD/]VALUE][/+VIEW]``
 
 Above defines the URL layout, where uppercase letters are variable parts defined below and [] denotes optional.
-It basically means search for the item field ``FIELD`` value ``VALUE`` in the namespace ``NAMESPACE`` and apply the 
+It basically means search for the item field ``FIELD`` value ``VALUE`` in the namespace ``NAMESPACE`` and apply the
 view ``VIEW`` on it.
 
 NAMESPACE
--- a/docs/user/rest.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/user/rest.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -7,9 +7,9 @@
 Headings
 ========
 
-Rather than imposing a fixed number and order of section title adornment styles, 
+Rather than imposing a fixed number and order of section title adornment styles,
 the order enforced will be the order as encountered.
-The first style encountered will be an outermost title (like HTML H1), the second style will be a subtitle, 
+The first style encountered will be an outermost title (like HTML H1), the second style will be a subtitle,
 the third will be a subsubtitle, and so on.
 
 The underline below the title must at least be equal to the length of the title itself.  Failure to comply results in messages on the server log. Skipping a heading (e.g. putting an H5 heading directly under an H3) results in a rendering error and an error message will be displayed instead of the expected page.
@@ -105,7 +105,7 @@
 | ``.. _Python: http://www.python.org/``                          | .. _Python: http://www.python.org/                           |
 +-----------------------------------------------------------------+--------------------------------------------------------------+
 
-**Note** A blank is required before the link definition to make the last syntax work correctly. 
+**Note** A blank is required before the link definition to make the last syntax work correctly.
 
 Internal Links
 --------------
@@ -113,7 +113,7 @@
 **Markup**: ::
 
  Internal crossreferences, like example_.
- 
+
  .. _example:
 
  This is an example crossreference target.
@@ -121,11 +121,11 @@
 **Result**:
 
  Internal crossreferences, like example_.
- 
+
  .. _example:
 
  This is an example crossreference target.
- 
+
 **Notes**
  - Section titles automatically generate hyperlink targets (the title text is used as the hyperlink name).
  - **RSTTODO** The above syntax does not work in moin right now.
@@ -145,7 +145,7 @@
 **Result**:
 
  .. image:: png
- 
+
 Blockquotes and Indentations
 ============================
 
@@ -178,7 +178,7 @@
     -- Sherlock Holmes
 
 **Notes**
- - A block quote may end with an attribution: a text block beginning with "--", "---", 
+ - A block quote may end with an attribution: a text block beginning with "--", "---",
    or a true em-dash, flush left within the block quote.
  - **RSTTODO** the attribution does not work in moin2.
  - **RSTTODO** indented text should not be displayed the same as term-definition, needs CSS fix
@@ -222,27 +222,27 @@
 **Markup**: ::
 
  1. item 1
- 
+
     (A) item 1.1
     (#) item 1.2
 
         i) item 1.2.1
         #) item 1.2.2
-   
+
  #. item 2
 
 **Result**:
 
  1. item 1
- 
+
     (A) item 1.1
     (#) item 1.2
 
         i) item 1.2.1
         #) item 1.2.2
-   
+
  #. item 2
-   
+
 **Notes**:
  - Ordered lists can be automatically enumerated using the ``#`` character as demonstrated above. Note that the first item of an ordered list
    auto-enumerated in this fashion must use explicit numbering notation (e.g. ``1.``) in order to select the enumeration sequence type
@@ -301,7 +301,7 @@
 Option lists
 ============
 
-Option lists are intended to document Unix or DOS command line options. 
+Option lists are intended to document Unix or DOS command line options.
 
 **Markup**: ::
 
@@ -344,7 +344,7 @@
 
 333\. is a float, 333 is an integer.
 
-  
+
 Tables
 ======
 
@@ -356,42 +356,42 @@
 **Markup**: ::
 
  ======= ======= =======
-  A       B       C     
+  A       B       C
  ======= ======= =======
-  1       2       3     
+  1       2       3
  ======= ======= =======
- 
+
 **Result**:
 
  ======= ======= =======
-  A       B       C     
+  A       B       C
  ======= ======= =======
-  1       2       3     
+  1       2       3
  ======= ======= =======
- 
+
 
 **Markup**: ::
 
  ======= ======= =======
        foo         Bar
  --------------- -------
-  A       B       C     
+  A       B       C
  ======= ======= =======
-  1       2       3     
+  1       2       3
  ======= ======= =======
- 
+
 **Result**:
 
  ======= ======= =======
        foo         Bar
  --------------- -------
-  A       B       C     
+  A       B       C
  ======= ======= =======
-  1       2       3     
+  1       2       3
  ======= ======= =======
- 
+
 **Note** **RSTTODO** the foo-bar syntax to group header does not work.
- 
+
 Grid Tables
 -----------
 
@@ -406,7 +406,7 @@
  +----------------+---------------+
  | C                              |
  +--------------------------------+
- 
+
 **Result**:
 
  +----------------+---------------+
@@ -416,7 +416,7 @@
  +----------------+---------------+
  | C                              |
  +--------------------------------+
- 
+
 **Note** **RSTTODO** C does not extend fully up to the end of D.
 
 Admonitions
@@ -427,16 +427,16 @@
 **Markup**: ::
 
  .. caution:: Caution!
- .. danger:: Danger! 
+ .. danger:: Danger!
  .. error:: Error!
 
  .. note:: This is a paragraph
  .. admonition:: By the way
- 
+
 **Result**:
 
  .. caution:: Caution!
- .. danger:: Danger! 
+ .. danger:: Danger!
  .. error:: Error!
 
  .. note:: This is a paragraph
@@ -451,19 +451,7 @@
 Comments are not shown on the page but depending on the output formatter they might be included as HTML comments (``<!-- -->``).
 
 **Markup**: ::
- 
- .. This is a comment
- ..
-  _so: is this!
- ..
-  [and] this!
- ..
-  this:: too!
- ..
-  |even| this:: !
- 
-**Result**:
- 
+
  .. This is a comment
  ..
   _so: is this!
@@ -473,13 +461,25 @@
   this:: too!
  ..
   |even| this:: !
-  
+
+**Result**:
+
+ .. This is a comment
+ ..
+  _so: is this!
+ ..
+  [and] this!
+ ..
+  this:: too!
+ ..
+  |even| this:: !
+
 **Note** **RSTTODO** comment markup does not work in moin2.
- 
+
 Literals Blocks
 ===============
 
-Literal blocks are used to show text as-it-is. i.e no markup processing is done within a literal block. 
+Literal blocks are used to show text as-it-is. i.e no markup processing is done within a literal block.
 A minimum (1) indentation is required for the text block to be recognized as a literal block.
 
 **Markup**: ::
@@ -487,22 +487,21 @@
  Paragraph with a space between preceding two colons ::
 
   Literal block
- 
+
 **Result**:
 
  Paragraph with a space between preceding two colons ::
 
   Literal block
-  
+
 **Markup**: ::
 
  Paragraph with no space between text and two colons::
 
   Literal block
- 
+
 **Result**:
 
  Paragraph with no space between text and two colons::
 
   Literal block
-
--- a/docs/user/search.rst	Fri Sep 19 10:21:07 2014 -0700
+++ b/docs/user/search.rst	Sun Sep 21 08:53:23 2014 -0700
@@ -10,7 +10,7 @@
 content, but only in the current contents, not in non-current revisions, and display
 the search results to you.
 
-On the search results view you will get a bigger search query input field, 
+On the search results view you will get a bigger search query input field,
 for example for refining your query, and you may also choose to additionally search
 in non-current item revisions. Selecting that will search in all revisions.
 
@@ -184,4 +184,3 @@
 ================
 
 See the `Whoosh query language docs <http://packages.python.org/Whoosh/querylang.html>`_.
-